Skip to content

Commit ce706af

Browse files
mblandmbland
committed
Move rules_scala_dependencies to scala/deps.bzl
Ensures we get all the versions of dependencies we want in `WORKSPACE`, while providing a new API to consumers. Part of bazel-contrib#1652. Bumps several packages as high as they can go and still be compatible with Bazel 6 and 7: - `bazel_skylib`: 1.4.1 => 1.7.1 - `rules_cc`: 0.0.6 => 0.0.9 - `rules_python`: 0.36.0 => 0.38.0 - `rules_go`: 0.50.1 The following packages are at the maximum version to prevent breakages under Bazel 6.5.0. --- `abseil-cpp` and `protobuf` have to stay at 20220623.1 and v27.1, respectively, for Bazel 6 compatibility per bazel-contrib#1647. `protobuf` up to v25.5 is compatible with Bazel 6 provided users set the compiler flags mentioned in that issue. --- `rules_python` 0.38.0 => 0.39.0 requires at least `rules_cc` 0.0.10, which introduced `cc/common/cc_info.bzl`: ```txt $ bazel build //{src,test,third_party,scala_proto}/... [ ...snip... ] ERROR: error loading package under directory 'test': error loading package 'test': at .../external/rules_python/python/defs.bzl:17:6: at .../external/rules_python/python/py_binary.bzl:18:6: at .../external/rules_python/python/private/py_binary_macro.bzl:16:6: at .../external/rules_python/python/private/common_bazel.bzl:19:6: Label '@rules_cc//cc/common:cc_info.bzl' is invalid because 'cc/common' is not a package; perhaps you meant to put the colon here: '@rules_cc//cc:common/cc_info.bzl'? ``` --- `rules_cc` 0.0.9 => 0.0.10 requires Bazel 7, which defines `CcSharedLibraryHintInfo`: ```txt $ bazel build //{src,test,third_party,scala_proto}/... ERROR: .../external/rules_cc/cc/private/rules_impl/native.bzl:40:33: name 'CcSharedLibraryHintInfo' is not defined (did you mean 'CcSharedLibraryInfo'?) [ ...snip... ] ERROR: error loading package under directory 'test': error loading package 'test': at .../external/rules_python/python/defs.bzl:17:6: at .../external/rules_python/python/py_binary.bzl:18:6: at .../external/rules_python/python/private/py_binary_macro.bzl:16:6: at .../external/rules_python/python/private/common_bazel.bzl:18:6: at .../external/rules_cc/cc/common/cc_common.bzl:17:6: compilation of module 'cc/private/rules_impl/native.bzl' failed ```
1 parent 9c2cb85 commit ce706af

File tree

3 files changed

+86
-86
lines changed

3 files changed

+86
-86
lines changed

‎WORKSPACE

+25-31
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,41 @@
11
workspace(name = "io_bazel_rules_scala")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4+
load("//scala:deps.bzl", "rules_scala_dependencies")
45

5-
http_archive(
6-
name = "bazel_skylib",
7-
sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
8-
urls = [
9-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
10-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
11-
],
12-
)
6+
rules_scala_dependencies()
137

148
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
159

1610
bazel_skylib_workspace()
1711

1812
http_archive(
1913
name = "rules_python",
20-
sha256 = "ca77768989a7f311186a29747e3e95c936a41dffac779aff6b443db22290d913",
21-
strip_prefix = "rules_python-0.36.0",
22-
url = "https://github.com/bazelbuild/rules_python/releases/download/0.36.0/rules_python-0.36.0.tar.gz",
14+
sha256 = "ca2671529884e3ecb5b79d6a5608c7373a82078c3553b1fa53206e6b9dddab34",
15+
strip_prefix = "rules_python-0.38.0",
16+
url = "https://github.com/bazelbuild/rules_python/releases/download/0.38.0/rules_python-0.38.0.tar.gz",
2317
)
2418

2519
load("@rules_python//python:repositories.bzl", "py_repositories")
2620

2721
py_repositories()
2822

23+
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
24+
25+
protobuf_deps()
26+
27+
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
28+
29+
rules_proto_dependencies()
30+
31+
load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
32+
33+
rules_proto_setup()
34+
35+
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
36+
37+
rules_proto_toolchains()
38+
2939
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3040

3141
scala_config(enable_compiler_dependency_tracking = True)
@@ -49,22 +59,6 @@ register_toolchains(
4959
"@io_bazel_rules_scala_toolchains//...:all",
5060
)
5161

52-
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
53-
54-
rules_proto_dependencies()
55-
56-
load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
57-
58-
rules_proto_setup()
59-
60-
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
61-
62-
rules_proto_toolchains()
63-
64-
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
65-
66-
protobuf_deps()
67-
6862
load("//twitter_scrooge:twitter_scrooge.bzl", "twitter_scrooge")
6963

