Making truth, testing, and utils depend on base modules
Since all of navigation is now in kotlin and the -ktx modules are empty,
we should switch all modules to depend directly on the base module.
Also changed all the modules that use internal-testutils-navigation to
exclude navigation-common base module instead of the ktx.
RelNote: "The Navigation Testing and Navigation Test modules now depend
on the base Navigation modules instead of the empty -ktx modules."
Test: all tests pass
Bug: 184292145
Change-Id: I1b5f5cdb63ae1912cbd9ffb0dbbdc44664fd179a
diff --git a/hilt/hilt-navigation-fragment/build.gradle b/hilt/hilt-navigation-fragment/build.gradle
index 20a9198..39fd6ef 100644
--- a/hilt/hilt-navigation-fragment/build.gradle
+++ b/hilt/hilt-navigation-fragment/build.gradle
@@ -51,7 +51,7 @@
kaptAndroidTest(HILT_COMPILER)
androidTestImplementation(project(":internal-testutils-runtime"))
androidTestImplementation(project(":internal-testutils-navigation"), {
- exclude group: 'androidx.navigation', module: 'navigation-common-ktx'
+ exclude group: 'androidx.navigation', module: 'navigation-common'
})
}
diff --git a/navigation/integration-tests/testapp/build.gradle b/navigation/integration-tests/testapp/build.gradle
index 6b61494..190bedf 100644
--- a/navigation/integration-tests/testapp/build.gradle
+++ b/navigation/integration-tests/testapp/build.gradle
@@ -35,7 +35,7 @@
implementation(project(":navigation:navigation-fragment-ktx"))
implementation(project(":navigation:navigation-ui-ktx"))
implementation(project(":internal-testutils-navigation"), {
- exclude group: "androidx.navigation", module: "navigation-common-ktx"
+ exclude group: "androidx.navigation", module: "navigation-common"
})
}
diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle
index 99873f8..3452f2d 100644
--- a/navigation/navigation-compose/build.gradle
+++ b/navigation/navigation-compose/build.gradle
@@ -43,7 +43,7 @@
androidTestImplementation(projectOrArtifact(":compose:material:material"))
androidTestImplementation(projectOrArtifact(":navigation:navigation-testing"))
androidTestImplementation(projectOrArtifact(":internal-testutils-navigation"), {
- exclude group: "androidx.navigation", module: "navigation-common-ktx"
+ exclude group: "androidx.navigation", module: "navigation-common"
})
androidTestImplementation(projectOrArtifact(":compose:ui:ui-test-junit4"))
androidTestImplementation(ANDROIDX_TEST_RUNNER)
diff --git a/navigation/navigation-fragment/build.gradle b/navigation/navigation-fragment/build.gradle
index 2c03dad..fa1132c 100644
--- a/navigation/navigation-fragment/build.gradle
+++ b/navigation/navigation-fragment/build.gradle
@@ -41,7 +41,7 @@
exclude group: "androidx.fragment", module: "fragment"
})
androidTestImplementation(project(":internal-testutils-navigation"), {
- exclude group: "androidx.navigation", module: "navigation-common-ktx"
+ exclude group: "androidx.navigation", module: "navigation-common"
})
}
diff --git a/navigation/navigation-runtime-truth/build.gradle b/navigation/navigation-runtime-truth/build.gradle
index f9798fd..dca17f9 100644
--- a/navigation/navigation-runtime-truth/build.gradle
+++ b/navigation/navigation-runtime-truth/build.gradle
@@ -29,12 +29,12 @@
}
dependencies {
- api(project(":navigation:navigation-runtime-ktx"))
+ api(project(":navigation:navigation-runtime"))
api(TRUTH)
api(KOTLIN_STDLIB)
androidTestImplementation(project(":internal-testutils-truth"))
androidTestImplementation(project(":internal-testutils-navigation"), {
- exclude group: "androidx.navigation", module: "navigation-common-ktx"
+ exclude group: "androidx.navigation", module: "navigation-common"
})
androidTestImplementation(TRUTH)
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/navigation/navigation-testing/build.gradle b/navigation/navigation-testing/build.gradle
index 66ae397..50507ea 100644
--- a/navigation/navigation-testing/build.gradle
+++ b/navigation/navigation-testing/build.gradle
@@ -28,10 +28,10 @@
}
dependencies {
- api(project(":navigation:navigation-runtime-ktx"))
+ api(project(":navigation:navigation-runtime"))
androidTestImplementation(project(":internal-testutils-navigation"), {
- exclude group: "androidx.navigation", module: "navigation-common-ktx"
+ exclude group: "androidx.navigation", module: "navigation-common"
})
androidTestImplementation(ANDROIDX_TEST_CORE)
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/navigation/navigation-ui/build.gradle b/navigation/navigation-ui/build.gradle
index f8525004..446191d 100644
--- a/navigation/navigation-ui/build.gradle
+++ b/navigation/navigation-ui/build.gradle
@@ -40,7 +40,7 @@
implementation("androidx.transition:transition:1.3.0")
androidTestImplementation(project(":internal-testutils-navigation"), {
- exclude group: "androidx.navigation", module: "navigation-common-ktx"
+ exclude group: "androidx.navigation", module: "navigation-common"
})
androidTestImplementation(KOTLIN_STDLIB)
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/testutils/testutils-navigation/build.gradle b/testutils/testutils-navigation/build.gradle
index 88f707b..ebc0c567 100644
--- a/testutils/testutils-navigation/build.gradle
+++ b/testutils/testutils-navigation/build.gradle
@@ -27,7 +27,7 @@
}
dependencies {
- api(projectOrArtifact(":navigation:navigation-common-ktx"))
+ api(projectOrArtifact(":navigation:navigation-common"))
testImplementation(JUNIT)
testImplementation(MOCKITO_CORE)
