From 601aee8a9ede8fcf540545989db4d312b8dc22e1 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Fri, 21 Mar 2025 21:05:46 +0000 Subject: [PATCH 1/5] Update rules_java to 8.6.3wq --- MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index 5cc9a5bfc..89d8166fd 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -6,7 +6,7 @@ GRPC_VERSION = "1.68.1" # Tryng to do so results in `external/grpc-java~/okhttp/src/main/java/io/grpc/okhttp/ExceptionHandlingFrameWriter.java:147: error: [strict] Using type okio.Buffer from an indirect dependency (TOOL_INFO: "@maven//:com_squareup_okio_okio_jvm")` GRPC_MAVEN_VERSION = "1.54.1" -bazel_dep(name = "rules_java", version = "8.6.0") +bazel_dep(name = "rules_java", version = "8.6.3") bazel_dep(name = "rules_jvm_external", version = "6.6") bazel_dep(name = "rules_android", version = "0.6.3", repo_name = "build_bazel_rules_android") bazel_dep(name = "rules_kotlin", version = "2.1.3", repo_name = "io_bazel_rules_kotlin") From f95238dc07e7d32c42707972a0d37fcf89714493 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Fri, 21 Mar 2025 21:15:12 +0000 Subject: [PATCH 2/5] Upgrade kotlin coroutines to 1.10.1 --- MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index 89d8166fd..8423102ff 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,6 +1,6 @@ # These need needs to be consistent with their counterparts in build_extensions/axt_deps_versions.bzl. KOTLIN_VERSION = "2.1.0" -KOTLINX_COROUTINES_VERSION = "1.7.1" +KOTLINX_COROUTINES_VERSION = "1.10.1" GRPC_VERSION = "1.68.1" # TODO(brettchabot): make this the same as GRPC_VERSION. # Tryng to do so results in `external/grpc-java~/okhttp/src/main/java/io/grpc/okhttp/ExceptionHandlingFrameWriter.java:147: error: [strict] Using type okio.Buffer from an indirect dependency (TOOL_INFO: "@maven//:com_squareup_okio_okio_jvm")` From f1e714970ae4ec898c142e9ffccc0bae1af3ab34 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Fri, 21 Mar 2025 21:24:45 +0000 Subject: [PATCH 3/5] Upgrade to protobuf 29.3 --- MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index 8423102ff..a75824d0b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -10,7 +10,7 @@ bazel_dep(name = "rules_java", version = "8.6.3") bazel_dep(name = "rules_jvm_external", version = "6.6") bazel_dep(name = "rules_android", version = "0.6.3", repo_name = "build_bazel_rules_android") bazel_dep(name = "rules_kotlin", version = "2.1.3", repo_name = "io_bazel_rules_kotlin") -bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf") +bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") bazel_dep(name = "grpc-java", version = GRPC_VERSION) bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric") From c1b34d2acb2dabce0fbce59068929ed74a681e89 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Fri, 21 Mar 2025 21:29:30 +0000 Subject: [PATCH 4/5] Update to rules_jvm_external 6.7 --- MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index a75824d0b..f3969c797 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -7,7 +7,7 @@ GRPC_VERSION = "1.68.1" GRPC_MAVEN_VERSION = "1.54.1" bazel_dep(name = "rules_java", version = "8.6.3") -bazel_dep(name = "rules_jvm_external", version = "6.6") +bazel_dep(name = "rules_jvm_external", version = "6.7") bazel_dep(name = "rules_android", version = "0.6.3", repo_name = "build_bazel_rules_android") bazel_dep(name = "rules_kotlin", version = "2.1.3", repo_name = "io_bazel_rules_kotlin") bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf") From 55c797c2d4ff271c5ccda8175be66b21f3235900 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Fri, 21 Mar 2025 22:28:54 +0000 Subject: [PATCH 5/5] Update grpc to 1.71.0 And remove conflicting maven definitions. Instead always use the compile targets from grpc-java bazel setup instead, and just map those targets to their maven dependencies when generating the pom. --- MODULE.bazel | 13 ++----------- build_extensions/axt_deps_versions.bzl | 2 +- .../test/espresso/device/controller/emulator/BUILD | 6 +++--- opensource/emulator/proto/BUILD | 3 ++- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index f3969c797..d677e0abb 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,10 +1,7 @@ # These need needs to be consistent with their counterparts in build_extensions/axt_deps_versions.bzl. KOTLIN_VERSION = "2.1.0" KOTLINX_COROUTINES_VERSION = "1.10.1" -GRPC_VERSION = "1.68.1" -# TODO(brettchabot): make this the same as GRPC_VERSION. -# Tryng to do so results in `external/grpc-java~/okhttp/src/main/java/io/grpc/okhttp/ExceptionHandlingFrameWriter.java:147: error: [strict] Using type okio.Buffer from an indirect dependency (TOOL_INFO: "@maven//:com_squareup_okio_okio_jvm")` -GRPC_MAVEN_VERSION = "1.54.1" +GRPC_VERSION = "1.71.0" bazel_dep(name = "rules_java", version = "8.6.3") bazel_dep(name = "rules_jvm_external", version = "6.7") @@ -46,7 +43,7 @@ maven.install( "androidx.core:core:1.6.0", "androidx.lifecycle:lifecycle-common:2.3.1", "androidx.multidex:multidex:2.0.0", - "androidx.tracing:tracing:1.1.0", + "androidx.tracing:tracing:1.1.0", "androidx.window:window-java:1.1.0", "androidx.window:window-core:1.1.0", "com.google.dagger:dagger-compiler:2.46", @@ -54,12 +51,6 @@ maven.install( "com.google.dagger:dagger:2.46", "com.google.googlejavaformat:google-java-format:1.4", "com.squareup:javapoet:1.9.0", - "io.grpc:grpc-okhttp:%s" % GRPC_MAVEN_VERSION, - "io.grpc:grpc-api:%s" % GRPC_MAVEN_VERSION, - "io.grpc:grpc-stub:%s" % GRPC_MAVEN_VERSION, - "io.grpc:grpc-core:%s" % GRPC_MAVEN_VERSION, - "io.grpc:grpc-context:%s" % GRPC_MAVEN_VERSION, - "io.grpc:grpc-protobuf-lite:%s" % GRPC_MAVEN_VERSION, "junit:junit:4.13.2", "org.ccil.cowan.tagsoup:tagsoup:1.2.1", "org.hamcrest:hamcrest-library:1.3", diff --git a/build_extensions/axt_deps_versions.bzl b/build_extensions/axt_deps_versions.bzl index b61d79a95..a0061dcf4 100644 --- a/build_extensions/axt_deps_versions.bzl +++ b/build_extensions/axt_deps_versions.bzl @@ -7,4 +7,4 @@ # Maven dependency versions ANDROIDX_ANNOTATION_VERSION = "1.7.0" KOTLIN_VERSION = "2.1.0" -GRPC_VERSION = "1.54.1" # needs to match WORKSPACE:GRPC_VERSION +GRPC_VERSION = "1.71.0" diff --git a/espresso/device/java/androidx/test/espresso/device/controller/emulator/BUILD b/espresso/device/java/androidx/test/espresso/device/controller/emulator/BUILD index fcc194ac3..439e23482 100644 --- a/espresso/device/java/androidx/test/espresso/device/controller/emulator/BUILD +++ b/espresso/device/java/androidx/test/espresso/device/controller/emulator/BUILD @@ -24,8 +24,8 @@ kt_android_library( "//opensource/emulator/proto:emulator_controller_java_grpc", "//opensource/emulator/proto:emulator_controller_java_proto_lite", "//runner/monitor", - "@maven//:io_grpc_grpc_core", - "@maven//:io_grpc_grpc_okhttp", - "@maven//:io_grpc_grpc_stub", + "@@grpc-java~//okhttp:okhttp", + "@@grpc-java~//core", + "@@grpc-java~//stub", ], ) diff --git a/opensource/emulator/proto/BUILD b/opensource/emulator/proto/BUILD index 67bc70b67..ca84de7de 100644 --- a/opensource/emulator/proto/BUILD +++ b/opensource/emulator/proto/BUILD @@ -29,6 +29,7 @@ java_grpc_library( deps = [ ":emulator_controller_java_proto_lite", # explicitly depend on grpc-protobuf-lite so protobuf classes can be shaded - "@maven//:io_grpc_grpc_protobuf_lite", + "@grpc-java//protobuf-lite:protobuf-lite", + #"@maven//:io_grpc_grpc_protobuf_lite", ], )