Fix build after ag/3265951
Test: ./gradlew assembleDebug in app-toolkit
Change-Id: Ied2a81860e6ca8eaf0d0acaa101e9b4e11d64fb8
diff --git a/navigation/integration-tests/testapp/build.gradle b/navigation/integration-tests/testapp/build.gradle
index 5cd5fe0..d24e3ff 100644
--- a/navigation/integration-tests/testapp/build.gradle
+++ b/navigation/integration-tests/testapp/build.gradle
@@ -43,16 +43,8 @@
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile project(":navigation:runtime")
- compile libs.support.design
- androidTestCompile(libs.test_runner) {
- exclude module: 'support-annotations'
- }
- androidTestCompile(libs.espresso_core, {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
- testCompile libs.junit
+ implementation project(":navigation:runtime")
+ implementation libs.support.design
}
tasks['check'].dependsOn(tasks['connectedCheck'])
diff --git a/navigation/runtime/build.gradle b/navigation/runtime/build.gradle
index 0589eba..2fa2745 100644
--- a/navigation/runtime/build.gradle
+++ b/navigation/runtime/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
import android.support.SupportLibraryExtension
@@ -32,19 +33,12 @@
compile libs.support.core_utils
compile libs.support.fragments
- testCompile libs.junit
- testCompile libs.mockito_core
+ testImplementation(JUNIT)
+ testImplementation(MOCKITO_CORE)
+ testImplementation(TEST_RUNNER, libs.exclude_annotations)
- testCompile(libs.test_runner) {
- exclude module: 'support-annotations'
- }
-
- androidTestCompile(libs.test_runner) {
- exclude module: 'support-annotations'
- }
- androidTestCompile(libs.espresso_core, {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
}
supportLibrary {
diff --git a/navigation/safe-args-generator/build.gradle b/navigation/safe-args-generator/build.gradle
index 03edb3e..0fb7ac0 100644
--- a/navigation/safe-args-generator/build.gradle
+++ b/navigation/safe-args-generator/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
import android.support.SupportLibraryExtension
@@ -29,7 +30,7 @@
compile libs.xpp3
compile libs.xmlpull
compile libs.kotlin.stdlib
- testCompile libs.junit
+ testCompile(JUNIT)
testCompile libs.xpp3
testCompile libs.xmlpull
}