7064
twitter_scrooge()
@@ -109,10 +103,10 @@ local_repository(
109103

110104
http_archive(
111105
name = "io_bazel_rules_go",
112-
sha256 = "6dc2da7ab4cf5d7bfc7c949776b1b7c733f05e56edc4bcd9022bb249d2e2a996",
106+
sha256 = "f4a9314518ca6acfa16cc4ab43b0b8ce1e4ea64b81c38d8a3772883f153346b8",
113107
urls = [
114-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip",
115-
"https://github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip",
108+
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.50.1/rules_go-v0.50.1.zip",
109+
"https://github.com/bazelbuild/rules_go/releases/download/v0.50.1/rules_go-v0.50.1.zip",
116110
],
117111
)
118112

@@ -124,7 +118,7 @@ load(
124118

125119
go_rules_dependencies()
126120

127-
go_register_toolchains(version = "1.19.5")
121+
go_register_toolchains(version = "1.23.0")
128122

129123
http_archive(
130124
name = "bazelci_rules",

‎scala/deps.bzl

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
"""Macro for instantiating repos required for core functionality."""
2+
3+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4+
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
5+
6+
def rules_scala_dependencies():
7+
"""Instantiates repos needed by rules provided by `rules_scala`."""
8+
maybe(
9+
http_archive,
10+
name = "bazel_skylib",
11+
sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
12+
urls = [
13+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
14+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
15+
],
16+
)
17+
18+
maybe(
19+
http_archive,
20+
name = "rules_cc",
21+
urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz"],
22+
sha256 = "2037875b9a4456dce4a79d112a8ae885bbc4aad968e6587dca6e64f3a0900cdf",
23+
strip_prefix = "rules_cc-0.0.9",
24+
)
25+
26+
# Needed by protobuf-21.7 and Bazel 6.5.0, as later versions require C++14.
27+
maybe(
28+
http_archive,
29+
name = "com_google_absl",
30+
sha256 = "91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8",
31+
strip_prefix = "abseil-cpp-20220623.1",
32+
url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz",
33+
)
34+
35+
maybe(
36+
http_archive,
37+
name = "rules_java",
38+
urls = [
39+
"https://github.com/bazelbuild/rules_java/releases/download/7.12.3/rules_java-7.12.3.tar.gz",
40+
],
41+
sha256 = "c0ee60f8757f140c157fc2c7af703d819514de6e025ebf70386d38bdd85fce83",
42+
)
43+
44+
maybe(
45+
http_archive,
46+
name = "com_google_protobuf",
47+
sha256 = "75be42bd736f4df6d702a0e4e4d30de9ee40eac024c4b845d17ae4cc831fe4ae",
48+
strip_prefix = "protobuf-21.7",
49+
url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.7.tar.gz",
50+
)
51+
52+
maybe(
53+
http_archive,
54+
name = "rules_proto",
55+
sha256 = "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295",
56+
strip_prefix = "rules_proto-6.0.2",
57+
url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz",
58+
)

‎scala/private/macros/scala_repositories.bzl

+3-55
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("//scala:deps.bzl", "rules_scala_dependencies")
12
load(
23
"//scala:scala_cross_version.bzl",
34
"extract_major_version",
@@ -117,59 +118,6 @@ def dt_patched_compiler_setup(scala_version, scala_compiler_srcjar = None):
117118
integrity = srcjar.get("integrity"),
118119
)
119120

120-
def load_rules_dependencies():
121-
if not native.existing_rule("bazel_skylib"):
122-
http_archive(
123-
name = "bazel_skylib",
124-
sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
125-
urls = [
126-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
127-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
128-
],
129-
)
130-
131-
# Needed by protobuf-21.7 and Bazel 6.5.0, as later versions require C++14.
132-
if not native.existing_rule("com_google_absl"):
133-
http_archive(
134-
name = "com_google_absl",
135-
sha256 = "91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8",
136-
strip_prefix = "abseil-cpp-20220623.1",
137-
url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz",
138-
)
139-
140-
if not native.existing_rule("com_google_protobuf"):
141-
http_archive(
142-
name = "com_google_protobuf",
143-
sha256 = "75be42bd736f4df6d702a0e4e4d30de9ee40eac024c4b845d17ae4cc831fe4ae",
144-
strip_prefix = "protobuf-21.7",
145-
url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.7.tar.gz",
146-
)
147-
148-
if not native.existing_rule("rules_cc"):
149-
http_archive(
150-
name = "rules_cc",
151-
urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.6/rules_cc-0.0.6.tar.gz"],
152-
sha256 = "3d9e271e2876ba42e114c9b9bc51454e379cbf0ec9ef9d40e2ae4cec61a31b40",
153-
strip_prefix = "rules_cc-0.0.6",
154-
)
155-
156-
if not native.existing_rule("rules_java"):
157-
http_archive(
158-
name = "rules_java",
159-
urls = [
160-
"https://github.com/bazelbuild/rules_java/releases/download/7.12.3/rules_java-7.12.3.tar.gz",
161-
],
162-
sha256 = "c0ee60f8757f140c157fc2c7af703d819514de6e025ebf70386d38bdd85fce83",
163-
)
164-
165-
if not native.existing_rule("rules_proto"):
166-
http_archive(
167-
name = "rules_proto",
168-
sha256 = "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295",
169-
strip_prefix = "rules_proto-6.0.2",
170-
url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz",
171-
)
172-
173121
def setup_scala_compiler_sources(srcjars = {}):
174122
"""Generates Scala compiler source repos used internally by rules_scala.
175123
@@ -188,7 +136,7 @@ def setup_scala_compiler_sources(srcjars = {}):
188136
)
189137

190138
def rules_scala_setup(scala_compiler_srcjar = None):
191-
load_rules_dependencies()
139+
rules_scala_dependencies()
192140
setup_scala_compiler_sources({
193141
version: scala_compiler_srcjar
194142
for version in SCALA_VERSIONS
@@ -260,7 +208,7 @@ def scala_repositories(
260208
scala_compiler_srcjars = {}):
261209
if load_dep_rules:
262210
# When `WORKSPACE` goes away, so can this case.
263-
load_rules_dependencies()
211+
rules_scala_dependencies()
264212

265213
setup_scala_compiler_sources(scala_compiler_srcjars)
266214

0 commit comments

Comments
 (0)