Skip to content

Commit d0379fc

Browse files
brettchabotcopybara-androidxtest
authored andcommitted
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
1 parent b33f54c commit d0379fc

File tree

30 files changed

+16
-55
lines changed

30 files changed

+16
-55
lines changed

BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ maven_repository(
1515
name = "axt_m2repository",
1616
testonly = 1,
1717
srcs = [
18-
"//annotation/java/androidx/test/annotation:annotation_maven_artifact",
1918
"//core/java/androidx/test/core:core_maven_artifact",
2019
"//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks_maven_artifact",
2120
"//espresso/contrib/java/androidx/test/espresso/contrib:espresso_contrib_maven_artifact",
Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# Description: Build rules for building androidx.test.annotation from source
22

33
load("@build_bazel_rules_android//android:rules.bzl", "android_library")
4-
load("//build_extensions:api_checks.bzl", "api_checks")
5-
load("//build_extensions:dackka_test.bzl", "dackka_test")
6-
load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
7-
load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
84

95
# all users should reference the equivalent targets in //annotation
106
package(
@@ -26,30 +22,3 @@ android_library(
2622
"@maven//:androidx_annotation_annotation_experimental",
2723
],
2824
)
29-
30-
# Generate rules for the release artifacts.
31-
axt_android_aar(
32-
name = "annotation_aar",
33-
expected_class_prefixes = [
34-
"androidx.test.annotation",
35-
],
36-
included_dep = ":annotation",
37-
)
38-
39-
maven_artifact(
40-
name = "annotation_maven_artifact",
41-
last_updated = "20210901000000",
42-
target = ":annotation_aar",
43-
)
44-
45-
dackka_test(
46-
name = "annotation_doc",
47-
runtime_dep = ":annotation",
48-
src_jar = ":annotation_aar-src.jar",
49-
)
50-
51-
api_checks(
52-
name = "annotation_api",
53-
runtime_dep = ":annotation",
54-
src_jar = ":annotation_aar-src.jar",
55-
)

build_extensions/axt_released_versions.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ CORE_VERSION = "1.6.0-alpha06"
88
ESPRESSO_DEVICE_VERSION = "1.0.0-alpha09"
99
ANDROIDX_JUNIT_VERSION = "1.2.0-alpha04"
1010
ANDROIDX_TRUTH_VERSION = "1.6.0-alpha04"
11-
ANNOTATION_VERSION = "1.1.0-alpha04"
1211
ORCHESTRATOR_VERSION = "1.5.0-alpha04"
1312
SERVICES_VERSION = "1.5.0-alpha04"

build_extensions/axt_versions.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ CORE_VERSION = "1.6.0-alpha07"
1212
ESPRESSO_DEVICE_VERSION = "1.0.0-alpha10"
1313
ANDROIDX_JUNIT_VERSION = "1.2.0-alpha05"
1414
ANDROIDX_TRUTH_VERSION = "1.6.0-alpha05"
15-
ANNOTATION_VERSION = "1.1.0-alpha05"
1615
ORCHESTRATOR_VERSION = "1.5.0-alpha05"
1716
SERVICES_VERSION = "1.5.0-alpha05"
1817

build_extensions/maven/maven_registry.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ load(
44
"//build_extensions:axt_versions.bzl",
55
"ANDROIDX_JUNIT_VERSION",
66
"ANDROIDX_TRUTH_VERSION",
7-
"ANNOTATION_VERSION",
87
"CORE_VERSION",
98
"ESPRESSO_DEVICE_VERSION",
109
"ESPRESSO_VERSION",
@@ -20,7 +19,6 @@ load(
2019
# under a given directory. Or in other words, that code in this repo is organized according to which
2120
# maven artifact it belongs to.
2221
_TARGET_TO_MAVEN_ARTIFACT = {
23-
"//annotation/java/": "androidx.test:annotation:%s" % ANNOTATION_VERSION,
2422
"//runner/android_junit_runner/java/": "androidx.test:runner:%s" % RUNNER_VERSION,
2523
"//runner/rules/java/": "androidx.test:rules:%s" % RULES_VERSION,
2624
"//runner/rules:rules": "androidx.test:rules:%s" % RULES_VERSION,

core/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
**Bug Fixes**
88

9+
* Remove unused androidx.test.annotation dependency
10+
911
**New Features**
1012

1113
**Breaking Changes**

core/java/androidx/test/core/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ kt_android_library(
4646
visibility = ["//visibility:private"],
4747
deps = [
4848
":manifest",
49-
"//annotation",
5049
"//opensource/androidx:annotation",
5150
"//runner/monitor",
5251
"@maven//:androidx_concurrent_concurrent_futures_ktx",

espresso/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ The following artifacts were released:
1616

1717
**Bug Fixes**
1818

19+
* Remove unused androidx.test.annotation dependency
20+
1921
**New Features**
2022

2123
**Breaking Changes**

espresso/core/java/androidx/test/espresso/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ android_library(
182182
srcs = BASE_LAYER_INTERFACES,
183183
manifest = "AndroidManifest.xml",
184184
deps = [
185-
"//annotation",
186185
"//espresso/core/java/androidx/test/espresso/util",
187186
"//opensource/androidx:annotation",
188187
"//runner/monitor",

espresso/core/java/androidx/test/espresso/action/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ kt_android_library(
4343
javacopts = COMMON_JAVACOPTS,
4444
deps = [
4545
":adapter_view_protocol",
46-
"//annotation/java/androidx/test/annotation",
4746
"//core/java/androidx/test/core:core_not_test_only",
4847
"//espresso/core/java/androidx/test/espresso:framework",
4948
"//espresso/core/java/androidx/test/espresso:interface",

0 commit comments

Comments
 (0)