A fully functional Android app built entirely with Kotlin and Jetpack Compose
Dependency version upgrades, not API 35 yet (#1719)
Ben Weiss4a0723441f0b
diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txtindex 8c5c28927..599c4ff64 100644--- a/app/dependencies/prodReleaseRuntimeClasspath.txt+++ b/app/dependencies/prodReleaseRuntimeClasspath.txt@@ -89,38 +89,38 @@ androidx.hilt:hilt-navigation:1.2.0androidx.hilt:hilt-work:1.2.0androidx.interpolator:interpolator:1.0.0androidx.legacy:legacy-support-core-utils:1.0.0-androidx.lifecycle:lifecycle-common-java8:2.8.6-androidx.lifecycle:lifecycle-common-jvm:2.8.6-androidx.lifecycle:lifecycle-common:2.8.6-androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.6-androidx.lifecycle:lifecycle-livedata-core:2.8.6-androidx.lifecycle:lifecycle-livedata:2.8.6-androidx.lifecycle:lifecycle-process:2.8.6-androidx.lifecycle:lifecycle-runtime-android:2.8.6-androidx.lifecycle:lifecycle-runtime-compose-android:2.8.6-androidx.lifecycle:lifecycle-runtime-compose:2.8.6-androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.6-androidx.lifecycle:lifecycle-runtime-ktx:2.8.6-androidx.lifecycle:lifecycle-runtime:2.8.6-androidx.lifecycle:lifecycle-service:2.8.6-androidx.lifecycle:lifecycle-viewmodel-android:2.8.6-androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.6-androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6-androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.6-androidx.lifecycle:lifecycle-viewmodel:2.8.6+androidx.lifecycle:lifecycle-common-java8:2.8.7+androidx.lifecycle:lifecycle-common-jvm:2.8.7+androidx.lifecycle:lifecycle-common:2.8.7+androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.7+androidx.lifecycle:lifecycle-livedata-core:2.8.7+androidx.lifecycle:lifecycle-livedata:2.8.7+androidx.lifecycle:lifecycle-process:2.8.7+androidx.lifecycle:lifecycle-runtime-android:2.8.7+androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7+androidx.lifecycle:lifecycle-runtime-compose:2.8.7+androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7+androidx.lifecycle:lifecycle-runtime-ktx:2.8.7+androidx.lifecycle:lifecycle-runtime:2.8.7+androidx.lifecycle:lifecycle-service:2.8.7+androidx.lifecycle:lifecycle-viewmodel-android:2.8.7+androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.7+androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7+androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7+androidx.lifecycle:lifecycle-viewmodel:2.8.7androidx.loader:loader:1.0.0androidx.localbroadcastmanager:localbroadcastmanager:1.0.0androidx.metrics:metrics-performance:1.0.0-beta01-androidx.navigation:navigation-common-ktx:2.8.0-androidx.navigation:navigation-common:2.8.0-androidx.navigation:navigation-compose:2.8.0-androidx.navigation:navigation-runtime-ktx:2.8.0-androidx.navigation:navigation-runtime:2.8.0+androidx.navigation:navigation-common-ktx:2.8.4+androidx.navigation:navigation-common:2.8.4+androidx.navigation:navigation-compose:2.8.4+androidx.navigation:navigation-runtime-ktx:2.8.4+androidx.navigation:navigation-runtime:2.8.4androidx.print:print:1.0.0androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05-androidx.profileinstaller:profileinstaller:1.3.1+androidx.profileinstaller:profileinstaller:1.4.1androidx.resourceinspection:resourceinspection-annotation:1.0.1androidx.room:room-common:2.6.1androidx.room:room-ktx:2.6.1@@ -141,8 +141,8 @@ androidx.window.extensions.core:core:1.0.0androidx.window:window-core-android:1.3.0androidx.window:window-core:1.3.0androidx.window:window:1.3.0-androidx.work:work-runtime-ktx:2.9.0-androidx.work:work-runtime:2.9.0+androidx.work:work-runtime-ktx:2.9.1+androidx.work:work-runtime:2.9.1com.caverock:androidsvg-aar:1.4com.google.accompanist:accompanist-drawablepainter:0.32.0com.google.accompanist:accompanist-permissions:0.36.0@@ -153,12 +153,12 @@ com.google.android.gms:play-services-ads-identifier:18.0.0com.google.android.gms:play-services-base:18.5.0com.google.android.gms:play-services-basement:18.4.0com.google.android.gms:play-services-cloud-messaging:17.2.0-com.google.android.gms:play-services-measurement-api:22.1.0-com.google.android.gms:play-services-measurement-base:22.1.0-com.google.android.gms:play-services-measurement-impl:22.1.0-com.google.android.gms:play-services-measurement-sdk-api:22.1.0-com.google.android.gms:play-services-measurement-sdk:22.1.0-com.google.android.gms:play-services-measurement:22.1.0+com.google.android.gms:play-services-measurement-api:22.1.2+com.google.android.gms:play-services-measurement-base:22.1.2+com.google.android.gms:play-services-measurement-impl:22.1.2+com.google.android.gms:play-services-measurement-sdk-api:22.1.2+com.google.android.gms:play-services-measurement-sdk:22.1.2+com.google.android.gms:play-services-measurement:22.1.2com.google.android.gms:play-services-oss-licenses:17.1.0com.google.android.gms:play-services-stats:17.0.2com.google.android.gms:play-services-tasks:18.2.0@@ -169,15 +169,15 @@ com.google.dagger:hilt-android:2.52com.google.dagger:hilt-core:2.52com.google.errorprone:error_prone_annotations:2.26.0com.google.firebase:firebase-abt:21.1.1-com.google.firebase:firebase-analytics:22.1.0+com.google.firebase:firebase-analytics:22.1.2com.google.firebase:firebase-annotations:16.2.0-com.google.firebase:firebase-bom:33.3.0+com.google.firebase:firebase-bom:33.7.0com.google.firebase:firebase-common-ktx:21.0.0com.google.firebase:firebase-common:21.0.0com.google.firebase:firebase-components:18.0.0com.google.firebase:firebase-config-interop:16.0.1-com.google.firebase:firebase-config:22.0.0-com.google.firebase:firebase-crashlytics:19.1.0+com.google.firebase:firebase-config:22.0.1+com.google.firebase:firebase-crashlytics:19.3.0com.google.firebase:firebase-datatransport:19.0.0com.google.firebase:firebase-encoders-json:18.0.1com.google.firebase:firebase-encoders-proto:16.0.0@@ -186,16 +186,15 @@ com.google.firebase:firebase-iid-interop:17.1.0com.google.firebase:firebase-installations-interop:17.2.0com.google.firebase:firebase-installations:18.0.0com.google.firebase:firebase-measurement-connector:20.0.1-com.google.firebase:firebase-messaging:24.0.1-com.google.firebase:firebase-perf:21.0.1-com.google.firebase:firebase-sessions:2.0.4-com.google.firebase:protolite-well-known-types:18.0.0+com.google.firebase:firebase-messaging:24.1.0+com.google.firebase:firebase-perf:21.0.3+com.google.firebase:firebase-sessions:2.0.7com.google.guava:failureaccess:1.0.1com.google.guava:guava:31.1-androidcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guavacom.google.j2objc:j2objc-annotations:1.3-com.google.protobuf:protobuf-javalite:4.26.1-com.google.protobuf:protobuf-kotlin-lite:4.26.1+com.google.protobuf:protobuf-javalite:4.28.2+com.google.protobuf:protobuf-kotlin-lite:4.28.2com.squareup.okhttp3:logging-interceptor:4.12.0com.squareup.okhttp3:okhttp:4.12.0com.squareup.okio:okio-jvm:3.9.0diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.ktindex 422592b8a..a5e001bd2 100644--- a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt@@ -21,6 +21,7 @@ import org.gradle.api.Pluginimport org.gradle.api.Projectimport org.gradle.kotlin.dsl.configureimport org.gradle.kotlin.dsl.dependencies+import org.gradle.kotlin.dsl.excludeclass AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {override fun apply(target: Project) {@@ -35,7 +36,16 @@ class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {val bom = libs.findLibrary("firebase-bom").get()add("implementation", platform(bom))"implementation"(libs.findLibrary("firebase.analytics").get())- "implementation"(libs.findLibrary("firebase.performance").get())+ "implementation"(libs.findLibrary("firebase.performance").get()) {+ /*+ Exclusion of protobuf / protolite dependencies is necessary as the+ datastore-proto brings in protobuf dependencies. These are the source of truth+ for Now in Android.+ That's why the duplicate classes from below dependencies are excluded.+ */+ exclude(group = "com.google.protobuf", module = "protobuf-javalite")+ exclude(group = "com.google.firebase", module = "protolite-well-known-types")+ }"implementation"(libs.findLibrary("firebase.crashlytics").get())}diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex aaaee166a..676b99ee5 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -1,9 +1,9 @@[versions]accompanist = "0.36.0"-androidDesugarJdkLibs = "2.0.4"+androidDesugarJdkLibs = "2.1.3"# AGP and tools should be updated togetherandroidGradlePlugin = "8.6.1"-androidTools = "31.7.2"+androidTools = "31.7.3"androidxActivity = "1.9.3"androidxAppCompat = "1.7.0"androidxBrowser = "1.8.0"@@ -14,11 +14,11 @@ androidxCoreSplashscreen = "1.0.1"androidxDataStore = "1.1.1"androidxEspresso = "3.6.1"androidxHiltNavigationCompose = "1.2.0"-androidxLifecycle = "2.8.6"-androidxMacroBenchmark = "1.3.1"+androidxLifecycle = "2.8.7"+androidxMacroBenchmark = "1.3.3"androidxMetrics = "1.0.0-beta01"-androidxNavigation = "2.8.0"-androidxProfileinstaller = "1.3.1"+androidxNavigation = "2.8.4"+androidxProfileinstaller = "1.4.1"androidxTestCore = "1.6.1"androidxTestExt = "1.2.1"androidxTestRules = "1.6.1"@@ -26,13 +26,13 @@ androidxTestRunner = "1.6.2"androidxTracing = "1.3.0-alpha02"androidxUiAutomator = "2.3.0"androidxWindowManager = "1.3.0"-androidxWork = "2.9.0"+androidxWork = "2.9.1"coil = "2.7.0"dependencyGuard = "0.5.0"-firebaseBom = "33.3.0"-firebaseCrashlyticsPlugin = "2.9.9"+firebaseBom = "33.7.0"+firebaseCrashlyticsPlugin = "3.0.2"firebasePerfPlugin = "1.4.2"-gmsPlugin = "4.4.1"+gmsPlugin = "4.4.2"googleOss = "17.1.0"googleOssPlugin = "0.10.6"hilt = "2.52"@@ -46,12 +46,12 @@ kotlinxSerializationJson = "1.6.3"ksp = "2.0.20-1.0.25"moduleGraph = "2.7.1"okhttp = "4.12.0"-protobuf = "4.26.1"+protobuf = "4.28.2"protobufPlugin = "0.9.4"retrofit = "2.11.0"retrofitKotlinxSerializationJson = "1.0.0"-robolectric = "4.14"-roborazzi = "1.32.2"+robolectric = "4.14.1"+roborazzi = "1.36.0"room = "2.6.1"secrets = "2.0.1"truth = "1.4.4"