compose navigation stuff added to build gradle

open-telemetry · Jul 30, 2024 · 6a7bbd2 · 6a7bbd2
1 parent d636d6c
commit 6a7bbd2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts
@@ -65,8 +65,10 @@ dependencies {
     implementation(libs.androidx.navigation.fragment.ktx)
     implementation(libs.androidx.navigation.ui.ktx)
     implementation(libs.opentelemetry.api.incubator)
-    val nav_version = "2.7.7"
-    implementation("androidx.navigation:navigation-compose:$nav_version")
+    implementation(libs.androidx.navigation.compose)
+
+//    val nav_version = "2.7.7"
+//    implementation("androidx.navigation:navigation-compose:$nav_version")
 
     coreLibraryDesugaring(libs.desugarJdkLibs)
 

diff --git a/demo-app/gradle/libs.versions.toml b/demo-app/gradle/libs.versions.toml
@@ -4,6 +4,7 @@ opentelemetry-alpha = "1.39.0-alpha"
 junit = "5.10.3"
 spotless = "6.25.0"
 kotlin = "2.0.0"
+navigation-compose = "2.7.7"
 
 [libraries]
 androidx-appcompat = "androidx.appcompat:appcompat:1.7.0"
@@ -37,6 +38,11 @@ androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecy
 androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version = "2.8.4" }
 androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version = "2.7.7" }
 androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version = "2.7.7" }
+androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version = "2.8.3" }
+androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version = "2.8.3" }
+androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigation-compose" }
+androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigation-compose" }
+androidx-navigation-compose = {group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation-compose"}
 
 [bundles]
 junit = ["junit-jupiter-api", "junit-jupiter-engine", "junit-vintage-engine"]