Remove R classes from espresso maven artifacts

PiperOrigin-RevId: 392449283
android · Aug 23, 2021 · 6150aca · 6150aca
1 parent 20d394a
commit 6150aca
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 28 deletions.
diff --git a/espresso/core/java/androidx/test/espresso/BUILD.bazel b/espresso/core/java/androidx/test/espresso/BUILD.bazel
@@ -229,6 +229,7 @@ axt_release_lib(
         "//:proguard_binary.cfg",
         "//espresso:proguard_binary.cfg",
     ],
+    remove_spec = "androidx/test/espresso/core/R[$$\\.]",
     deps = [
         ":espresso",
     ],

diff --git a/espresso/core/java/androidx/test/espresso/remote/BUILD.bazel b/espresso/core/java/androidx/test/espresso/remote/BUILD.bazel
@@ -1,5 +1,10 @@
 # Remote package for espresso.
 
+load("//build_extensions:maven_repo.bzl", "maven_artifact")
+load("//build_extensions:axt_versions.bzl", "RUNNER_VERSION", "ESPRESSO_VERSION", "ANDROIDX_VERSION")
+load("//build_extensions:combine_jars.bzl", "combine_jars")
+load("//build_extensions:release.bzl", "axt_release_lib")
+
 licenses(["notice"])  # Apache License 2.0
 
 package(
@@ -183,10 +188,6 @@ android_library(
     ],
 )
 
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "RUNNER_VERSION", "ESPRESSO_VERSION", "ANDROIDX_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-
 filegroup(
     name = "espresso_remote_src",
     srcs = [
@@ -207,7 +208,7 @@ combine_jars(
     ],
 )
 
-load("//build_extensions:release.bzl", "axt_release_lib")
+
 
 axt_release_lib(
     name = "espresso_remote_release",
@@ -223,6 +224,7 @@ axt_release_lib(
         "//:proguard_binary.cfg",
         "//espresso:proguard_binary.cfg",
     ],
+    remove_spec = "androidx/test/espresso/remote/R[$$\\.]",
     deps = [
         ":remote",
     ],

diff --git a/...esso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD.bazel b/...esso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD.bazel
@@ -1,6 +1,11 @@
 # Description:
 #   Light weight module that contains IdlinResources around concurrent Java APIs
 
+load("//build_extensions:release.bzl", "axt_release_lib")
+load("//build_extensions:maven_repo.bzl", "maven_artifact")
+load("//build_extensions:axt_versions.bzl", "ESPRESSO_VERSION")
+load("//build_extensions:combine_jars.bzl", "combine_jars")
+
 package(
     default_visibility = ["//:__subpackages__"],
 )
@@ -40,22 +45,17 @@ android_library(
     ],
 )
 
-load("//build_extensions:release.bzl", "axt_release_lib")
-
 # rule for outputting externally released binary. Produces
 # idling_concurrent_release_no_deps.jar and idling_concurrent_release.aar
 axt_release_lib(
     name = "idling_concurrent_release",
     keep_spec = "androidx/test/espresso/idling/concurrent",
+    remove_spec = "androidx/test/espresso/idling/concurrent/R[$$\\.]",
     deps = [
         ":idling_concurrent",
     ],
 )
 
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ESPRESSO_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-
 filegroup(
     name = "idling_concurrent_src",
     srcs = [

diff --git a/espresso/idling_resource/java/androidx/test/espresso/BUILD.bazel b/espresso/idling_resource/java/androidx/test/espresso/BUILD.bazel
@@ -2,6 +2,11 @@
 #   Light weight module represents a resources of an application under test which can cause
 #   asynchronous background work to happen during test execution.
 
+load("//build_extensions:release.bzl", "axt_release_lib")
+load("//build_extensions:maven_repo.bzl", "maven_artifact")
+load("//build_extensions:axt_versions.bzl", "ESPRESSO_VERSION")
+load("//build_extensions:combine_jars.bzl", "combine_jars")
+
 package(
     default_visibility = ["//visibility:public"],
 )
@@ -47,23 +52,18 @@ alias(
     actual = "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:thread_pool_idling_resource",
 )
 
-load("//build_extensions:release.bzl", "axt_release_lib")
-
 # rule for outputting externally released binary. Produces
 # espresso_idling_resource_release_no_deps.jar and espresso_idling_resource_release.aar
 axt_release_lib(
     name = "espresso_idling_resource_release",
     custom_package = "androidx.test.espresso.idling.resource",
     keep_spec = "androidx/test/espresso",
+    remove_spec = "androidx/test/espresso/idling/resource/R[$$\\.]",
     deps = [
         ":idling_resource",
     ],
 )
 
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ESPRESSO_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-
 filegroup(
     name = "idling_resource_src",
     srcs = [

diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD.bazel b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD.bazel
@@ -1,5 +1,10 @@
 # Description:
 # Network Idling Resources
+load("//build_extensions:release.bzl", "axt_release_lib")
+load("//build_extensions:maven_repo.bzl", "maven_artifact")
+load("//build_extensions:axt_versions.bzl", "ANDROIDX_VERSION", "ESPRESSO_VERSION")
+load("//build_extensions:combine_jars.bzl", "combine_jars")
+
 licenses(["notice"])  # Apache License 2.0
 
 package(
@@ -16,22 +21,17 @@ android_library(
     ],
 )
 
-load("//build_extensions:release.bzl", "axt_release_lib")
-
 # rule for outputting externally released binary. Produces
 # idling_net_release_no_deps.jar and idling_net_release.aar
 axt_release_lib(
     name = "idling_net_release",
     keep_spec = "androidx/test/espresso/idling/net",
+    remove_spec = "androidx/test/espresso/idling/net/R[$$\\.]",
     deps = [
         ":uri_idling_resource",
     ],
 )
 
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ANDROIDX_VERSION", "ESPRESSO_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-
 filegroup(
     name = "idling_net_src",
     srcs = [

diff --git a/espresso/web/java/androidx/test/espresso/web/BUILD.bazel b/espresso/web/java/androidx/test/espresso/web/BUILD.bazel
@@ -1,11 +1,15 @@
+load("//build_extensions:release.bzl", "axt_release_lib")
+load("//build_extensions:maven_repo.bzl", "maven_artifact")
+load("//build_extensions:axt_versions.bzl", "ANDROIDX_VERSION", "ESPRESSO_VERSION")
+load("//build_extensions:combine_jars.bzl", "combine_jars")
+
 licenses(["notice"])  # Apache License 2.0
 
 package(
     default_visibility = ["//visibility:public"],
 )
 
 # ** Generate the release artifacts **
-load("//build_extensions:release.bzl", "axt_release_lib")
 
 android_library(
     name = "espresso_web_release_lib",
@@ -28,15 +32,12 @@ axt_release_lib(
         "//espresso:proguard_binary.cfg",
         ":proguard_binary.cfg",
     ],
+    remove_spec = "androidx/test/espresso/web/R[$$\\.]",
     deps = [
         ":espresso_web_release_lib",
     ],
 )
 
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ESPRESSO_VERSION", "ANDROIDX_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-
 filegroup(
     name = "web_src",
     srcs = [