Skip to content

WIP: upgrade more dependency versions #2366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

WIP: upgrade more dependency versions #2366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
601aee8
Update rules_java to 8.6.3wq
brettchabot Mar 21, 2025
f95238d
Upgrade kotlin coroutines to 1.10.1
brettchabot Mar 21, 2025
f1e7149
Upgrade to protobuf 29.3
brettchabot Mar 21, 2025
c1b34d2
Update to rules_jvm_external 6.7
brettchabot Mar 21, 2025
55c797c
Update grpc to 1.71.0
brettchabot Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
# 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"
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"
KOTLINX_COROUTINES_VERSION = "1.10.1"
GRPC_VERSION = "1.71.0"

bazel_dep(name = "rules_java", version = "8.6.0")
bazel_dep(name = "rules_jvm_external", version = "6.6")
bazel_dep(name = "rules_java", version = "8.6.3")
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.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")

Expand Down Expand Up @@ -46,20 +43,14 @@ 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",
"com.google.dagger:dagger-producers:2.46",
"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",
Expand Down
2 changes: 1 addition & 1 deletion build_extensions/axt_deps_versions.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions espresso/device/java/androidx/test/espresso/device/controller/emulator/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
3 changes: 2 additions & 1 deletion opensource/emulator/proto/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Loading