Use Compose BOM for Compose related dependencies (#6676)

* Updates compose to 1.4.3 * Updates Changelog. * Removes compose specific versioning in favor of BOM. * Updates compose compiler to 1.4.7 * Updates changelog. * Rolls back compiler to latest supported kotlin version
stripe · May 5, 2023 · b96de32 · b96de32
1 parent 46fcacb
commit b96de32
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 17 deletions.
diff --git a/.idea/codestyles/Project.xml b/.idea/codestyles/Project.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
 

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -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',
@@ -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}",
@@ -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}",
@@ -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}",

diff --git a/example/build.gradle b/example/build.gradle
@@ -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

diff --git a/financial-connections-example/build.gradle b/financial-connections-example/build.gradle
@@ -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

diff --git a/financial-connections/build.gradle b/financial-connections/build.gradle
@@ -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

diff --git a/identity-example/build.gradle b/identity-example/build.gradle
@@ -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

diff --git a/identity/build.gradle b/identity/build.gradle
@@ -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

diff --git a/link/build.gradle b/link/build.gradle
@@ -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

diff --git a/payment-method-messaging/build.gradle b/payment-method-messaging/build.gradle
@@ -23,6 +23,8 @@ android {
 }
 
 dependencies {
+    implementation platform(boms.androidx.compose)
+
     implementation project(":stripe-core")
     implementation project(":payments-core")
     implementation project(":payments-ui-core")

diff --git a/payments-core/build.gradle b/payments-core/build.gradle
@@ -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

diff --git a/payments-ui-core/build.gradle b/payments-ui-core/build.gradle
@@ -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

diff --git a/paymentsheet-example/build.gradle b/paymentsheet-example/build.gradle
@@ -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

diff --git a/paymentsheet/build.gradle b/paymentsheet/build.gradle
@@ -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

diff --git a/stripe-ui-core/build.gradle b/stripe-ui-core/build.gradle
@@ -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