Skip to content

Commit 09901ce

Browse files
authored
bump version of protoc version to 4.33.1 for backward compatibility with code generated with java protoc v3 (#1413)
1 parent 3b338d5 commit 09901ce

File tree

3 files changed

+22
-15
lines changed

3 files changed

+22
-15
lines changed

MODULE.bazel

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@ module(
55
repo_name = "rules_kotlin",
66
)
77

8-
bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
8+
proto_version = "4.33.1"
9+
10+
proto_version_parts = proto_version.split(".")
11+
12+
proto_module_version = ".".join(proto_version_parts[-2:]) # Last 2 parts
13+
14+
bazel_dep(name = "protobuf", version = proto_module_version, repo_name = "com_google_protobuf")
915
bazel_dep(name = "rules_proto", version = "6.0.2", repo_name = "rules_proto")
1016
bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "py_absl")
1117
bazel_dep(name = "rules_cc", version = "0.0.16")
@@ -59,8 +65,8 @@ maven.install(
5965
artifacts = [
6066
"com.google.code.findbugs:jsr305:3.0.2",
6167
"junit:junit:4.13-beta-3",
62-
"com.google.protobuf:protobuf-java:4.29.0",
63-
"com.google.protobuf:protobuf-java-util:4.29.0",
68+
"com.google.protobuf:protobuf-java:{}".format(proto_version),
69+
"com.google.protobuf:protobuf-java-util:{}".format(proto_version),
6470
"com.google.guava:guava:27.1-jre",
6571
"com.google.truth:truth:0.45",
6672
"com.google.auto.service:auto-service:1.1.1",

kotlin_rules_maven_install.json

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": -129239194,
4-
"__RESOLVED_ARTIFACTS_HASH": -667872389,
3+
"__INPUT_ARTIFACTS_HASH": 1557888678,
4+
"__RESOLVED_ARTIFACTS_HASH": -375681875,
55
"conflict_resolution": {
66
"com.google.guava:guava:27.1-jre": "com.google.guava:guava:33.2.1-jre"
77
},
@@ -141,17 +141,17 @@
141141
},
142142
"com.google.protobuf:protobuf-java": {
143143
"shasums": {
144-
"jar": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76",
145-
"sources": "6dc6e1117255285d82523d918a489887c3d2f6805e655d9c59f5176878ab3726"
144+
"jar": "fd5cf3d55bc2c3ddb2a8640c9d4c69daa9a5b326fb6e05bae0e56b3f4f85e0f7",
145+
"sources": "0674d40c616ee1059deba4740b6239db69beacb60a5e20720553c4e8a105f6d7"
146146
},
147-
"version": "4.29.0"
147+
"version": "4.33.1"
148148
},
149149
"com.google.protobuf:protobuf-java-util": {
150150
"shasums": {
151-
"jar": "1413fa2e13eecd323462884e13114ef655571c853cb4aac6a3e50a0d887c596e",
152-
"sources": "676fe2cb6e2b0cbdf36b29e10db924c3f252b36188fe46a6fe24883e257e7bc8"
151+
"jar": "f8788f87658d46f8ddb864455eaa046aa218e419c98c93326643ae465aa5c843",
152+
"sources": "e61782c58eec9059f8f386e9da7594e19b477c980111f4bcc78582ad340807ba"
153153
},
154-
"version": "4.29.0"
154+
"version": "4.33.1"
155155
},
156156
"com.google.truth:truth": {
157157
"shasums": {
@@ -540,8 +540,6 @@
540540
"com.google.code.findbugs:jsr305",
541541
"com.google.code.gson:gson",
542542
"com.google.errorprone:error_prone_annotations",
543-
"com.google.guava:guava",
544-
"com.google.j2objc:j2objc-annotations",
545543
"com.google.protobuf:protobuf-java"
546544
],
547545
"com.google.truth:truth": [

src/main/starlark/core/repositories/setup.bzl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,17 @@ def kt_configure():
2929

3030
bazel_skylib_workspace()
3131

32+
# keep in sync with MODULE.bazel and `proto_version` variable there.
33+
proto_version = "4.33.1"
34+
3235
maven_install(
3336
name = "kotlin_rules_maven",
3437
fetch_sources = True,
3538
artifacts = [
3639
"com.google.code.findbugs:jsr305:3.0.2",
3740
"junit:junit:4.13-beta-3",
38-
"com.google.protobuf:protobuf-java:4.29.0",
39-
"com.google.protobuf:protobuf-java-util:4.29.0",
41+
"com.google.protobuf:protobuf-java:{}".format(proto_version),
42+
"com.google.protobuf:protobuf-java-util:{}".format(proto_version),
4043
"com.google.guava:guava:27.1-jre",
4144
"com.google.truth:truth:0.45",
4245
"com.google.auto.service:auto-service:1.1.1",

0 commit comments

Comments
 (0)