Skip to content

Commit 2e097e4

Browse files
committed
Bump to protobuf v25.5, abseil-cpp 20240722.0
Requires building under Bazel 7.4.0 or setting the compiler flags for Bazel 6.5.0 (from the previous commit).
1 parent 03d4e20 commit 2e097e4

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

scala/private/macros/scala_repositories.bzl

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,21 +127,22 @@ def rules_scala_setup(scala_compiler_srcjar = None):
127127
],
128128
)
129129

130-
# Needed by protobuf-21.7 and Bazel 6.5.0, as later versions require C++14.
130+
# Protobuf versions after v22 and abseil-cpp versions after 20220623.1
131+
# require C++14.
131132
if not native.existing_rule("com_google_absl"):
132133
http_archive(
133134
name = "com_google_absl",
134-
sha256 = "91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8",
135-
strip_prefix = "abseil-cpp-20220623.1",
136-
url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz",
135+
sha256 = "f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3",
136+
strip_prefix = "abseil-cpp-20240722.0",
137+
url = "https://github.com/abseil/abseil-cpp/releases/download/20240722.0/abseil-cpp-20240722.0.tar.gz",
137138
)
138139

139140
if not native.existing_rule("com_google_protobuf"):
140141
http_archive(
141142
name = "com_google_protobuf",
142-
sha256 = "75be42bd736f4df6d702a0e4e4d30de9ee40eac024c4b845d17ae4cc831fe4ae",
143-
strip_prefix = "protobuf-21.7",
144-
url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.7.tar.gz",
143+
sha256 = "3cf7d5b17c4ff04fe9f038104e9d0cae6da09b8ce271c13e44f8ac69f51e4e0f",
144+
strip_prefix = "protobuf-25.5",
145+
url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v25.5.tar.gz",
145146
)
146147

147148
if not native.existing_rule("rules_cc"):

test/shell/test_cross_build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ function test_scalafmt() {
2020
run_formatting scalafmt library3 library3
2121
run_formatting scalafmt test2 test2
2222
run_formatting scalafmt test3 test3
23+
2324
}
2425

2526
$runner test_cross_build

test_cross_build/WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ http_archive(
3131

3232
http_archive(
3333
name = "com_google_protobuf",
34-
sha256 = "75be42bd736f4df6d702a0e4e4d30de9ee40eac024c4b845d17ae4cc831fe4ae",
35-
strip_prefix = "protobuf-21.7",
36-
url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.7.tar.gz",
34+
sha256 = "7c3ebd7aaedd86fa5dc479a0fda803f602caaf78d8aff7ce83b89e1b8ae7442a",
35+
strip_prefix = "protobuf-28.3",
36+
url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v28.3.tar.gz",
3737
)
3838

3939
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")

0 commit comments

Comments
 (0)