Skip to content

Commit 86378b7

Browse files
committed
chore: update protobuf dependencies
1 parent 6440ed6 commit 86378b7

File tree

3 files changed

+9
-75
lines changed

3 files changed

+9
-75
lines changed

MODULE.bazel

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ bazel_dep(name = "buildifier_prebuilt", version = "6.4.0")
1414
bazel_dep(name = "contrib_rules_jvm", version = "0.24.0")
1515
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
1616
bazel_dep(name = "platforms", version = "0.0.10")
17-
bazel_dep(name = "protobuf")
17+
bazel_dep(name = "protobuf", version = "32.1")
1818
bazel_dep(name = "rules_android", version = "0.1.1")
1919
bazel_dep(name = "rules_android_ndk", version = "0.1.2")
2020
bazel_dep(name = "rules_foreign_cc", version = "0.11.1")
@@ -35,17 +35,6 @@ bazel_dep(name = "rules_license", version = "1.0.0")
3535
bazel_dep(name = "rules_pkg", version = "0.9.1")
3636
bazel_dep(name = "toolchains_llvm", version = "0.10.3")
3737

38-
# TODO: Remove after a release that includes https://github.com/protocolbuffers/protobuf/commit/a7b0421c78412baa48704d727601a17ac0f451d1.
39-
single_version_override(
40-
module_name = "protobuf",
41-
patch_strip = 1,
42-
patches = [
43-
# https://github.com/protocolbuffers/protobuf/pull/15332
44-
"//third_party:protobuf-disable-layering_check.patch",
45-
],
46-
version = "23.1",
47-
)
48-
4938
################################################################################
5039
# Maven dependencies
5140
################################################################################
@@ -390,9 +379,9 @@ cc_library(
390379
visibility = ["//visibility:public"],
391380
)
392381
""",
393-
sha256 = "21bfdfef25554fa2e30aec2a9f9b58f4a17c1d8c8593763fa94a6dd74b226594",
394-
strip_prefix = "libprotobuf-mutator-3b28530531b154a748fe9884bc9219b4966f0754",
395-
urls = ["https://github.com/google/libprotobuf-mutator/archive/3b28530531b154a748fe9884bc9219b4966f0754.tar.gz"],
382+
integrity = "sha256-iVlYiBtJk99wtPZSwtgsW9l9IvgByk9DDWVGgJ3yk9U=",
383+
strip_prefix = "libprotobuf-mutator-1.5",
384+
urls = ["https://github.com/google/libprotobuf-mutator/archive/refs/tags/v1.5.tar.gz"],
396385
)
397386

398387
################################################################################

maven_install.json

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": -1001008825,
4-
"__RESOLVED_ARTIFACTS_HASH": 1591993774,
3+
"__INPUT_ARTIFACTS_HASH": -2001871108,
4+
"__RESOLVED_ARTIFACTS_HASH": -1278053547,
55
"conflict_resolution": {
66
"com.google.code.gson:gson:2.8.6": "com.google.code.gson:gson:2.8.9",
77
"com.google.errorprone:error_prone_annotations:2.26.1": "com.google.errorprone:error_prone_annotations:2.41.0",
8-
"com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.41.0",
9-
"com.google.guava:guava:31.1-jre": "com.google.guava:guava:33.4.3-android",
10-
"com.google.j2objc:j2objc-annotations:1.3": "com.google.j2objc:j2objc-annotations:3.0.0",
11-
"com.google.truth:truth:1.1.2": "com.google.truth:truth:1.4.5",
8+
"com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.41.0",
9+
"com.google.guava:guava:32.0.1-jre": "com.google.guava:guava:33.4.3-android",
10+
"com.google.j2objc:j2objc-annotations:2.8": "com.google.j2objc:j2objc-annotations:3.0.0",
1211
"net.bytebuddy:byte-buddy-agent:1.14.13": "net.bytebuddy:byte-buddy-agent:1.17.7",
13-
"org.mockito:mockito-core:4.3.1": "org.mockito:mockito-core:5.20.0",
1412
"org.ow2.asm:asm-commons:9.8": "org.ow2.asm:asm-commons:9.9",
1513
"org.ow2.asm:asm-tree:9.8": "org.ow2.asm:asm-tree:9.9",
1614
"org.ow2.asm:asm:9.8": "org.ow2.asm:asm:9.9"
@@ -106,12 +104,6 @@
106104
},
107105
"version": "33.4.3-android"
108106
},
109-
"com.google.guava:guava-testlib": {
110-
"shasums": {
111-
"jar": "aadc71b10d5c3ac474dd16be84cfb18d257e584d1e0a59f8cab64ef4376226ce"
112-
},
113-
"version": "31.1-jre"
114-
},
115107
"com.google.guava:listenablefuture": {
116108
"shasums": {
117109
"jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99"
@@ -692,14 +684,6 @@
692684
"org.checkerframework:checker-qual",
693685
"org.jspecify:jspecify"
694686
],
695-
"com.google.guava:guava-testlib": [
696-
"com.google.code.findbugs:jsr305",
697-
"com.google.errorprone:error_prone_annotations",
698-
"com.google.guava:guava",
699-
"com.google.j2objc:j2objc-annotations",
700-
"junit:junit",
701-
"org.checkerframework:checker-qual"
702-
],
703687
"com.google.truth.extensions:truth-java8-extension": [
704688
"com.google.truth:truth"
705689
],
@@ -1145,15 +1129,6 @@
11451129
"com.google.common.xml",
11461130
"com.google.thirdparty.publicsuffix"
11471131
],
1148-
"com.google.guava:guava-testlib": [
1149-
"com.google.common.collect.testing",
1150-
"com.google.common.collect.testing.features",
1151-
"com.google.common.collect.testing.google",
1152-
"com.google.common.collect.testing.testers",
1153-
"com.google.common.escape.testing",
1154-
"com.google.common.testing",
1155-
"com.google.common.util.concurrent.testing"
1156-
],
11571132
"com.google.j2objc:j2objc-annotations": [
11581133
"com.google.j2objc.annotations"
11591134
],
@@ -2633,7 +2608,6 @@
26332608
"com.google.errorprone:error_prone_type_annotations",
26342609
"com.google.guava:failureaccess",
26352610
"com.google.guava:guava",
2636-
"com.google.guava:guava-testlib",
26372611
"com.google.guava:listenablefuture",
26382612
"com.google.j2objc:j2objc-annotations",
26392613
"com.google.protobuf:protobuf-java",

third_party/protobuf-disable-layering_check.patch

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)