Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Update dependencyGuardBaseline

Clara Foka878b170dc1f
diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt
index f4f1e35c8..797e9e2ce 100644
--- a/app/dependencies/prodReleaseRuntimeClasspath.txt
+++ b/app/dependencies/prodReleaseRuntimeClasspath.txt
@@ -1,6 +1,6 @@
-androidx.activity:activity-compose:1.10.1
-androidx.activity:activity-ktx:1.10.1
-androidx.activity:activity:1.10.1
+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.5.1
androidx.annotation:annotation-jvm:1.9.1
androidx.annotation:annotation:1.9.1
@@ -25,6 +25,8 @@ androidx.compose.material3.adaptive:adaptive-android:1.2.0-beta01
androidx.compose.material3.adaptive:adaptive-layout-android:1.2.0-beta01
androidx.compose.material3.adaptive:adaptive-layout:1.2.0-beta01
androidx.compose.material3.adaptive:adaptive-navigation-android:1.2.0-beta01
+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-beta01
androidx.compose.material3.adaptive:adaptive:1.2.0-beta01
androidx.compose.material3:material3-adaptive-navigation-suite-android:1.5.0-alpha03
@@ -91,8 +93,8 @@ 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
@@ -114,17 +116,22 @@ androidx.lifecycle:lifecycle-viewmodel-android:2.10.0-alpha03
androidx.lifecycle:lifecycle-viewmodel-compose-android:2.10.0-alpha03
androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0-alpha03
androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0-alpha03
+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-alpha03
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0-alpha03
androidx.lifecycle:lifecycle-viewmodel:2.10.0-alpha03
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
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