Successful maven repo build.

In progress: android_locql_test

Author: brettchabot

MODULE.bazel

@@ -10,7 +10,7 @@ bazel_dep(name = "rules_jvm_external", version = "6.6")
 bazel_dep(name = "rules_android", version = "0.6.0", repo_name = "build_bazel_rules_android")
 bazel_dep(name = "rules_kotlin", version = "1.9.6", repo_name = "io_bazel_rules_kotlin")
 bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
-#bazel_dep(name = "io_grpc_grpc_java", version = "1.54.1")
+bazel_dep(name = "grpc-java", version = "1.68.1")
 #needed?
 #bazel_dep(name = "rules_python", version = "0.37.1")
 bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric")
@@ -24,6 +24,20 @@ single_version_override(
 # maven dependencies
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 
+maven.artifact(
+    artifact = "accessibility-test-framework",
+    # exclude the org.checkerframework dependency since that require
+    # java8 compatibility. See b/176926990
+    # accessibility-test-framework depends on hamcrest 2.2 which causes 'Using type org.hamcrest.Matcher from an indirect dependency' compile errors
+    exclusions = [
+        "org.checkerframework:checker",
+        "org.hamcrest:hamcrest-core",
+        "org.hamcrest:hamcrest-library",
+    ],
+    group = "com.google.android.apps.common.testing.accessibility.framework",
+    version = "3.1.2",
+)
+
 maven.install(
     name = "maven",
     artifacts = [
@@ -46,47 +60,26 @@ maven.install(
 #        "androidx.test.uiautomator:uiautomator:2.2.0",
 #        "androidx.viewpager:viewpager:1.0.0",
 #        "androidx.window:window:1.1.0",
-#        "androidx.window:window-java:1.1.0",
-#        "androidx.window:window-core:1.1.0",
+        "androidx.window:window-java:1.1.0",
+        "androidx.window:window-core:1.1.0",
 #        "aopalliance:aopalliance:1.0",
 #        "com.android.tools.lint:lint-api:30.1.0",
 #        "com.android.tools.lint:lint-checks:30.1.0",
 #        "com.beust:jcommander:1.72",
-#        maven.artifact(
-#            artifact = "accessibility-test-framework",
-#            exclusions = [
-#                # exclude the org.checkerframework dependency since that require
-#                # java8 compatibility. See b/176926990
-#                maven.exclusion(
-#                    artifact = "checker",
-#                    group = "org.checkerframework",
-#                ),
-#                # accessibility-test-framework depends on hamcrest 2.2 which causes 'Using type org.hamcrest.Matcher from an indirect dependency' compile errors
-#                maven.exclusion(
-#                    artifact = "hamcrest-core",
-#                    group = "org.hamcrest",
-#                ),
-#                maven.exclusion(
-#                    artifact = "hamcrest-library",
-#                    group = "org.hamcrest",
-#                ),
-#            ],
-#            group = "com.google.android.apps.common.testing.accessibility.framework",
-#            version = "3.1.2",
-#        ),
+
 #        "com.google.android.material:material:1.4.0",
 #        "com.google.auto.value:auto-value:1.5.1",
 #        "com.google.code.findbugs:jsr305:3.0.2",
 #        "com.google.code.gson:gson:2.8.5",
-#        "com.google.dagger:dagger-compiler:2.46",
-#        "com.google.dagger:dagger-producers:2.46",
-#        "com.google.dagger:dagger:2.46",
+        "com.google.dagger:dagger-compiler:2.46",
+        "com.google.dagger:dagger-producers:2.46",
+        "com.google.dagger:dagger:2.46",
 #        "com.google.errorprone:error_prone_annotations:2.9.0",
 #        "com.google.errorprone:javac-shaded:9-dev-r4023-3",
 #        "com.google.flogger:flogger-system-backend:0.4",
 #        "com.google.flogger:flogger:0.4",
 #        "com.google.flogger:google-extensions:0.4",
-#        "com.google.googlejavaformat:google-java-format:1.4",
+        "com.google.googlejavaformat:google-java-format:1.4",
 #        "com.google.guava:guava:30.1.1-android",
 #        "com.google.guava:listenablefuture:1.0",
 #        "com.google.inject.extensions:guice-multibindings:4.1.0",
@@ -96,9 +89,9 @@ maven.install(
 #        "com.linkedin.dexmaker:dexmaker-mockito:jar:2.28.1",
 #        "com.linkedin.dexmaker:dexmaker:2.28.1",
 #        "org.mockito.kotlin:mockito-kotlin:4.1.0",
-#        "com.squareup:javapoet:1.9.0",
-#        "io.grpc:grpc-okhttp:1.54.1",
-#        "io.grpc:grpc-stub:1.54.1",
+        "com.squareup:javapoet:1.9.0",
+        "io.grpc:grpc-okhttp:1.54.1",
+        "io.grpc:grpc-stub:1.54.1",
 #        "org.apache.tomcat:annotations-api:6.0.53",
 #        "javax.annotation:javax.annotation-api:1.3.1",
 #        "javax.inject:javax.inject:1",
@@ -107,7 +100,7 @@ maven.install(
 #        "net.bytebuddy:byte-buddy-agent:1.9.10",
 #        "net.bytebuddy:byte-buddy:1.9.10",
 #        "net.sf.kxml:kxml2:jar:2.3.0",
-#        "org.ccil.cowan.tagsoup:tagsoup:1.2.1",
+        "org.ccil.cowan.tagsoup:tagsoup:1.2.1",
 #        "org.checkerframework:checker-compat-qual:2.5.5",
 #        "org.hamcrest:hamcrest-core:1.3",
         "org.hamcrest:hamcrest-library:1.3",
@@ -142,6 +135,8 @@ maven.install(
     ],
 )
 
+
+
 use_repo(maven, "maven")
 
 

build_extensions/axt_android_local_test.bzl

@@ -2,6 +2,7 @@
 
 load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library")
 load("//build_extensions:create_jar.bzl", "create_jar")
+load("@build_bazel_rules_android//android:rules.bzl", "android_local_test")
 
 def axt_android_local_test(name, srcs = [], deps = [], manifest = "//build_extensions:AndroidManifest_robolectric.xml", tags = ["robolectric"], **kwargs):
     """A wrapper around android_local_test that provides sensible defaults for androidx.test.
@@ -41,12 +42,12 @@ def axt_android_local_test(name, srcs = [], deps = [], manifest = "//build_exten
             exports_manifest = True,
             manifest = manifest,
             deps = deps,
-            testonly = 1,
+            testonly = True,
         )
         deps = [":%s_kt_lib" % name]
         srcs = []
 
-    native.android_local_test(
+    android_local_test(
         name = name,
         srcs = srcs,
         tags = tags,

build_extensions/maven/axt_maven_apk.bzl

@@ -3,6 +3,7 @@
 load("@rules_java//java:defs.bzl", "JavaInfo")
 load("//build_extensions/maven:combine_jars.bzl", "combine_jars")
 load("//build_extensions/maven:maven_info.bzl", "MavenFilesInfo", "MavenInfo", "collect_maven_apk_info")
+load("@build_bazel_rules_android//providers:providers.bzl", "ApkInfo")
 
 def _axt_maven_apk_impl(ctx):
     # produce src jar

build_extensions/maven/maven_info.bzl

@@ -150,7 +150,7 @@ def _isJavaProtoTarget(all_deps):
 
 def _findGrpcJavaProtoJar(target):
     for jar in target[JavaInfo].transitive_runtime_jars.to_list():
-        if "io_grpc_grpc_java/protobuf-lite" in jar.path:
+        if "grpc-java/protobuf-lite" in jar.path:
             return jar
     return None
 

build_extensions/maven/maven_registry.bzl

@@ -45,11 +45,18 @@ _TARGET_TO_MAVEN_ARTIFACT = {
     "//services/events/java/": "androidx.test:runner:%s" % RUNNER_VERSION,
     "//services:test_services": "androidx.test.services:test-services:%s" % SERVICES_VERSION,
     "//runner/android_test_orchestrator/stubapp:stubapp": "androidx.test:orchestrator:%s" % ORCHESTRATOR_VERSION,
+
+    "@@grpc-java~//okhttp:okhttp": "io.grpc:grpc-okhttp:1.54.1",
+    "@@grpc-java~//api": "io.grpc:grpc-stub:1.54.1",
+    "@@grpc-java~//core": "io.grpc:grpc-stub:1.54.1",
+    "@@grpc-java~//context": "io.grpc:grpc-stub:1.54.1",
+    "@@grpc-java~//util": "io.grpc:grpc-stub:1.54.1",
+    "@@grpc-java~//stub": "io.grpc:grpc-stub:1.54.1",
 }
 
 _SHADED_TARGETS = [
     "@com_google_protobuf//:protobuf_javalite",
-    "@com_google_protobuf//java/core:lite",
+    "@@protobuf~//java/core:lite",
     "//opensource/proto:any_java_proto_lite",
     "@com_google_protobuf//:any_proto",
     "//opensource/dagger:dagger",
@@ -110,6 +117,6 @@ def is_shaded_from_label(label):
     renamed via jarjar.
     """
 
-    # bazel 6.0.0 mysteriously prefixes a '@' onto //opensource/dagger, so just remove it
-    string_label = str(label).replace("@//", "//")
+    # bazel mysteriously prefixes a '@' onto //opensource/dagger, sometimes two, so just remove it
+    string_label = str(label).replace("@//", "//").replace("@//", "//")
     return string_label in _SHADED_TARGETS

opensource/emulator/proto/BUILD

@@ -1,6 +1,6 @@
 # Protos for interacting with emulator
 
-load("@io_grpc_grpc_java//:java_grpc_library.bzl", "java_grpc_library")
+load("@grpc-java//:java_grpc_library.bzl", "java_grpc_library")
 
 package(
     default_applicable_licenses = ["//espresso:license"],

runner/android_junit_runner/javatests/androidx/test/internal/events/client/BUILD

@@ -27,9 +27,7 @@ axt_android_local_test(
 
 android_library(
     name = "sampletest",
-    testonly = 1,
     srcs = ["SampleJUnitTest.java"],
-    testonly = 1,
     deps = ["@maven//:junit_junit"],
 )
 

services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD

@@ -2,6 +2,7 @@ load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto
 load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_library")
 load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 
 # A shell command execution server to allow shell commands to be run at elevated permissions
 
@@ -38,6 +39,12 @@ kt_android_library(
     ],
 )
 
+android_library(
+    name = "exec_idl",
+    idl_srcs = ["Command.aidl"],
+    visibility = ["//visibility:private"],
+)
+
 kt_android_library(
     name = "exec_server",
     srcs = [
@@ -50,9 +57,9 @@ kt_android_library(
         "ShellExecSharedConstants.java",
         "ShellMain.java",
     ],
-    idl_srcs = ["Command.aidl"],
     visibility = [":export"],
     deps = [
+        ":exec_idl",
         ":local_socket_protocol",
         ":local_socket_protocol_pb_java_proto_lite",
         "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
@@ -77,9 +84,9 @@ kt_android_library(
         "ShellExecutorImpl.java",
         "ShellExecutorLocalSocketImpl.kt",
     ],
-    idl_srcs = ["Command.aidl"],
     visibility = [":export"],
     deps = [
+        ":exec_idl",
         ":local_socket_protocol",
         ":local_socket_protocol_pb_java_proto_lite",
         "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",