Merge changes from topic "nav_compose" into androidx-main
* changes:
Fix misconfig deps for nav-compose
Update verification-metadata to include collection version
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 5d0eb4f..9922876 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -58,7 +58,7 @@
<trust group="androidx[.]annotation" version="1\.9\.0-beta[0-9][1-9]" regex="true" reason="New versions, not yet signed"/>
<trust group="androidx[.]annotation" version="1\.[0-7]\..*" regex="true" reason="Old versions, before signing"/>
<trust group="androidx[.]collection" version="1\.5\.0-alpha[0-9][1-9]" regex="true" reason="Old versions, before signing"/>
- <trust group="androidx[.]collection" version="1\.[0-3]\..*" regex="true" reason="Old versions, before signing"/>
+ <trust group="androidx[.]collection" version="1\.[0-4]\..*" regex="true" reason="Old versions, before signing"/>
</trusted-artifacts>
<trusted-keys>
<trusted-key id="00089EE8C3AFA95A854D0F1DF800DD0933ECF7F7" group="com.google.guava"/>
diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle
index af843ef..1d733ed 100644
--- a/navigation/navigation-compose/build.gradle
+++ b/navigation/navigation-compose/build.gradle
@@ -27,37 +27,62 @@
}
dependencies {
-
- implementation(libs.kotlinStdlib)
+ api(libs.kotlinStdlib)
api("androidx.activity:activity-compose:1.8.0")
- api("androidx.compose.animation:animation:1.7.0-rc01")
- implementation("androidx.compose.foundation:foundation-layout:1.7.0-rc01")
- api("androidx.compose.runtime:runtime:1.7.0-rc01")
- api("androidx.compose.runtime:runtime-saveable:1.7.0-rc01")
- api("androidx.compose.ui:ui:1.7.0-rc01")
- api("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2")
- api(project(":navigation:navigation-runtime-ktx"))
+ api("androidx.compose.animation:animation:1.7.2")
+ api("androidx.compose.runtime:runtime:1.7.2")
+ api("androidx.compose.runtime:runtime-saveable:1.7.2")
+ api("androidx.compose.ui:ui:1.7.2")
+ api("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2")
+ api(project(":navigation:navigation-runtime"))
+ api(project(":navigation:navigation-common"))
+
+ implementation("androidx.activity:activity:1.8.0")
+ implementation("androidx.annotation:annotation:1.8.0")
+ implementation("androidx.compose.animation:animation-core:1.7.2")
+ implementation("androidx.compose.foundation:foundation-layout:1.7.2")
+ implementation("androidx.lifecycle:lifecycle-common:2.8.2")
+ implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.2")
+ implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.2")
+ implementation("androidx.lifecycle:lifecycle-viewmodel:2.8.2")
+ implementation(libs.kotlinCoroutinesCore)
implementation(libs.kotlinSerializationCore)
- androidTestImplementation(project(":compose:material:material"))
- androidTestImplementation project(":compose:test-utils")
- androidTestImplementation project(":compose:ui:ui-tooling")
+ androidTestImplementation("androidx.activity:activity:1.9.2")
+ androidTestImplementation("androidx.collection:collection-ktx:1.4.2")
+ androidTestImplementation("androidx.core:core-ktx:1.13.0")
+ androidTestImplementation("androidx.lifecycle:lifecycle-runtime-testing:2.8.2")
+ androidTestImplementation("androidx.lifecycle:lifecycle-runtime:2.8.2")
+ androidTestImplementation("androidx.lifecycle:lifecycle-common:2.8.2")
+ androidTestImplementation("androidx.lifecycle:lifecycle-viewmodel:2.8.2")
+ androidTestImplementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.2")
+ androidTestImplementation("androidx.savedstate:savedstate:1.2.1")
androidTestImplementation(project(":navigation:navigation-testing"))
androidTestImplementation(project(":internal-testutils-navigation"), {
exclude group: "androidx.navigation", module: "navigation-common"
})
- androidTestImplementation(project(":compose:ui:ui-test-junit4"))
- androidTestImplementation(project(":lifecycle:lifecycle-common"))
- androidTestImplementation(project(":lifecycle:lifecycle-common-java8"))
- androidTestImplementation(project(":lifecycle:lifecycle-livedata-core"))
- androidTestImplementation(project(":lifecycle:lifecycle-viewmodel"))
- androidTestImplementation(project(":lifecycle:lifecycle-viewmodel-savedstate"))
- androidTestImplementation(project(":activity:activity-ktx"))
- androidTestImplementation("androidx.collection:collection-ktx:1.4.2")
+ androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testRunner)
androidTestImplementation(libs.junit)
androidTestImplementation(libs.truth)
+ // Compose test dependencies
+ androidTestImplementation(project(":compose:animation:animation"))
+ androidTestImplementation(project(":compose:animation:animation-core"))
+ androidTestImplementation(project(":compose:foundation:foundation"))
+ androidTestImplementation(project(":compose:runtime:runtime"))
+ androidTestImplementation(project(":compose:runtime:runtime-saveable"))
+ androidTestImplementation(project(":compose:ui:ui"))
+ androidTestImplementation(project(":compose:ui:ui-graphics"))
+ androidTestImplementation(project(":compose:ui:ui-test"))
+ androidTestImplementation(project(":compose:ui:ui-text"))
+ androidTestImplementation(project(":compose:ui:ui-tooling-preview"))
+ androidTestImplementation(project(":compose:ui:ui-unit"))
+ androidTestImplementation(project(":compose:material:material"))
+ androidTestImplementation(project(":compose:test-utils"))
+ androidTestImplementation(project(":compose:ui:ui-test-junit4"))
+ androidTestImplementation(project(":compose:ui:ui-tooling"))
+
lintChecks(project(":navigation:navigation-compose-lint"))
lintPublish(project(":navigation:navigation-compose-lint"))
}
