Skip to content

Commit e7b2ed6

Browse files
Update to new Compose release
1 parent 7e6cb46 commit e7b2ed6

File tree

3 files changed

+24
-16
lines changed

3 files changed

+24
-16
lines changed

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package com.google.samples.apps.nowinandroid
1919
import com.android.build.api.dsl.CommonExtension
2020
import org.gradle.api.Project
2121
import org.gradle.api.artifacts.VersionCatalogsExtension
22+
import org.gradle.kotlin.dsl.dependencies
2223
import org.gradle.kotlin.dsl.getByType
2324
import java.io.File
2425

@@ -42,6 +43,12 @@ internal fun Project.configureAndroidCompose(
4243
kotlinOptions {
4344
freeCompilerArgs = freeCompilerArgs + buildComposeMetricsParameters()
4445
}
46+
47+
dependencies {
48+
val bom = libs.findLibrary("androidx-compose-bom").get()
49+
add("implementation", platform(bom))
50+
add("androidTestImplementation", platform(bom))
51+
}
4552
}
4653
}
4754

core/testing/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
plugins {
1717
id("nowinandroid.android.library")
18+
id("nowinandroid.android.library.compose")
1819
id("nowinandroid.android.hilt")
1920
}
2021

gradle/libs.versions.toml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
[versions]
2-
accompanist = "0.24.8-beta"
2+
accompanist = "0.26.5-rc"
33
androidDesugarJdkLibs = "1.1.5"
44
androidGradlePlugin = "7.3.0"
55
androidxActivity = "1.6.0"
66
androidxAppCompat = "1.5.1"
7-
androidxCompose = "1.3.0-beta02"
8-
androidxComposeRuntimeTracing = "1.0.0-alpha01"
7+
androidxComposeBom = "2022.10.00"
98
androidxComposeCompiler = "1.3.2"
10-
androidxComposeMaterial3 = "1.0.0-beta03"
9+
androidxComposeRuntimeTracing = "1.0.0-alpha01"
1110
androidxCore = "1.9.0"
1211
androidxCoreSplashscreen = "1.0.0"
1312
androidxCustomView = "1.0.0"
@@ -56,19 +55,20 @@ android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs
5655
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" }
5756
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" }
5857
androidx-benchmark-macro = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "androidxMacroBenchmark" }
59-
androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "androidxCompose" }
60-
androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout", version.ref = "androidxCompose" }
61-
androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidxCompose" }
62-
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidxComposeMaterial3" }
63-
androidx-compose-material3-windowSizeClass = {group = "androidx.compose.material3", name = "material3-window-size-class", version.ref="androidxComposeMaterial3"}
64-
androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "androidxCompose" }
65-
androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata", version.ref = "androidxCompose" }
58+
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }
59+
androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
60+
androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }
61+
androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }
62+
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
63+
androidx-compose-material3-windowSizeClass = {group = "androidx.compose.material3", name = "material3-window-size-class" }
64+
androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
65+
androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata" }
6666
androidx-compose-runtime-tracing = { group = "androidx.compose.runtime", name = "runtime-tracing", version.ref = "androidxComposeRuntimeTracing" }
67-
androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "androidxCompose" }
68-
androidx-compose-ui-testManifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "androidxCompose" }
69-
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidxCompose" }
70-
androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "androidxCompose" }
71-
androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util", version.ref = "androidxCompose" }
67+
androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4" }
68+
androidx-compose-ui-testManifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
69+
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
70+
androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
71+
androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util" }
7272
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
7373
androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidxCoreSplashscreen" }
7474
androidx-customview-poolingcontainer = { group = "androidx.customview", name = "customview-poolingcontainer", version.ref = "androidxCustomView"}

0 commit comments

Comments
 (0)