Remove unused androidx.test.annotation.

androidx.test.annotation library only contained a single internal class: ExperimentalTestApi which is now unused. Since this is now unused there is no need to reference or publish the androidx.test:annotation library. This change removes build references to androidx.test.annotation from within androidx.test and remove maven publishing build logic. A future change will remove the source entirely. PiperOrigin-RevId: 633624350
android · May 14, 2024 · d0379fc · d0379fc
1 parent b33f54c
commit d0379fc
Show file tree

Hide file tree

Showing 30 changed files with 16 additions and 55 deletions.
diff --git a/BUILD b/BUILD
@@ -15,7 +15,6 @@ maven_repository(
     name = "axt_m2repository",
     testonly = 1,
     srcs = [
-        "//annotation/java/androidx/test/annotation:annotation_maven_artifact",
         "//core/java/androidx/test/core:core_maven_artifact",
         "//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks_maven_artifact",
         "//espresso/contrib/java/androidx/test/espresso/contrib:espresso_contrib_maven_artifact",

diff --git a/annotation/java/androidx/test/annotation/BUILD b/annotation/java/androidx/test/annotation/BUILD
@@ -1,10 +1,6 @@
 # Description: Build rules for building androidx.test.annotation from source
 
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
-load("//build_extensions:api_checks.bzl", "api_checks")
-load("//build_extensions:dackka_test.bzl", "dackka_test")
-load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
-load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
 
 # all users should reference the equivalent targets in //annotation
 package(
@@ -26,30 +22,3 @@ android_library(
         "@maven//:androidx_annotation_annotation_experimental",
     ],
 )
-
-# Generate rules for the release artifacts.
-axt_android_aar(
-    name = "annotation_aar",
-    expected_class_prefixes = [
-        "androidx.test.annotation",
-    ],
-    included_dep = ":annotation",
-)
-
-maven_artifact(
-    name = "annotation_maven_artifact",
-    last_updated = "20210901000000",
-    target = ":annotation_aar",
-)
-
-dackka_test(
-    name = "annotation_doc",
-    runtime_dep = ":annotation",
-    src_jar = ":annotation_aar-src.jar",
-)
-
-api_checks(
-    name = "annotation_api",
-    runtime_dep = ":annotation",
-    src_jar = ":annotation_aar-src.jar",
-)
diff --git a/build_extensions/axt_released_versions.bzl b/build_extensions/axt_released_versions.bzl
@@ -8,6 +8,5 @@ CORE_VERSION = "1.6.0-alpha06"
 ESPRESSO_DEVICE_VERSION = "1.0.0-alpha09"
 ANDROIDX_JUNIT_VERSION = "1.2.0-alpha04"
 ANDROIDX_TRUTH_VERSION = "1.6.0-alpha04"
-ANNOTATION_VERSION = "1.1.0-alpha04"
 ORCHESTRATOR_VERSION = "1.5.0-alpha04"
 SERVICES_VERSION = "1.5.0-alpha04"
diff --git a/build_extensions/axt_versions.bzl b/build_extensions/axt_versions.bzl
@@ -12,7 +12,6 @@ CORE_VERSION = "1.6.0-alpha07"
 ESPRESSO_DEVICE_VERSION = "1.0.0-alpha10"
 ANDROIDX_JUNIT_VERSION = "1.2.0-alpha05"
 ANDROIDX_TRUTH_VERSION = "1.6.0-alpha05"
-ANNOTATION_VERSION = "1.1.0-alpha05"
 ORCHESTRATOR_VERSION = "1.5.0-alpha05"
 SERVICES_VERSION = "1.5.0-alpha05"
 

diff --git a/build_extensions/maven/maven_registry.bzl b/build_extensions/maven/maven_registry.bzl
@@ -4,7 +4,6 @@ load(
     "//build_extensions:axt_versions.bzl",
     "ANDROIDX_JUNIT_VERSION",
     "ANDROIDX_TRUTH_VERSION",
-    "ANNOTATION_VERSION",
     "CORE_VERSION",
     "ESPRESSO_DEVICE_VERSION",
     "ESPRESSO_VERSION",
@@ -20,7 +19,6 @@ load(
 # under a given directory. Or in other words, that code in this repo is organized according to which
 # maven artifact it belongs to.
 _TARGET_TO_MAVEN_ARTIFACT = {
-    "//annotation/java/": "androidx.test:annotation:%s" % ANNOTATION_VERSION,
     "//runner/android_junit_runner/java/": "androidx.test:runner:%s" % RUNNER_VERSION,
     "//runner/rules/java/": "androidx.test:rules:%s" % RULES_VERSION,
     "//runner/rules:rules": "androidx.test:rules:%s" % RULES_VERSION,

diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 **Bug Fixes**
 
+* Remove unused androidx.test.annotation dependency
+
 **New Features**
 
 **Breaking Changes**

diff --git a/core/java/androidx/test/core/BUILD b/core/java/androidx/test/core/BUILD
@@ -46,7 +46,6 @@ kt_android_library(
     visibility = ["//visibility:private"],
     deps = [
         ":manifest",
-        "//annotation",
         "//opensource/androidx:annotation",
         "//runner/monitor",
         "@maven//:androidx_concurrent_concurrent_futures_ktx",

diff --git a/espresso/CHANGELOG.md b/espresso/CHANGELOG.md
@@ -16,6 +16,8 @@ The following artifacts were released:
 
 **Bug Fixes**
 
+* Remove unused androidx.test.annotation dependency
+
 **New Features**
 
 **Breaking Changes**

diff --git a/espresso/core/java/androidx/test/espresso/BUILD b/espresso/core/java/androidx/test/espresso/BUILD
@@ -182,7 +182,6 @@ android_library(
     srcs = BASE_LAYER_INTERFACES,
     manifest = "AndroidManifest.xml",
     deps = [
-        "//annotation",
         "//espresso/core/java/androidx/test/espresso/util",
         "//opensource/androidx:annotation",
         "//runner/monitor",

diff --git a/espresso/core/java/androidx/test/espresso/action/BUILD b/espresso/core/java/androidx/test/espresso/action/BUILD
@@ -43,7 +43,6 @@ kt_android_library(
     javacopts = COMMON_JAVACOPTS,
     deps = [
         ":adapter_view_protocol",
-        "//annotation/java/androidx/test/annotation",
         "//core/java/androidx/test/core:core_not_test_only",
         "//espresso/core/java/androidx/test/espresso:framework",
         "//espresso/core/java/androidx/test/espresso:interface",

diff --git a/espresso/core/java/androidx/test/espresso/matcher/BUILD b/espresso/core/java/androidx/test/espresso/matcher/BUILD
@@ -20,7 +20,6 @@ android_library(
         "@maven//:org_hamcrest_hamcrest_library",
     ],
     deps = [
-        "//annotation",
         "//espresso/core/java/androidx/test/espresso:interface",
         "//espresso/core/java/androidx/test/espresso/remote:interface",
         "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",

diff --git a/espresso/device/CHANGELOG.md b/espresso/device/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 **Bug Fixes**
 
+* Remove unused androidx.test.annotation dependency
+
 **New Features**
 
 **Breaking Changes**

diff --git a/espresso/device/java/androidx/test/espresso/device/action/BUILD b/espresso/device/java/androidx/test/espresso/device/action/BUILD
@@ -17,7 +17,6 @@ kt_android_library(
     testonly = 1,
     srcs = glob(["*.kt"]),
     deps = [
-        "//annotation/java/androidx/test/annotation",
         "//espresso/device/java/androidx/test/espresso/device/common",
         "//espresso/device/java/androidx/test/espresso/device/controller",
         "//espresso/device/java/androidx/test/espresso/device/sizeclass",

diff --git a/espresso/device/java/androidx/test/espresso/device/controller/BUILD b/espresso/device/java/androidx/test/espresso/device/controller/BUILD
@@ -19,7 +19,6 @@ kt_android_library(
         "DeviceMode.kt",
     ],
     deps = [
-        "//annotation/java/androidx/test/annotation",
         "//espresso/core/java/androidx/test/espresso:interface",
         "//opensource/androidx:annotation",
     ],

diff --git a/espresso/device/java/androidx/test/espresso/device/filter/BUILD b/espresso/device/java/androidx/test/espresso/device/filter/BUILD
@@ -17,7 +17,6 @@ kt_android_library(
     testonly = 1,
     srcs = glob(["*.kt"]),
     deps = [
-        "//annotation/java/androidx/test/annotation",
         "//espresso/device/java/androidx/test/espresso/device/common",
         "//espresso/device/java/androidx/test/espresso/device/controller",
         "//espresso/device/java/androidx/test/espresso/device/sizeclass",
@@ -35,7 +34,6 @@ kt_android_library(
         "RequiresDisplayFilter.kt",
     ],
     deps = [
-        "//annotation/java/androidx/test/annotation",
         "//espresso/device/java/androidx/test/espresso/device/sizeclass",
         "//runner/android_junit_runner",
         "//runner/monitor",

diff --git a/espresso/device/java/androidx/test/espresso/device/rules/BUILD b/espresso/device/java/androidx/test/espresso/device/rules/BUILD
@@ -17,7 +17,6 @@ kt_android_library(
     testonly = 1,
     srcs = glob(["*.kt"]),
     deps = [
-        "//annotation/java/androidx/test/annotation",
         "//espresso/device/java/androidx/test/espresso/device",
         "//espresso/device/java/androidx/test/espresso/device/action",
         "//espresso/device/java/androidx/test/espresso/device/common",

diff --git a/espresso/device/java/androidx/test/espresso/device/sizeclass/BUILD b/espresso/device/java/androidx/test/espresso/device/sizeclass/BUILD
@@ -18,6 +18,5 @@ kt_android_library(
     testonly = 1,
     srcs = glob(["*.kt"]),
     deps = [
-        "//annotation",
     ],
 )
diff --git a/espresso/intents/java/androidx/test/espresso/intent/BUILD b/espresso/intents/java/androidx/test/espresso/intent/BUILD
@@ -28,7 +28,6 @@ android_library(
     deps = [
         ":precondition_checks",
         ":resolved_intent_interface",
-        "//annotation",
         "//espresso/core/java/androidx/test/espresso",
         "//espresso/core/java/androidx/test/espresso:framework",
         "//espresso/core/java/androidx/test/espresso:interface",

diff --git a/ext/truth/CHANGELOG.md b/ext/truth/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 **Bug Fixes**
 
+* Remove unused androidx.test.annotation dependency
+
 **New Features**
 
 **Breaking Changes**

diff --git a/ext/truth/java/androidx/test/ext/truth/BUILD b/ext/truth/java/androidx/test/ext/truth/BUILD
@@ -25,7 +25,6 @@ android_library(
     ),
     manifest = "AndroidManifest.xml",
     deps = [
-        "//annotation",
         "//core",
         "//opensource/androidx:annotation",
         "@maven//:com_google_guava_guava",

diff --git a/gradle-tests/BUILD.bazel b/gradle-tests/BUILD.bazel
@@ -4,7 +4,6 @@ load(
     "//build_extensions:axt_versions.bzl",
     "ANDROIDX_JUNIT_VERSION",
     "ANDROIDX_TRUTH_VERSION",
-    "ANNOTATION_VERSION",
     "CORE_VERSION",
     "ESPRESSO_VERSION",
     "MONITOR_VERSION",
@@ -26,7 +25,6 @@ expand_template(
     substitutions = {
         "{ANDROIDX_JUNIT_VERSION}": ANDROIDX_JUNIT_VERSION,
         "{ANDROIDX_TRUTH_VERSION}": ANDROIDX_TRUTH_VERSION,
-        "{ANNOTATION_VERSION}": ANNOTATION_VERSION,
         "{CORE_VERSION}": CORE_VERSION,
         "{ESPRESSO_VERSION}": ESPRESSO_VERSION,
         "{MONITOR_VERSION}": MONITOR_VERSION,

diff --git a/runner/android_junit_runner/CHANGELOG.md b/runner/android_junit_runner/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 **Bug Fixes**
 
+* Remove unused androidx.test.annotation dependency
+
 **New Features**
 
 **Breaking Changes**

diff --git a/runner/android_junit_runner/java/androidx/test/BUILD b/runner/android_junit_runner/java/androidx/test/BUILD
@@ -38,7 +38,6 @@ android_library(
         "//runner/monitor",
     ],
     deps = [
-        "//annotation",
         "//opensource/androidx:annotation",
         "//runner/monitor",
         "//services/events/java/androidx/test/services/events",

diff --git a/runner/monitor/CHANGELOG.md b/runner/monitor/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 **Bug Fixes**
 
+* Remove unused androidx.test.annotation dependency
+
 **New Features**
 
 **Breaking Changes**

diff --git a/runner/monitor/java/androidx/test/BUILD b/runner/monitor/java/androidx/test/BUILD
@@ -42,7 +42,6 @@ kt_android_library(
         ":compiletime_hidden_apis",
         ":errorprone_neverlink",
         ":runtime_hidden_apis",
-        "//annotation",
         "//opensource/androidx:annotation",
         "@maven//:androidx_tracing_tracing",
     ],

diff --git a/runner/monitor/java/androidx/test/annotation/Beta.java b/runner/monitor/java/androidx/test/annotation/Beta.java
@@ -28,7 +28,7 @@
  * annotation implies nothing about the quality or performance of the API in question, only the fact
  * that it is not "API-frozen."
  *
- * @deprecated Use {@link ExperimentalTestApi} instead.
+ * @deprecated unused.
  */
 @Retention(RetentionPolicy.CLASS)
 @Target({

diff --git a/runner/rules/CHANGELOG.md b/runner/rules/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 **Bug Fixes**
 
+* Remove unused androidx.test.annotation dependency
+
 **New Features**
 
 **Breaking Changes**

diff --git a/runner/rules/java/androidx/test/BUILD b/runner/rules/java/androidx/test/BUILD
@@ -25,7 +25,6 @@ android_library(
         "proguard.cfg",
     ],
     deps = [
-        "//annotation",
         "//opensource/androidx:annotation",
         "//runner/android_junit_runner",
         "@androidsdk//:legacy_test-34",

diff --git a/services/CHANGELOG.md b/services/CHANGELOG.md
@@ -7,6 +7,7 @@
 **Bug Fixes**
 
 * Reduce HostedFile log spam
+* Remove unused androidx.test.annotation dependency
 
 **New Features**
 

diff --git a/services/storage/java/androidx/test/services/storage/BUILD b/services/storage/java/androidx/test/services/storage/BUILD
@@ -30,7 +30,6 @@ android_library(
     ],
     deps = [
         ":test_storage_constants",
-        "//annotation",
         "//opensource/androidx:annotation",
         "//runner/monitor",
         "//services/storage/java/androidx/test/services/storage/file",