Fix AS sync issues using prebuilts.
Test: N/A
Change-Id: Icfa5c4f51a8161ad99d0792e40a71eaf62596656
diff --git a/app-toolkit/core-testing/build.gradle b/app-toolkit/core-testing/build.gradle
index e4c2e17..946b18d 100644
--- a/app-toolkit/core-testing/build.gradle
+++ b/app-toolkit/core-testing/build.gradle
@@ -44,4 +44,4 @@
inceptionYear = "2017"
description = "Android Core-Testing"
url = SupportLibraryExtension.ARCHITECTURE_URL
-}
\ No newline at end of file
+}
diff --git a/browser/build.gradle b/browser/build.gradle
index 582e1ea..9930bbd 100644
--- a/browser/build.gradle
+++ b/browser/build.gradle
@@ -14,8 +14,8 @@
api(project(":legacy-support-core-ui"))
api(project(":appcompat"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(project(":internal-testutils"))
}
diff --git a/buildSrc/dependencies.gradle b/buildSrc/dependencies.gradle
index 007e069..50b31a6 100644
--- a/buildSrc/dependencies.gradle
+++ b/buildSrc/dependencies.gradle
@@ -30,6 +30,13 @@
exclude group: 'androidx.annotation'
}
+libs.exclude_for_espresso = {
+ exclude group: 'androidx.annotation'
+ exclude group: 'androidx.appcompat'
+ exclude group: 'androidx.recyclerview'
+ exclude group: 'androidx.legacy'
+}
+
libs.support_exclude_config = {
exclude group: 'android.arch.core'
exclude group: 'android.arch.lifecycle'
diff --git a/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt b/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
index f55db68..3c4ae5c 100644
--- a/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
@@ -41,6 +41,13 @@
const val RX_JAVA = "io.reactivex.rxjava2:rxjava:2.0.6"
const val TEST_RUNNER = "com.android.support.test:runner:1.0.1"
const val TEST_RULES = "com.android.support.test:rules:1.0.1"
+
+const val ESPRESSO_CONTRIB_TMP = "com.android.temp.support.test.espresso:espresso-contrib:3.0.1"
+const val ESPRESSO_CORE_TMP = "com.android.temp.support.test.espresso:espresso-core:3.0.1"
+const val TEST_RUNNER_TMP = "com.android.temp.support.test:runner:1.0.1"
+const val TEST_RULES_TMP = "com.android.temp.support.test:rules:1.0.1"
+
+
/**
* this Xerial version is newer than we want but we need it to fix
* https://github.com/xerial/sqlite-jdbc/issues/97
diff --git a/car/build.gradle b/car/build.gradle
index c96840b..23a6577 100644
--- a/car/build.gradle
+++ b/car/build.gradle
@@ -24,14 +24,14 @@
api project(':legacy-support-v4')
api project(':recyclerview')
- androidTestImplementation jetifier.process(TEST_RUNNER, libs.exclude_support)
- androidTestImplementation jetifier.process(ESPRESSO_CORE, libs.exclude_support)
- androidTestImplementation jetifier.process(ESPRESSO_CONTRIB, libs.exclude_support)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CONTRIB_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
testImplementation(JUNIT)
- testImplementation(TEST_RUNNER)
+ testImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
testImplementation(MOCKITO_CORE)
compileOnly fileTree(dir: 'car-stubs', include: ['android.car.jar'])
diff --git a/compat/build.gradle b/compat/build.gradle
index 3ad30d6..940819b 100644
--- a/compat/build.gradle
+++ b/compat/build.gradle
@@ -11,8 +11,8 @@
api(project(":collection"))
api(ARCH_LIFECYCLE_RUNTIME, libs.exclude_annotations_transitive)
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils'), {
diff --git a/content/build.gradle b/content/build.gradle
index efc8bd1..25b01e5f 100644
--- a/content/build.gradle
+++ b/content/build.gradle
@@ -27,8 +27,8 @@
api(project(":core"))
androidTestImplementation(JUNIT)
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
}
supportLibrary {
diff --git a/coordinatorlayout/build.gradle b/coordinatorlayout/build.gradle
index cc3802f..8e72580 100644
--- a/coordinatorlayout/build.gradle
+++ b/coordinatorlayout/build.gradle
@@ -11,9 +11,9 @@
api(project(":core"))
api(project(":customview"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
- androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_support)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CONTRIB_TMP, libs.exclude_for_espresso)
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils'), {
exclude group: 'androidx.coordinatorlayout', module: 'coordinatorlayout'
diff --git a/customview/build.gradle b/customview/build.gradle
index 23db514..37cfc2f 100644
--- a/customview/build.gradle
+++ b/customview/build.gradle
@@ -11,8 +11,8 @@
api(project(":core"))
androidTestImplementation(JUNIT)
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(TEST_RULES)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RULES_TMP, libs.exclude_for_espresso)
}
supportLibrary {
diff --git a/dynamic-animation/build.gradle b/dynamic-animation/build.gradle
index bbdc3bb..637abb4 100644
--- a/dynamic-animation/build.gradle
+++ b/dynamic-animation/build.gradle
@@ -11,8 +11,8 @@
api(project(":collection"))
api(project(":legacy-support-core-utils"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
diff --git a/emoji/core/build.gradle b/emoji/core/build.gradle
index bfb7a07..2f66813 100644
--- a/emoji/core/build.gradle
+++ b/emoji/core/build.gradle
@@ -24,8 +24,8 @@
api(project(":core"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils')
diff --git a/exifinterface/build.gradle b/exifinterface/build.gradle
index ffe28d3..c3e56ff 100644
--- a/exifinterface/build.gradle
+++ b/exifinterface/build.gradle
@@ -9,7 +9,7 @@
dependencies {
api(project(":annotation"))
- androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
}
supportLibrary {
diff --git a/fragment/build.gradle b/fragment/build.gradle
index 4302fff..5f8954f 100644
--- a/fragment/build.gradle
+++ b/fragment/build.gradle
@@ -14,8 +14,8 @@
api(project(":loader"))
api(ARCH_LIFECYCLE_VIEWMODEL, libs.exclude_annotations_transitive)
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils'), {
diff --git a/graphics/drawable/animated/build.gradle b/graphics/drawable/animated/build.gradle
index e0fa2a7..139dee2 100644
--- a/graphics/drawable/animated/build.gradle
+++ b/graphics/drawable/animated/build.gradle
@@ -10,8 +10,8 @@
api(project(":vectordrawable"))
api(project(":legacy-support-core-ui"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
}
android {
diff --git a/graphics/drawable/static/build.gradle b/graphics/drawable/static/build.gradle
index e38e82e..19a03665 100644
--- a/graphics/drawable/static/build.gradle
+++ b/graphics/drawable/static/build.gradle
@@ -10,7 +10,7 @@
api(project(":annotation"))
api(project(":core"))
- androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
}
android {
diff --git a/gridlayout/build.gradle b/gridlayout/build.gradle
index b562f21..fb4dd10 100644
--- a/gridlayout/build.gradle
+++ b/gridlayout/build.gradle
@@ -10,8 +10,8 @@
api(project(":core"))
api(project(":legacy-support-core-ui"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
}
supportLibrary {
diff --git a/heifwriter/build.gradle b/heifwriter/build.gradle
index a703110..63e55ca 100644
--- a/heifwriter/build.gradle
+++ b/heifwriter/build.gradle
@@ -15,7 +15,7 @@
dependencies {
api(project(":annotation"))
- androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
}
supportLibrary {
diff --git a/leanback/build.gradle b/leanback/build.gradle
index 007d089..fe04a8a 100644
--- a/leanback/build.gradle
+++ b/leanback/build.gradle
@@ -13,8 +13,8 @@
api(project(":fragment"))
api(project(":recyclerview"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
diff --git a/legacy/core-ui/build.gradle b/legacy/core-ui/build.gradle
index 61f6051..bc8e865 100644
--- a/legacy/core-ui/build.gradle
+++ b/legacy/core-ui/build.gradle
@@ -20,9 +20,9 @@
api(project(":asynclayoutinflater"))
api(project(":cursoradapter"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
- androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_support)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CONTRIB_TMP, libs.exclude_for_espresso)
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils'), {
exclude group: 'androidx.legacy', module: 'legacy-support-core-ui'
diff --git a/legacy/core-utils/build.gradle b/legacy/core-utils/build.gradle
index 8cb8efe..c90d349 100644
--- a/legacy/core-utils/build.gradle
+++ b/legacy/core-utils/build.gradle
@@ -14,8 +14,8 @@
api(project(":localbroadcastmanager"))
api(project(":print"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
diff --git a/lifecycle/extensions/build.gradle b/lifecycle/extensions/build.gradle
index 2875ab4..80b7fc8 100644
--- a/lifecycle/extensions/build.gradle
+++ b/lifecycle/extensions/build.gradle
@@ -55,4 +55,4 @@
inceptionYear = "2017"
description = "Android Lifecycle Extensions"
url = SupportLibraryExtension.ARCHITECTURE_URL
-}
\ No newline at end of file
+}
diff --git a/loader/build.gradle b/loader/build.gradle
index b441801..8c99ea5 100644
--- a/loader/build.gradle
+++ b/loader/build.gradle
@@ -12,8 +12,8 @@
api(ARCH_LIFECYCLE_LIVEDATA_CORE, libs.exclude_annotations_transitive)
api(ARCH_LIFECYCLE_VIEWMODEL, libs.exclude_annotations_transitive)
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
diff --git a/media/build.gradle b/media/build.gradle
index 87e1b23..eda587d 100644
--- a/media/build.gradle
+++ b/media/build.gradle
@@ -10,8 +10,8 @@
api(project(":annotation"))
api(project(":core"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils')
diff --git a/media/version-compat-tests/current/client/build.gradle b/media/version-compat-tests/current/client/build.gradle
index bdc129d..650cd6a 100644
--- a/media/version-compat-tests/current/client/build.gradle
+++ b/media/version-compat-tests/current/client/build.gradle
@@ -24,5 +24,5 @@
androidTestImplementation(project(":media"))
androidTestImplementation(project(":support-media-compat-test-lib"))
- androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
}
diff --git a/media/version-compat-tests/current/service/build.gradle b/media/version-compat-tests/current/service/build.gradle
index bdc129d..650cd6a 100644
--- a/media/version-compat-tests/current/service/build.gradle
+++ b/media/version-compat-tests/current/service/build.gradle
@@ -24,5 +24,5 @@
androidTestImplementation(project(":media"))
androidTestImplementation(project(":support-media-compat-test-lib"))
- androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
}
diff --git a/media/version-compat-tests/previous/client/build.gradle b/media/version-compat-tests/previous/client/build.gradle
index 4319f69..8b0866e 100644
--- a/media/version-compat-tests/previous/client/build.gradle
+++ b/media/version-compat-tests/previous/client/build.gradle
@@ -24,5 +24,5 @@
androidTestImplementation project(':support-media-compat-test-lib')
androidTestImplementation "com.android.support:support-media-compat:27.0.1"
- androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
}
diff --git a/media/version-compat-tests/previous/service/build.gradle b/media/version-compat-tests/previous/service/build.gradle
index 28c88c3..3e1d9b9 100644
--- a/media/version-compat-tests/previous/service/build.gradle
+++ b/media/version-compat-tests/previous/service/build.gradle
@@ -24,5 +24,5 @@
androidTestImplementation(project(":support-media-compat-test-lib"))
androidTestImplementation "com.android.support:support-media-compat:27.0.1"
- androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
}
diff --git a/mediarouter/build.gradle b/mediarouter/build.gradle
index c25a3e7..a2463a4 100644
--- a/mediarouter/build.gradle
+++ b/mediarouter/build.gradle
@@ -11,9 +11,9 @@
api(project(":appcompat"))
api(project(":palette"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
- androidTestImplementation(TEST_RULES)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RULES_TMP, libs.exclude_for_espresso)
}
android {
diff --git a/palette/build.gradle b/palette/build.gradle
index f92d672..b1ab9e7 100644
--- a/palette/build.gradle
+++ b/palette/build.gradle
@@ -10,7 +10,7 @@
api(project(":core"))
api(project(":legacy-support-core-utils"))
- androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
}
supportLibrary {
diff --git a/percent/build.gradle b/percent/build.gradle
index d195356..f80350e 100644
--- a/percent/build.gradle
+++ b/percent/build.gradle
@@ -9,8 +9,8 @@
dependencies {
api(project(":core"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
}
android {
diff --git a/preference/build.gradle b/preference/build.gradle
index 8a55ea0..b7c6872 100644
--- a/preference/build.gradle
+++ b/preference/build.gradle
@@ -29,8 +29,8 @@
api(project(":appcompat"))
api(project(":recyclerview"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
diff --git a/recyclerview-selection/build.gradle b/recyclerview-selection/build.gradle
index 5a314f6..e043acb5 100644
--- a/recyclerview-selection/build.gradle
+++ b/recyclerview-selection/build.gradle
@@ -27,8 +27,8 @@
api(project(":annotation"))
api(project(":core"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it's own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it's own MockMaker
androidTestImplementation(JUNIT)
diff --git a/slices/core/build.gradle b/slices/core/build.gradle
index c01d7c3..7be7400 100644
--- a/slices/core/build.gradle
+++ b/slices/core/build.gradle
@@ -27,7 +27,7 @@
implementation project(":annotation")
implementation project(":appcompat")
- androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy)
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
}
diff --git a/slices/view/build.gradle b/slices/view/build.gradle
index bc1f9f1..8653955 100644
--- a/slices/view/build.gradle
+++ b/slices/view/build.gradle
@@ -28,8 +28,8 @@
implementation(project(":recyclerview"))
api(ARCH_LIFECYCLE_LIVEDATA_CORE, libs.exclude_annotations_transitive)
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy)
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
}
diff --git a/swiperefreshlayout/build.gradle b/swiperefreshlayout/build.gradle
index 58586a4..ab713e3 100644
--- a/swiperefreshlayout/build.gradle
+++ b/swiperefreshlayout/build.gradle
@@ -12,10 +12,10 @@
api(project(":interpolator"))
androidTestImplementation(JUNIT)
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(TEST_RULES)
- androidTestImplementation(ESPRESSO_CORE)
- androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_support)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RULES_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CONTRIB_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils'), {
diff --git a/testutils/build.gradle b/testutils/build.gradle
index af0aa8b..e0c4139 100644
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@@ -24,8 +24,8 @@
api(project(":fragment"))
api(project(":appcompat"))
- implementation(TEST_RUNNER)
- implementation(ESPRESSO_CORE)
+ implementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ implementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
implementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
implementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
implementation(JUNIT)
diff --git a/textclassifier/build.gradle b/textclassifier/build.gradle
index f3d9a0f..fd654ee 100644
--- a/textclassifier/build.gradle
+++ b/textclassifier/build.gradle
@@ -12,8 +12,8 @@
api(project(":collection"))
api(project(":core"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
}
supportLibrary {
diff --git a/transition/build.gradle b/transition/build.gradle
index 9b67ad2..3e4e7d11 100644
--- a/transition/build.gradle
+++ b/transition/build.gradle
@@ -11,8 +11,8 @@
api(project(":core"))
compileOnly project(':fragment')
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(project(":legacy-support-v4"))
diff --git a/tv-provider/build.gradle b/tv-provider/build.gradle
index 955eacd..9fe5f93 100644
--- a/tv-provider/build.gradle
+++ b/tv-provider/build.gradle
@@ -10,8 +10,8 @@
api(project(":annotation"))
api(project(":core"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(TEST_RULES)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RULES_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE)
}
diff --git a/v7/appcompat/build.gradle b/v7/appcompat/build.gradle
index 37c9656..a2ca59a 100644
--- a/v7/appcompat/build.gradle
+++ b/v7/appcompat/build.gradle
@@ -17,8 +17,8 @@
api(project(":vectordrawable"))
api(project(":vectordrawable-animated"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils'), {
diff --git a/v7/recyclerview/build.gradle b/v7/recyclerview/build.gradle
index a0e9f99..3e93b4e 100644
--- a/v7/recyclerview/build.gradle
+++ b/v7/recyclerview/build.gradle
@@ -12,8 +12,8 @@
api(project(":core"))
api(project(":legacy-support-core-ui"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(JUNIT)
@@ -22,7 +22,7 @@
testImplementation(JUNIT)
testImplementation(MOCKITO_CORE)
- testImplementation(TEST_RUNNER)
+ testImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
}
android {
diff --git a/viewpager/build.gradle b/viewpager/build.gradle
index c30b168..02b45ba 100644
--- a/viewpager/build.gradle
+++ b/viewpager/build.gradle
@@ -11,8 +11,8 @@
api(project(":core"))
api(project(":customview"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
diff --git a/viewpager2/build.gradle b/viewpager2/build.gradle
index a484619..42ea0c2 100644
--- a/viewpager2/build.gradle
+++ b/viewpager2/build.gradle
@@ -26,8 +26,8 @@
api(project(":fragment"))
api(project(":recyclerview"))
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
}
android {
diff --git a/wear/build.gradle b/wear/build.gradle
index 67adc0d..c70ebef 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -13,8 +13,8 @@
api(project(":recyclerview"))
api(CONSTRAINT_LAYOUT, { transitive = true })
- androidTestImplementation(TEST_RUNNER)
- androidTestImplementation(ESPRESSO_CORE)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
diff --git a/webkit/build.gradle b/webkit/build.gradle
index 0c0e9d1..06f3801 100644
--- a/webkit/build.gradle
+++ b/webkit/build.gradle
@@ -26,7 +26,7 @@
api(project(":annotation"))
api(project(':core'))
- androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
}
ext {