Skip to content

Commit deb411a

Browse files
eric-labelleeric-labelle
authored
Merge pull request #184 from eric-labelle/ela/compose-bom
Switch to Compose BOM
2 parents 53a847c + 53fa918 commit deb411a

File tree

8 files changed

+80
-65
lines changed

8 files changed

+80
-65
lines changed

‎gradle/libs.versions.toml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
agp = "8.10.0" # keep in sync with android-tools
33
android-tools = "31.10.0" # = 23.0.0 + agp
44
compilerTesting = "0.7.1"
5-
compose = "1.5.14"
65
kotlin = "2.1.20"
76
kotlinPoet = "1.13.1"
87
ksp = "2.1.20-1.0.32"
@@ -21,6 +20,7 @@ compiler-testing-core = { module = "dev.zacsweers.kctfork:core", version.ref = "
2120
compiler-testing-ksp = { module = "dev.zacsweers.kctfork:ksp", version.ref = "compilerTesting" }
2221
featureDelivery = { module = "com.google.android.play:feature-delivery-ktx", version = "2.1.0"}
2322
junit = { module = "junit:junit", version = "4.13.2" }
23+
kotlin-stdlib-common = { module = "org.jetbrains.kotlin:kotlin-stdlib-common", version.ref = "kotlin" }
2424
kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
2525
kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
2626
kotlinPoet-core = { module = "com.squareup:kotlinpoet", version.ref = "kotlinPoet" }
@@ -33,9 +33,11 @@ moshi-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.re
3333
truth = { module = "com.google.truth:truth", version = "1.4.4" }
3434

3535
# Used by the sample app
36+
compose-bom = { module = "androidx.compose:compose-bom", version = "2025.05.01" }
37+
compose-material = { module = "androidx.compose.material:material" }
38+
compose-runtime = { module = "androidx.compose.runtime:runtime" }
39+
3640
compose-activity = { module = "androidx.activity:activity-compose", version = "1.7.1" }
37-
compose-material = { module = "androidx.compose.material:material", version = "1.4.2" }
38-
compose-runtime = { module = "androidx.compose.runtime:runtime", version = "1.4.2" }
3941

4042
# AGP things
4143
google-guava = "com.google.guava:guava:31.1-jre"
@@ -48,9 +50,9 @@ android-sdkCommon = { module = "com.android.tools:sdk-common", version.ref = "an
4850
android-application = { id = "com.android.application", version.ref = "agp" }
4951
android-dynamic-feature = { id = "com.android.dynamic-feature", version.ref = "agp" }
5052
android-library = { id = "com.android.library", version.ref = "agp" }
51-
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
5253
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
5354
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
55+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
5456
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
5557
publish = { id = "com.vanniktech.maven.publish", version = "0.31.0" }
5658
spotless = { id = "com.diffplug.spotless", version = "6.18.0" }

‎sample/app/build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,12 @@ android {
3636
kotlinOptions {
3737
freeCompilerArgs += '-Xexplicit-api=strict'
3838
}
39-
40-
composeOptions {
41-
kotlinCompilerExtensionVersion libs.versions.compose.get()
42-
}
4339
}
4440

4541
dependencies {
46-
implementation libs.compose.activity
42+
implementation platform(libs.compose.bom)
4743
implementation libs.compose.material
44+
implementation libs.compose.activity
4845
implementation libs.featureDelivery
49-
}
46+
implementation libs.kotlin.stdlib.common
47+
}

‎sample/app/gradle.lockfile

Lines changed: 65 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,71 @@
44
androidx.activity:activity-compose:1.7.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
55
androidx.activity:activity-ktx:1.7.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
66
androidx.activity:activity:1.7.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
7-
androidx.annotation:annotation-experimental:1.3.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
8-
androidx.annotation:annotation:1.5.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
7+
androidx.annotation:annotation-experimental:1.4.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
8+
androidx.annotation:annotation-jvm:1.9.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
9+
androidx.annotation:annotation:1.9.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
910
androidx.arch.core:core-common:2.2.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
1011
androidx.arch.core:core-runtime:2.2.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
1112
androidx.autofill:autofill:1.0.0=debugRuntimeClasspath,releaseRuntimeClasspath
12-
androidx.collection:collection:1.1.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
13-
androidx.compose.animation:animation-core:1.2.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
14-
androidx.compose.animation:animation:1.2.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
15-
androidx.compose.foundation:foundation-layout:1.4.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
16-
androidx.compose.foundation:foundation:1.4.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
17-
androidx.compose.material:material-icons-core:1.4.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
18-
androidx.compose.material:material-ripple:1.4.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
19-
androidx.compose.material:material:1.4.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
20-
androidx.compose.runtime:runtime-saveable:1.4.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
21-
androidx.compose.runtime:runtime:1.4.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
22-
androidx.compose.ui:ui-geometry:1.4.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
23-
androidx.compose.ui:ui-graphics:1.4.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
24-
androidx.compose.ui:ui-text:1.4.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
25-
androidx.compose.ui:ui-unit:1.4.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
26-
androidx.compose.ui:ui-util:1.4.2=debugRuntimeClasspath,releaseRuntimeClasspath
27-
androidx.compose.ui:ui:1.4.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
13+
androidx.collection:collection-jvm:1.5.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
14+
androidx.collection:collection-ktx:1.5.0=debugRuntimeClasspath,releaseRuntimeClasspath
15+
androidx.collection:collection:1.5.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
16+
androidx.compose.animation:animation-android:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
17+
androidx.compose.animation:animation-core-android:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
18+
androidx.compose.animation:animation-core:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
19+
androidx.compose.animation:animation:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
20+
androidx.compose.foundation:foundation-android:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
21+
androidx.compose.foundation:foundation-layout-android:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
22+
androidx.compose.foundation:foundation-layout:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
23+
androidx.compose.foundation:foundation:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
24+
androidx.compose.material:material-android:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
25+
androidx.compose.material:material-ripple-android:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
26+
androidx.compose.material:material-ripple:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
27+
androidx.compose.material:material:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
28+
androidx.compose.runtime:runtime-android:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
29+
androidx.compose.runtime:runtime-saveable-android:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
30+
androidx.compose.runtime:runtime-saveable:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
31+
androidx.compose.runtime:runtime:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
32+
androidx.compose.ui:ui-android:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
33+
androidx.compose.ui:ui-geometry-android:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
34+
androidx.compose.ui:ui-geometry:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
35+
androidx.compose.ui:ui-graphics-android:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
36+
androidx.compose.ui:ui-graphics:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
37+
androidx.compose.ui:ui-text-android:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
38+
androidx.compose.ui:ui-text:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
39+
androidx.compose.ui:ui-unit-android:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
40+
androidx.compose.ui:ui-unit:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
41+
androidx.compose.ui:ui-util-android:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
42+
androidx.compose.ui:ui-util:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
43+
androidx.compose.ui:ui:1.8.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
44+
androidx.compose:compose-bom:2025.05.01=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
2845
androidx.concurrent:concurrent-futures:1.1.0=debugRuntimeClasspath,releaseRuntimeClasspath
29-
androidx.core:core-ktx:1.9.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
30-
androidx.core:core:1.9.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
46+
androidx.core:core-ktx:1.13.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
47+
androidx.core:core:1.13.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
3148
androidx.customview:customview-poolingcontainer:1.0.0=debugRuntimeClasspath,releaseRuntimeClasspath
3249
androidx.customview:customview:1.0.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
33-
androidx.emoji2:emoji2:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
50+
androidx.emoji2:emoji2:1.4.0=debugRuntimeClasspath,releaseRuntimeClasspath
3451
androidx.fragment:fragment:1.1.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
35-
androidx.lifecycle:lifecycle-common:2.6.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
36-
androidx.lifecycle:lifecycle-livedata-core:2.6.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
37-
androidx.lifecycle:lifecycle-livedata:2.6.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
38-
androidx.lifecycle:lifecycle-process:2.6.1=debugRuntimeClasspath,releaseRuntimeClasspath
39-
androidx.lifecycle:lifecycle-runtime-ktx:2.6.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
40-
androidx.lifecycle:lifecycle-runtime:2.6.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
41-
androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
42-
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
43-
androidx.lifecycle:lifecycle-viewmodel:2.6.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
52+
androidx.graphics:graphics-path:1.0.1=debugRuntimeClasspath,releaseRuntimeClasspath
53+
androidx.interpolator:interpolator:1.0.0=debugRuntimeClasspath,releaseRuntimeClasspath
54+
androidx.lifecycle:lifecycle-common-jvm:2.8.7=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
55+
androidx.lifecycle:lifecycle-common:2.8.7=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
56+
androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.7=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
57+
androidx.lifecycle:lifecycle-livedata-core:2.8.7=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
58+
androidx.lifecycle:lifecycle-livedata:2.8.7=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
59+
androidx.lifecycle:lifecycle-process:2.8.7=debugRuntimeClasspath,releaseRuntimeClasspath
60+
androidx.lifecycle:lifecycle-runtime-android:2.8.7=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
61+
androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
62+
androidx.lifecycle:lifecycle-runtime-compose:2.8.7=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
63+
androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
64+
androidx.lifecycle:lifecycle-runtime-ktx:2.8.7=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
65+
androidx.lifecycle:lifecycle-runtime:2.8.7=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
66+
androidx.lifecycle:lifecycle-viewmodel-android:2.8.7=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
67+
androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
68+
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
69+
androidx.lifecycle:lifecycle-viewmodel:2.8.7=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
4470
androidx.loader:loader:1.0.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
45-
androidx.profileinstaller:profileinstaller:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
71+
androidx.profileinstaller:profileinstaller:1.4.0=debugRuntimeClasspath,releaseRuntimeClasspath
4672
androidx.savedstate:savedstate-ktx:1.2.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
4773
androidx.savedstate:savedstate:1.2.1=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
4874
androidx.startup:startup-runtime:1.1.1=debugRuntimeClasspath,releaseRuntimeClasspath
@@ -56,12 +82,13 @@ com.google.android.play:feature-delivery-ktx:2.1.0=debugCompileClasspath,debugRu
5682
com.google.android.play:feature-delivery:2.1.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
5783
com.google.guava:listenablefuture:1.0=debugRuntimeClasspath,releaseRuntimeClasspath
5884
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.20=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
59-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
60-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
85+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
86+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
6187
org.jetbrains.kotlin:kotlin-stdlib:2.1.20=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
62-
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
63-
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
64-
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
65-
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
66-
org.jetbrains:annotations:13.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
88+
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
89+
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
90+
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
91+
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
92+
org.jetbrains:annotations:23.0.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
93+
org.jspecify:jspecify:1.0.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
6794
empty=

‎sample/bigboxfeature/api/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ android {
1818
buildFeatures {
1919
compose true
2020
}
21-
22-
composeOptions {
23-
kotlinCompilerExtensionVersion libs.versions.compose.get()
24-
}
2521
}
2622

2723
dependencies {

‎sample/bigboxfeature/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@ android {
1818
buildFeatures {
1919
compose true
2020
}
21-
22-
composeOptions {
23-
kotlinCompilerExtensionVersion libs.versions.compose.get()
24-
}
2521
}
2622

2723
dependencies {
24+
implementation platform(libs.compose.bom)
2825
implementation projects.app
2926
implementation projects.bigboxfeature.api
3027
implementation libs.compose.material

‎sample/extrabigboxfeature/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@ android {
1818
buildFeatures {
1919
compose true
2020
}
21-
22-
composeOptions {
23-
kotlinCompilerExtensionVersion libs.versions.compose.get()
24-
}
2521
}
2622

2723
dependencies {
24+
implementation platform(libs.compose.bom)
2825
implementation projects.app
2926
implementation libs.compose.material
3027
}

‎sample/gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
android.useAndroidX=true
1+
android.useAndroidX=true
2+
org.gradle.jvmargs=-Xmx2G -XX:+HeapDumpOnOutOfMemoryError

‎sample/smallboxfeature/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@ android {
1818
buildFeatures {
1919
compose true
2020
}
21-
22-
composeOptions {
23-
kotlinCompilerExtensionVersion libs.versions.compose.get()
24-
}
2521
}
2622

2723
dependencies {
24+
implementation platform(libs.compose.bom)
2825
implementation projects.bigboxfeature.api
2926
implementation projects.app
3027
implementation libs.compose.material

0 commit comments

Comments
 (0)