From e9c54a89f46f11814899fc7eb079f91a95e56ea9 Mon Sep 17 00:00:00 2001 From: Clara Fok Date: Tue, 19 Aug 2025 09:28:00 -0700 Subject: [PATCH] Update dependencyGuardBaseline --- .../prodReleaseRuntimeClasspath.txt | 161 ++++++++++-------- feature/foryou/api/build.gradle.kts | 1 - feature/foryou/impl/build.gradle.kts | 1 + feature/interests/impl/build.gradle.kts | 1 + .../feature/topic/impl/TopicScreen.kt | 2 +- 5 files changed, 90 insertions(+), 76 deletions(-) diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt index 8457feb9f..6cbb9fcbc 100644 --- a/app/dependencies/prodReleaseRuntimeClasspath.txt +++ b/app/dependencies/prodReleaseRuntimeClasspath.txt @@ -1,6 +1,6 @@ -androidx.activity:activity-compose:1.9.3 -androidx.activity:activity-ktx:1.9.3 -androidx.activity:activity:1.9.3 +androidx.activity:activity-compose:1.12.0-SNAPSHOT +androidx.activity:activity-ktx:1.12.0-SNAPSHOT +androidx.activity:activity:1.12.0-SNAPSHOT androidx.annotation:annotation-experimental:1.4.1 androidx.annotation:annotation-jvm:1.9.1 androidx.annotation:annotation:1.9.1 @@ -10,23 +10,25 @@ androidx.arch.core:core-common:2.2.0 androidx.arch.core:core-runtime:2.2.0 androidx.autofill:autofill:1.0.0 androidx.browser:browser:1.8.0 -androidx.collection:collection-jvm:1.5.0-beta03 -androidx.collection:collection-ktx:1.5.0-beta03 -androidx.collection:collection:1.5.0-beta03 -androidx.compose.animation:animation-android:1.8.0-beta02 -androidx.compose.animation:animation-core-android:1.8.0-beta02 -androidx.compose.animation:animation-core:1.8.0-beta02 -androidx.compose.animation:animation:1.8.0-beta02 -androidx.compose.foundation:foundation-android:1.8.0-beta02 -androidx.compose.foundation:foundation-layout-android:1.8.0-beta02 -androidx.compose.foundation:foundation-layout:1.8.0-beta02 -androidx.compose.foundation:foundation:1.8.0-beta02 -androidx.compose.material3.adaptive:adaptive-android:1.1.0-rc01 -androidx.compose.material3.adaptive:adaptive-layout-android:1.1.0-rc01 -androidx.compose.material3.adaptive:adaptive-layout:1.1.0-rc01 -androidx.compose.material3.adaptive:adaptive-navigation-android:1.1.0-rc01 -androidx.compose.material3.adaptive:adaptive-navigation:1.1.0-rc01 -androidx.compose.material3.adaptive:adaptive:1.1.0-rc01 +androidx.collection:collection-jvm:1.5.0 +androidx.collection:collection-ktx:1.5.0 +androidx.collection:collection:1.5.0 +androidx.compose.animation:animation-android:1.9.0-beta01 +androidx.compose.animation:animation-core-android:1.9.0-beta01 +androidx.compose.animation:animation-core:1.9.0-beta01 +androidx.compose.animation:animation:1.9.0-beta01 +androidx.compose.foundation:foundation-android:1.9.0-beta01 +androidx.compose.foundation:foundation-layout-android:1.9.0-beta01 +androidx.compose.foundation:foundation-layout:1.9.0-beta01 +androidx.compose.foundation:foundation:1.9.0-beta01 +androidx.compose.material3.adaptive:adaptive-android:1.2.0-SNAPSHOT +androidx.compose.material3.adaptive:adaptive-layout-android:1.2.0-SNAPSHOT +androidx.compose.material3.adaptive:adaptive-layout:1.2.0-SNAPSHOT +androidx.compose.material3.adaptive:adaptive-navigation-android:1.2.0-SNAPSHOT +androidx.compose.material3.adaptive:adaptive-navigation3-android:1.0.0-SNAPSHOT +androidx.compose.material3.adaptive:adaptive-navigation3:1.0.0-SNAPSHOT +androidx.compose.material3.adaptive:adaptive-navigation:1.2.0-SNAPSHOT +androidx.compose.material3.adaptive:adaptive:1.2.0-SNAPSHOT androidx.compose.material3:material3-adaptive-navigation-suite-android:1.4.0-alpha08 androidx.compose.material3:material3-adaptive-navigation-suite:1.4.0-alpha08 androidx.compose.material3:material3-android:1.4.0-alpha08 @@ -39,31 +41,34 @@ androidx.compose.material:material-icons-extended-android:1.7.8 androidx.compose.material:material-icons-extended:1.7.8 androidx.compose.material:material-ripple-android:1.8.0-beta02 androidx.compose.material:material-ripple:1.8.0-beta02 -androidx.compose.runtime:runtime-android:1.8.0-beta02 -androidx.compose.runtime:runtime-saveable-android:1.8.0-beta02 -androidx.compose.runtime:runtime-saveable:1.8.0-beta02 -androidx.compose.runtime:runtime-tracing:1.8.0-beta02 -androidx.compose.runtime:runtime:1.8.0-beta02 -androidx.compose.ui:ui-android:1.8.0-beta02 -androidx.compose.ui:ui-geometry-android:1.8.0-beta02 -androidx.compose.ui:ui-geometry:1.8.0-beta02 -androidx.compose.ui:ui-graphics-android:1.8.0-beta02 -androidx.compose.ui:ui-graphics:1.8.0-beta02 -androidx.compose.ui:ui-text-android:1.8.0-beta02 -androidx.compose.ui:ui-text:1.8.0-beta02 -androidx.compose.ui:ui-tooling-preview-android:1.8.0-beta02 -androidx.compose.ui:ui-tooling-preview:1.8.0-beta02 -androidx.compose.ui:ui-unit-android:1.8.0-beta02 -androidx.compose.ui:ui-unit:1.8.0-beta02 -androidx.compose.ui:ui-util-android:1.8.0-beta02 -androidx.compose.ui:ui-util:1.8.0-beta02 -androidx.compose.ui:ui:1.8.0-beta02 +androidx.compose.runtime:runtime-android:1.9.0-beta03 +androidx.compose.runtime:runtime-annotation-android:1.9.0-beta03 +androidx.compose.runtime:runtime-annotation:1.9.0-beta03 +androidx.compose.runtime:runtime-saveable-android:1.9.0-beta03 +androidx.compose.runtime:runtime-saveable:1.9.0-beta03 +androidx.compose.runtime:runtime-tracing:1.9.0-beta03 +androidx.compose.runtime:runtime:1.9.0-beta03 +androidx.compose.ui:ui-android:1.9.0-beta03 +androidx.compose.ui:ui-geometry-android:1.9.0-beta03 +androidx.compose.ui:ui-geometry:1.9.0-beta03 +androidx.compose.ui:ui-graphics-android:1.9.0-beta03 +androidx.compose.ui:ui-graphics:1.9.0-beta03 +androidx.compose.ui:ui-text-android:1.9.0-beta03 +androidx.compose.ui:ui-text:1.9.0-beta03 +androidx.compose.ui:ui-tooling-preview-android:1.9.0-beta03 +androidx.compose.ui:ui-tooling-preview:1.9.0-beta03 +androidx.compose.ui:ui-unit-android:1.9.0-beta03 +androidx.compose.ui:ui-unit:1.9.0-beta03 +androidx.compose.ui:ui-util-android:1.9.0-beta03 +androidx.compose.ui:ui-util:1.9.0-beta03 +androidx.compose.ui:ui:1.9.0-beta03 androidx.compose:compose-bom-alpha:2025.02.00 androidx.concurrent:concurrent-futures-ktx:1.1.0 androidx.concurrent:concurrent-futures:1.1.0 -androidx.core:core-ktx:1.15.0 +androidx.core:core-ktx:1.16.0 androidx.core:core-splashscreen:1.0.1 -androidx.core:core:1.15.0 +androidx.core:core-viewtree:1.0.0 +androidx.core:core:1.16.0 androidx.cursoradapter:cursoradapter:1.0.0 androidx.customview:customview-poolingcontainer:1.0.0 androidx.customview:customview:1.0.0 @@ -87,39 +92,45 @@ androidx.graphics:graphics-path:1.0.1 androidx.graphics:graphics-shapes-android:1.0.1 androidx.graphics:graphics-shapes:1.0.1 androidx.hilt:hilt-common:1.2.0 -androidx.hilt:hilt-navigation-compose:1.2.0 -androidx.hilt:hilt-navigation:1.2.0 +androidx.hilt:hilt-lifecycle-viewmodel-compose:1.3.0-alpha02 +androidx.hilt:hilt-lifecycle-viewmodel:1.3.0-alpha02 androidx.hilt:hilt-work:1.2.0 androidx.interpolator:interpolator:1.0.0 androidx.legacy:legacy-support-core-utils:1.0.0 -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.7 +androidx.lifecycle:lifecycle-common-java8:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-common-jvm:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-common:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-livedata-core-ktx:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-livedata-core:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-livedata:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-process:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-runtime-android:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-runtime-compose-android:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-runtime-compose:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-runtime-ktx-android:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-runtime-ktx:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-runtime:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-service:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-viewmodel-android:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-viewmodel-compose-android:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-viewmodel-navigation3-android:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-viewmodel-navigation3:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-viewmodel-savedstate-android:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0-SNAPSHOT +androidx.lifecycle:lifecycle-viewmodel:2.10.0-SNAPSHOT androidx.loader:loader:1.0.0 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 androidx.metrics:metrics-performance:1.0.0-beta01 -androidx.navigation:navigation-common-ktx:2.8.5 -androidx.navigation:navigation-common:2.8.5 -androidx.navigation:navigation-compose:2.8.5 -androidx.navigation:navigation-runtime-ktx:2.8.5 -androidx.navigation:navigation-runtime:2.8.5 +androidx.navigation3:navigation3-runtime-android:1.0.0-SNAPSHOT +androidx.navigation3:navigation3-runtime:1.0.0-SNAPSHOT +androidx.navigation3:navigation3-ui-android:1.0.0-SNAPSHOT +androidx.navigation3:navigation3-ui:1.0.0-SNAPSHOT +androidx.navigationevent:navigationevent-android:1.0.0-SNAPSHOT +androidx.navigationevent:navigationevent-compose-android:1.0.0-SNAPSHOT +androidx.navigationevent:navigationevent-compose:1.0.0-SNAPSHOT +androidx.navigationevent:navigationevent:1.0.0-SNAPSHOT androidx.print:print:1.0.0 androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05 androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05 @@ -130,8 +141,11 @@ androidx.room:room-common:2.7.2 androidx.room:room-ktx:2.7.2 androidx.room:room-runtime-android:2.7.2 androidx.room:room-runtime:2.7.2 -androidx.savedstate:savedstate-ktx:1.2.1 -androidx.savedstate:savedstate:1.2.1 +androidx.savedstate:savedstate-android:1.4.0-SNAPSHOT +androidx.savedstate:savedstate-compose-android:1.4.0-SNAPSHOT +androidx.savedstate:savedstate-compose:1.4.0-SNAPSHOT +androidx.savedstate:savedstate-ktx:1.4.0-SNAPSHOT +androidx.savedstate:savedstate:1.4.0-SNAPSHOT androidx.sqlite:sqlite-android:2.5.1 androidx.sqlite:sqlite-framework-android:2.5.1 androidx.sqlite:sqlite-framework:2.5.1 @@ -144,10 +158,9 @@ androidx.vectordrawable:vectordrawable-animated:1.1.0 androidx.vectordrawable:vectordrawable:1.1.0 androidx.versionedparcelable:versionedparcelable:1.1.1 androidx.viewpager:viewpager:1.0.0 -androidx.window.extensions.core:core:1.0.0 -androidx.window:window-core-android:1.3.0 -androidx.window:window-core:1.3.0 -androidx.window:window:1.3.0 +androidx.window:window-core-android:1.4.0-rc01 +androidx.window:window-core:1.4.0-rc01 +androidx.window:window:1.4.0-rc01 androidx.work:work-runtime-ktx:2.10.0 androidx.work:work-runtime:2.10.0 com.caverock:androidsvg-aar:1.4 diff --git a/feature/foryou/api/build.gradle.kts b/feature/foryou/api/build.gradle.kts index 07a7ba663..99ac324a2 100644 --- a/feature/foryou/api/build.gradle.kts +++ b/feature/foryou/api/build.gradle.kts @@ -20,7 +20,6 @@ plugins { android { namespace = "com.google.samples.apps.nowinandroid.feature.foryou.api" - testOptions.unitTests.isIncludeAndroidResources = true } dependencies { diff --git a/feature/foryou/impl/build.gradle.kts b/feature/foryou/impl/build.gradle.kts index 5a91a1944..7964f8c4f 100644 --- a/feature/foryou/impl/build.gradle.kts +++ b/feature/foryou/impl/build.gradle.kts @@ -22,6 +22,7 @@ plugins { android { namespace = "com.google.samples.apps.nowinandroid.feature.foryou.impl" + testOptions.unitTests.isIncludeAndroidResources = true } dependencies { diff --git a/feature/interests/impl/build.gradle.kts b/feature/interests/impl/build.gradle.kts index d1a682e27..fedc7fba6 100644 --- a/feature/interests/impl/build.gradle.kts +++ b/feature/interests/impl/build.gradle.kts @@ -21,6 +21,7 @@ plugins { } android { namespace = "com.google.samples.apps.nowinandroid.feature.interests.impl" + testOptions.unitTests.isIncludeAndroidResources = true } dependencies { diff --git a/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/TopicScreen.kt b/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/TopicScreen.kt index 7c1624ce8..5c802f225 100644 --- a/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/TopicScreen.kt +++ b/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/TopicScreen.kt @@ -64,11 +64,11 @@ import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic import com.google.samples.apps.nowinandroid.core.model.data.UserNewsResource import com.google.samples.apps.nowinandroid.core.ui.DevicePreviews -import com.google.samples.apps.nowinandroid.core.ui.R as UiR import com.google.samples.apps.nowinandroid.core.ui.TrackScreenViewEvent import com.google.samples.apps.nowinandroid.core.ui.TrackScrollJank import com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProvider import com.google.samples.apps.nowinandroid.core.ui.userNewsResourceCardItems +import com.google.samples.apps.nowinandroid.core.ui.R as UiR import com.google.samples.apps.nowinandroid.feature.topic.api.R as TopicR @Composable