Skip to content

Commit 4eedd77

Browse files
brettchabotcopybara-androidxtest
authored andcommitted
Update more dependency versions
- Update rules_java to 8.6.3 - Update protobuf to 29.3 - Update kotlin coroutines to 1.10.1 - Update rules_jvm_external to 6.7 - Update gRPC to 1.71.0. And stop errorneously bringing in gRPC's maven dependencies. Instead, rely on the bazel targets at compile time consistently, and just use maven_registry to ensure the right maven deps appear in generated poms PiperOrigin-RevId: 739981968
1 parent 9802623 commit 4eedd77

File tree

13 files changed

+97
-27
lines changed

13 files changed

+97
-27
lines changed

MODULE.bazel

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
# These need needs to be consistent with their counterparts in build_extensions/axt_deps_versions.bzl.
22
KOTLIN_VERSION = "2.1.0"
3-
KOTLINX_COROUTINES_VERSION = "1.7.1"
4-
GRPC_VERSION = "1.68.1"
5-
# TODO(brettchabot): make this the same as GRPC_VERSION.
6-
# 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")`
7-
GRPC_MAVEN_VERSION = "1.54.1"
3+
KOTLINX_COROUTINES_VERSION = "1.10.1"
4+
GRPC_VERSION = "1.71.0"
85

9-
bazel_dep(name = "rules_java", version = "8.6.0")
10-
bazel_dep(name = "rules_jvm_external", version = "6.6")
6+
bazel_dep(name = "rules_java", version = "8.6.3")
7+
bazel_dep(name = "rules_jvm_external", version = "6.7")
118
bazel_dep(name = "rules_android", version = "0.6.3", repo_name = "build_bazel_rules_android")
129
bazel_dep(name = "rules_kotlin", version = "2.1.3", repo_name = "io_bazel_rules_kotlin")
13-
bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
10+
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf")
1411
bazel_dep(name = "grpc-java", version = GRPC_VERSION)
1512
bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric")
1613

