Skip to content

Commit

Permalink
Bump protobuf-java to 4.29.0
Browse files Browse the repository at this point in the history
Every Scala version now uses com.google.protobuf:protobuf-java:4.29.0.
Part of bazelbuild#1482 and bazelbuild#1652.

This is necessary, but not sufficient, to make `rules_scala` Bazel 8
compatible by enabling an update to `protobuf` v29.0. Building with
Bazel 6.5.0 and `protobuf` v21.7 continues to pass all tests after this
change.
  • Loading branch information
mbland committed Nov 29, 2024
1 parent d35448f commit 4a1feae
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion scripts/create_repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
SCALATEST_VERSION = "3.2.19"
SCALAFMT_VERSION = "3.8.3"
KIND_PROJECTOR_VERSION = "0.13.3"
PROTOBUF_JAVA_VERSION = "4.28.3"
PROTOBUF_JAVA_VERSION = "4.29.0"
JLINE_VERSION = '3.27.1'
SCALAPB_VERSION = '0.11.17'
PROTOC_BRIDGE_VERSION = '0.9.7'
Expand Down
4 changes: 2 additions & 2 deletions third_party/repositories/scala_2_11.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ artifacts = {
"sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
},
"com_google_protobuf_protobuf_java": {
"artifact": "com.google.protobuf:protobuf-java:4.28.3",
"sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e",
"artifact": "com.google.protobuf:protobuf-java:4.29.0",
"sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76",
},
"com_lihaoyi_fansi": {
"artifact": "com.lihaoyi:fansi_2.11:0.2.6",
Expand Down
4 changes: 2 additions & 2 deletions third_party/repositories/scala_2_12.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ artifacts = {
"sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
},
"com_google_protobuf_protobuf_java": {
"artifact": "com.google.protobuf:protobuf-java:4.28.3",
"sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e",
"artifact": "com.google.protobuf:protobuf-java:4.29.0",
"sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76",
},
"com_lihaoyi_fansi": {
"artifact": "com.lihaoyi:fansi_2.12:0.4.0",
Expand Down
4 changes: 2 additions & 2 deletions third_party/repositories/scala_2_13.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ artifacts = {
"sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
},
"com_google_protobuf_protobuf_java": {
"artifact": "com.google.protobuf:protobuf-java:4.28.3",
"sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e",
"artifact": "com.google.protobuf:protobuf-java:4.29.0",
"sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76",
},
"com_lihaoyi_fansi": {
"artifact": "com.lihaoyi:fansi_2.13:0.4.0",
Expand Down
4 changes: 2 additions & 2 deletions third_party/repositories/scala_3_1.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ artifacts = {
"sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
},
"com_google_protobuf_protobuf_java": {
"artifact": "com.google.protobuf:protobuf-java:4.28.3",
"sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e",
"artifact": "com.google.protobuf:protobuf-java:4.29.0",
"sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76",
},
"com_lihaoyi_fansi": {
"artifact": "com.lihaoyi:fansi_2.13:0.4.0",
Expand Down
4 changes: 2 additions & 2 deletions third_party/repositories/scala_3_2.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ artifacts = {
"sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
},
"com_google_protobuf_protobuf_java": {
"artifact": "com.google.protobuf:protobuf-java:4.28.3",
"sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e",
"artifact": "com.google.protobuf:protobuf-java:4.29.0",
"sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76",
},
"com_lihaoyi_fansi": {
"artifact": "com.lihaoyi:fansi_2.13:0.4.0",
Expand Down
4 changes: 2 additions & 2 deletions third_party/repositories/scala_3_3.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ artifacts = {
"sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
},
"com_google_protobuf_protobuf_java": {
"artifact": "com.google.protobuf:protobuf-java:4.28.3",
"sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e",
"artifact": "com.google.protobuf:protobuf-java:4.29.0",
"sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76",
},
"com_lihaoyi_fansi": {
"artifact": "com.lihaoyi:fansi_2.13:0.4.0",
Expand Down
4 changes: 2 additions & 2 deletions third_party/repositories/scala_3_4.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ artifacts = {
"sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
},
"com_google_protobuf_protobuf_java": {
"artifact": "com.google.protobuf:protobuf-java:4.28.3",
"sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e",
"artifact": "com.google.protobuf:protobuf-java:4.29.0",
"sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76",
},
"com_lihaoyi_fansi": {
"artifact": "com.lihaoyi:fansi_2.13:0.4.0",
Expand Down
4 changes: 2 additions & 2 deletions third_party/repositories/scala_3_5.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ artifacts = {
"sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
},
"com_google_protobuf_protobuf_java": {
"artifact": "com.google.protobuf:protobuf-java:4.28.3",
"sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e",
"artifact": "com.google.protobuf:protobuf-java:4.29.0",
"sha256": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76",
},
"com_lihaoyi_fansi": {
"artifact": "com.lihaoyi:fansi_2.13:0.4.0",
Expand Down

0 comments on commit 4a1feae

Please sign in to comment.