Remove needless support annotation excludes.
am: 843419a5ab
Change-Id: Ibe7d1fbe500fc53a52d787b9ac655b6e9a313180
diff --git a/app-toolkit/core-testing/build.gradle b/app-toolkit/core-testing/build.gradle
index 3ee9584..dca8810 100644
--- a/app-toolkit/core-testing/build.gradle
+++ b/app-toolkit/core-testing/build.gradle
@@ -36,11 +36,10 @@
api(MOCKITO_CORE, libs.exclude_bytebuddy)
testImplementation(JUNIT)
- testImplementation libs.support.annotations
androidTestImplementation(JUNIT)
- androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
- androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(ESPRESSO_CORE)
}
supportLibrary {
diff --git a/lifecycle/extensions/build.gradle b/lifecycle/extensions/build.gradle
index b7166ea..38640b6 100644
--- a/lifecycle/extensions/build.gradle
+++ b/lifecycle/extensions/build.gradle
@@ -44,8 +44,8 @@
testImplementation(JUNIT)
testImplementation(MOCKITO_CORE)
- androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
- androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(ESPRESSO_CORE)
androidTestImplementation libs.support.app_compat, libs.support_exclude_config
}
diff --git a/lifecycle/integration-tests/testapp/build.gradle b/lifecycle/integration-tests/testapp/build.gradle
index c640eeb..19d556b 100644
--- a/lifecycle/integration-tests/testapp/build.gradle
+++ b/lifecycle/integration-tests/testapp/build.gradle
@@ -68,8 +68,8 @@
annotationProcessor(project(":lifecycle:compiler"))
androidTestAnnotationProcessor(project(":lifecycle:compiler"))
- androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
- androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(ESPRESSO_CORE)
testImplementation(JUNIT)
testImplementation(MOCKITO_CORE)
diff --git a/lifecycle/reactivestreams/build.gradle b/lifecycle/reactivestreams/build.gradle
index f562c38..511ad7a 100644
--- a/lifecycle/reactivestreams/build.gradle
+++ b/lifecycle/reactivestreams/build.gradle
@@ -39,7 +39,7 @@
testImplementation(JUNIT)
testImplementation(RX_JAVA)
- testImplementation(TEST_RUNNER, libs.exclude_annotations)
+ testImplementation(TEST_RUNNER)
androidTestImplementation libs.support.app_compat, libs.support_exclude_config
}
diff --git a/lifecycle/runtime/build.gradle b/lifecycle/runtime/build.gradle
index 96f9a6f..44e992b 100644
--- a/lifecycle/runtime/build.gradle
+++ b/lifecycle/runtime/build.gradle
@@ -27,7 +27,7 @@
testImplementation(MOCKITO_CORE)
androidTestImplementation(JUNIT)
- androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(TEST_RUNNER)
}
supportLibrary {
diff --git a/paging/runtime/build.gradle b/paging/runtime/build.gradle
index 6bda233..1a2bd2d 100644
--- a/paging/runtime/build.gradle
+++ b/paging/runtime/build.gradle
@@ -41,8 +41,8 @@
androidTestImplementation(JUNIT)
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(TEST_RUNNER, libs.exclude_annotations)
- androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(ESPRESSO_CORE)
androidTestImplementation(KOTLIN_STDLIB)
}
diff --git a/room/integration-tests/testapp/build.gradle b/room/integration-tests/testapp/build.gradle
index 6458e2a..d4d4893 100644
--- a/room/integration-tests/testapp/build.gradle
+++ b/room/integration-tests/testapp/build.gradle
@@ -84,8 +84,8 @@
androidTestImplementation(project(":room:rxjava2"))
androidTestImplementation(project(":arch:core-testing"))
androidTestImplementation(RX_JAVA)
- androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
- androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(ESPRESSO_CORE)
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/room/runtime/build.gradle b/room/runtime/build.gradle
index ecbd0b3..8a91ac7 100644
--- a/room/runtime/build.gradle
+++ b/room/runtime/build.gradle
@@ -46,11 +46,10 @@
testImplementation(project(":arch:core-testing"))
testImplementation(JUNIT)
testImplementation(MOCKITO_CORE)
- testImplementation libs.support.annotations
androidTestImplementation(JUNIT)
- androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
- androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(ESPRESSO_CORE)
}
// Used by testCompile in room-compiler