@@ -46,20 +43,14 @@ maven.install(
4643
"androidx.core:core:1.6.0",
4744
"androidx.lifecycle:lifecycle-common:2.3.1",
4845
"androidx.multidex:multidex:2.0.0",
49-
"androidx.tracing:tracing:1.1.0",
46+
"androidx.tracing:tracing:1.1.0",
5047
"androidx.window:window-java:1.1.0",
5148
"androidx.window:window-core:1.1.0",
5249
"com.google.dagger:dagger-compiler:2.46",
5350
"com.google.dagger:dagger-producers:2.46",
5451
"com.google.dagger:dagger:2.46",
5552
"com.google.googlejavaformat:google-java-format:1.4",
5653
"com.squareup:javapoet:1.9.0",
57-
"io.grpc:grpc-okhttp:%s" % GRPC_MAVEN_VERSION,
58-
"io.grpc:grpc-api:%s" % GRPC_MAVEN_VERSION,
59-
"io.grpc:grpc-stub:%s" % GRPC_MAVEN_VERSION,
60-
"io.grpc:grpc-core:%s" % GRPC_MAVEN_VERSION,
61-
"io.grpc:grpc-context:%s" % GRPC_MAVEN_VERSION,
62-
"io.grpc:grpc-protobuf-lite:%s" % GRPC_MAVEN_VERSION,
6354
"junit:junit:4.13.2",
6455
"org.ccil.cowan.tagsoup:tagsoup:1.2.1",
6556
"org.hamcrest:hamcrest-library:1.3",

build_extensions/axt_deps_versions.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
# Maven dependency versions
88
ANDROIDX_ANNOTATION_VERSION = "1.7.0"
99
KOTLIN_VERSION = "2.1.0"
10-
GRPC_VERSION = "1.54.1" # needs to match WORKSPACE:GRPC_VERSION
10+
GRPC_VERSION = "1.71.0"

core/CHANGELOG.md

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

77
**Bug Fixes**
88

9-
* Update build toolchain to bazel 7.5 and kotlin 2.1.0
10-
* Update to androidx.concurrent 1.2.0
9+
* Update bazel toolchain:
10+
* bazel version 7.5.0
11+
* rules_jvm_external 6.7
12+
* rules_java 8.6.3
13+
* rules_kotlin 2.1.3
14+
* rules_android 0.6.3
15+
* Update dependencies to:
16+
* androidx.annotation 1.7.0
17+
* androidx.concurrent futures 1.2.0
18+
* kotlin 2.1.0
19+
* kotlin coroutines 1.10.1
1120

1221
**New Features**
1322

espresso/CHANGELOG.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,16 @@ The following artifacts were released:
1616

1717
**Bug Fixes**
1818

19-
* Update build toolchain to bazel 7.5 and kotlin 2.1.0
19+
* Update bazel toolchain:
20+
* bazel version 7.5.0
21+
* rules_jvm_external 6.7
22+
* rules_java 8.6.3
23+
* rules_kotlin 2.1.3
24+
* rules_android 0.6.3
25+
* Update dependencies to:
26+
* androidx.annotation 1.7.0
27+
* androidx.concurrent-futures 1.2.0
28+
* kotlin 2.1.0
2029

2130
**New Features**
2231

espresso/device/CHANGELOG.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,17 @@
99
* Fix DisplaySizeRule not consistently restoring to original emulator state for
1010
failing tests
1111
* Support using DisplaySizeRule without an activity in the resumed state
12-
* Update build toolchain to bazel 7.5 and kotlin 2.1.0
12+
* Update bazel toolchain:
13+
* bazel version 7.5.0
14+
* rules_jvm_external 6.7
15+
* rules_java 8.6.3
16+
* rules_kotlin 2.1.3
17+
* rules_android 0.6.3
18+
* Update dependencies to:
19+
* androidx.annotation 1.7.0
20+
* gRPC 1.71.0
21+
* kotlin 2.1.0
22+
* kotlin coroutines 1.10.1
1323

1424
**New Features**
1525

ext/junit/CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,15 @@ are released.
99

1010
* Fixed the link to the deprecated `androidx.test.rule.ActivityTestRule` in
1111
the class description.
12-
* Update build toolchain to bazel 7.5 and kotlin 2.1.0
12+
* Update bazel toolchain:
13+
* bazel version 7.5.0
14+
* rules_jvm_external 6.7
15+
* rules_java 8.6.3
16+
* rules_kotlin 2.1.3
17+
* rules_android 0.6.3
18+
* Update dependencies to:
19+
* androidx.annotation 1.7.0
20+
* kotlin 2.1.0
1321

1422
**New Features**
1523

ext/truth/CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@
66

77
**Bug Fixes**
88

9-
* Update build toolchain to bazel 7.5 and kotlin 2.1.0
9+
* Update bazel toolchain:
10+
* bazel version 7.5.0
11+
* rules_jvm_external 6.7
12+
* rules_java 8.6.3
13+
* rules_kotlin 2.1.3
14+
* rules_android 0.6.3
15+
* Update dependencies to:
16+
* androidx.annotation 1.7.0
1017

1118
**New Features**
1219

opensource/emulator/proto/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ java_grpc_library(
2929
deps = [
3030
":emulator_controller_java_proto_lite",
3131
# explicitly depend on grpc-protobuf-lite so protobuf classes can be shaded
32-
"@maven//:io_grpc_grpc_protobuf_lite",
32+
"@grpc-java//protobuf-lite:protobuf-lite",
3333
],
3434
)

runner/android_junit_runner/CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@
66

77
**Bug Fixes**
88

9-
* Update build toolchain to bazel 7.5 and kotlin 2.1.0
9+
* Update bazel toolchain:
10+
* bazel version 7.5.0
11+
* rules_jvm_external 6.7
12+
* rules_java 8.6.3
13+
* rules_kotlin 2.1.3
14+
* rules_android 0.6.3
15+
* Update dependencies to:
16+
* androidx.annotation 1.7.0
1017

1118
**New Features**
1219

runner/android_test_orchestrator/CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@
66

77
**Bug Fixes**
88

9-
* Update build toolchain to bazel 7.5 and kotlin 2.1.0
9+
* Update bazel toolchain:
10+
* bazel version 7.5.0
11+
* rules_jvm_external 6.7
12+
* rules_java 8.6.3
13+
* rules_kotlin 2.1.3
14+
* rules_android 0.6.3
1015

1116
**New Features**
1217

0 commit comments

Comments
 (0)