Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Compose BOM for Compose related dependencies #6676

Merged
merged 6 commits into from
May 5, 2023
Merged

Use Compose BOM for Compose related dependencies #6676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6890cd9
Updates compose to 1.4.3
carlosmuvi-stripe May 4, 2023
567d4df
Updates Changelog.
carlosmuvi-stripe May 4, 2023
7961ecc
Removes compose specific versioning in favor of BOM.
carlosmuvi-stripe May 4, 2023
63c9773
Updates compose compiler to 1.4.7
carlosmuvi-stripe May 4, 2023
0ef4fa1
Updates changelog.
carlosmuvi-stripe May 4, 2023
7f03a45
Rolls back compiler to latest supported kotlin version
carlosmuvi-stripe May 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .idea/codestyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### All SDKs
* [CHANGED][6635](https://github.com/stripe/stripe-android/pull/6635) Use non transitive R classes.
* [CHANGED][6676](https://github.com/stripe/stripe-android/pull/6676) Updated Compose BOM to 2023.05.00.

## 20.24.2 - 2023-05-03

Expand Down
33 changes: 18 additions & 15 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ ext.versions = [
androidxAppcompat : '1.6.1',
androidxArchCore : '2.2.0',
androidxBrowser : '1.5.0',
androidxCompose : '1.4.1',
androidxComposeCompiler : '1.4.1',
androidxComposeRuntime : '1.4.1',
androidxComposeUi : '1.4.1',
androidxConstraintlayout : '2.1.4',
androidxCore : '1.9.0',
androidxFragment : '1.5.5',
Expand Down Expand Up @@ -89,6 +86,12 @@ ext.configs = [
androidApplication: "${project.rootDir}/build-configuration/android-application.gradle",
]

ext.boms = [
androidx: [
compose: "androidx.compose:compose-bom:2023.05.00"
],
]

ext.libs = [
accompanist : [
flowLayout : "com.google.accompanist:accompanist-flowlayout:${versions.accompanist}",
Expand Down Expand Up @@ -124,18 +127,18 @@ ext.libs = [
],
compose : [
activity : "androidx.activity:activity-compose:${versions.androidxActivity}",
foundation : "androidx.compose.foundation:foundation:${versions.androidxCompose}",
liveData : "androidx.compose.runtime:runtime-livedata:${versions.androidxComposeRuntime}",
material : "androidx.compose.material:material:${versions.androidxCompose}",
materialIcons : "androidx.compose.material:material-icons-core:${versions.androidxCompose}",
materialIconsExtended: "androidx.compose.material:material-icons-extended:${versions.androidxCompose}",
foundation : "androidx.compose.foundation:foundation",
liveData : "androidx.compose.runtime:runtime-livedata",
material : "androidx.compose.material:material",
materialIcons : "androidx.compose.material:material-icons-core",
materialIconsExtended: "androidx.compose.material:material-icons-extended",
navigation : "androidx.navigation:navigation-compose:${versions.androidxNavigation}",
runtime : "androidx.compose.runtime:runtime:${versions.androidxComposeRuntime}",
ui : "androidx.compose.ui:ui:${versions.androidxComposeUi}",
uiTestManifest : "androidx.compose.ui:ui-test-manifest:${versions.androidxComposeUi}",
uiTooling : "androidx.compose.ui:ui-tooling:${versions.androidxComposeUi}",
uiToolingPreview : "androidx.compose.ui:ui-tooling-preview:${versions.androidxComposeUi}",
uiViewBinding : "androidx.compose.ui:ui-viewbinding:${versions.androidxComposeUi}",
runtime : "androidx.compose.runtime:runtime",
ui : "androidx.compose.ui:ui",
uiTestManifest : "androidx.compose.ui:ui-test-manifest",
uiTooling : "androidx.compose.ui:ui-tooling",
uiToolingPreview : "androidx.compose.ui:ui-tooling-preview",
uiViewBinding : "androidx.compose.ui:ui-viewbinding",
viewModels : "androidx.lifecycle:lifecycle-viewmodel-compose:${versions.androidxLifecycle}",
],
dagger : "com.google.dagger:dagger:${versions.dagger}",
Expand Down Expand Up @@ -180,7 +183,7 @@ ext.testLibs = [
junit : "androidx.test.ext:junit:${versions.androidTestJunit}",
junitKtx : "androidx.test.ext:junit-ktx:${versions.androidTestJunit}",
fragment : "androidx.fragment:fragment-testing:${versions.androidxFragment}",
composeUi : "androidx.compose.ui:ui-test-junit4:${versions.androidxComposeUi}",
composeUi : "androidx.compose.ui:ui-test-junit4",
lifecycle : "androidx.lifecycle:lifecycle-runtime-testing:${versions.androidxLifecycle}",
testRules : "androidx.test:rules:${versions.androidTest}",
testRunner : "androidx.test:runner:${versions.androidTestRunner}",
Expand Down
2 changes: 2 additions & 0 deletions example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ dependencies {
implementation project(':payments')
implementation project(':financial-connections')

implementation platform(boms.androidx.compose)

implementation libs.accompanist.themeAdapter
implementation libs.alipay
implementation libs.androidx.appCompat
Expand Down
3 changes: 3 additions & 0 deletions financial-connections-example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ dependencies {
implementation project(':financial-connections')
implementation project(':payments-core')

implementation platform(boms.androidx.compose)
androidTestImplementation platform(boms.androidx.compose)

implementation libs.androidx.activity
implementation libs.androidx.appCompat
implementation libs.androidx.coreKtx
Expand Down
3 changes: 3 additions & 0 deletions financial-connections/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,13 @@ android {
}

dependencies {

api project(":stripe-core")
api project(":stripe-ui-core")
api project(":payments-model")

implementation platform(boms.androidx.compose)

implementation libs.accompanist.webView
implementation libs.androidx.activity
implementation libs.androidx.annotation
Expand Down
2 changes: 2 additions & 0 deletions identity-example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ android {
dependencies {
implementation project(':identity')

implementation platform(boms.androidx.compose)

implementation libs.accompanist.themeAdapter
implementation libs.androidx.appCompat
implementation libs.androidx.browser
Expand Down
2 changes: 2 additions & 0 deletions identity/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ dependencies {
implementation project(":stripe-ui-core")
implementation project(":ml-core:default")

implementation platform(boms.androidx.compose)

implementation libs.accompanist.themeAdapter
implementation libs.androidx.activity
implementation libs.androidx.appCompat
Expand Down
2 changes: 2 additions & 0 deletions link/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ dependencies {
implementation project(':financial-connections')
implementation project(':stripe-ui-core')

implementation platform(boms.androidx.compose)

implementation libs.androidx.appCompat
implementation libs.androidx.constraintLayout
implementation libs.androidx.liveDataKtx
Expand Down
2 changes: 2 additions & 0 deletions payment-method-messaging/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ android {
}

dependencies {
implementation platform(boms.androidx.compose)

implementation project(":stripe-core")
implementation project(":payments-core")
implementation project(":payments-ui-core")
Expand Down
2 changes: 2 additions & 0 deletions payments-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ dependencies {
api project(":payments-model")
compileOnly project(':financial-connections')

implementation platform(boms.androidx.compose)

implementation libs.androidx.activity
implementation libs.androidx.annotation
implementation libs.androidx.appCompat
Expand Down
2 changes: 2 additions & 0 deletions payments-ui-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ dependencies {
compileOnly project(":stripecardscan")
compileOnly libs.places

implementation platform(boms.androidx.compose)

implementation libs.androidx.constraintLayout
implementation libs.androidx.coreKtx
implementation libs.androidx.annotation
Expand Down
2 changes: 2 additions & 0 deletions paymentsheet-example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ dependencies {
implementation project(':stripecardscan')
implementation project(':financial-connections')

implementation platform(boms.androidx.compose)

implementation libs.androidx.activity
implementation libs.androidx.appCompat
implementation libs.androidx.constraintLayout
Expand Down
2 changes: 2 additions & 0 deletions paymentsheet/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ dependencies {
implementation project(':stripe-ui-core')
compileOnly project(':financial-connections')

implementation platform(boms.androidx.compose)

// Kotlin
implementation libs.kotlin.coroutines
implementation libs.kotlin.coroutinesAndroid
Expand Down
3 changes: 3 additions & 0 deletions stripe-ui-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ android {

dependencies {
implementation project(":stripe-core")

implementation platform(boms.androidx.compose)

implementation libs.androidx.annotation
implementation libs.androidx.coreKtx
implementation libs.compose.foundation
Expand Down