From a60687ae730e0ccd28db11bcab7f71dcca7318ce Mon Sep 17 00:00:00 2001 From: Alex Vanyo Date: Wed, 7 Sep 2022 14:41:19 -0700 Subject: [PATCH] Update Kotlin, Compose and add runtime-tracing Change-Id: I1697541a70a47281424fa51dfe5cab78bf89a1f6 --- app/build.gradle.kts | 2 ++ .../samples/apps/nowinandroid/KotlinAndroid.kt | 2 +- gradle/libs.versions.toml | 12 +++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0ce7872b3..ea226b768 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -116,6 +116,8 @@ dependencies { implementation(libs.androidx.appcompat) implementation(libs.androidx.core.ktx) implementation(libs.androidx.core.splashscreen) + implementation(libs.androidx.compose.runtime) + implementation(libs.androidx.compose.runtime.tracing) implementation(libs.androidx.compose.material3.windowSizeClass) implementation(libs.androidx.window.manager) implementation(libs.androidx.profileinstaller) diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt index 5dc7b987d..4768c7346 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt @@ -33,7 +33,7 @@ internal fun Project.configureKotlinAndroid( commonExtension: CommonExtension<*, *, *, *>, ) { commonExtension.apply { - compileSdk = 32 + compileSdk = 33 defaultConfig { minSdk = 21 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6880d31ac..621c259ba 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,8 +4,9 @@ androidDesugarJdkLibs = "1.1.5" androidGradlePlugin = "7.2.2" androidxActivity = "1.5.1" androidxAppCompat = "1.5.0" -androidxCompose = "1.2.1" -androidxComposeCompiler = "1.2.0" +androidxCompose = "1.3.0-beta02" +androidxComposeRuntimeTracing = "1.0.0-alpha01" +androidxComposeCompiler = "1.3.1" androidxComposeMaterial3 = "1.0.0-alpha13" androidxCore = "1.8.0" androidxCoreSplashscreen = "1.0.0" @@ -31,11 +32,11 @@ hilt = "2.42" hiltExt = "1.0.0" jacoco = "0.8.7" junit4 = "4.13.2" -kotlin = "1.7.0" -kotlinxCoroutines = "1.6.3" +kotlin = "1.7.10" +kotlinxCoroutines = "1.6.4" kotlinxDatetime = "0.4.0" kotlinxSerializationJson = "1.4.0" -ksp = "1.7.0-1.0.6" +ksp = "1.7.10-1.0.6" ktlint = "0.43.0" lint = "30.2.2" okhttp = "4.10.0" @@ -61,6 +62,7 @@ androidx-compose-material3 = { group = "androidx.compose.material3", name = "mat androidx-compose-material3-windowSizeClass = {group = "androidx.compose.material3", name = "material3-window-size-class", version.ref="androidxComposeMaterial3"} androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "androidxCompose" } androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata", version.ref = "androidxCompose" } +androidx-compose-runtime-tracing = { group = "androidx.compose.runtime", name = "runtime-tracing", version.ref = "androidxComposeRuntimeTracing" } androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "androidxCompose" } androidx-compose-ui-testManifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "androidxCompose" } androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidxCompose" }