Skip to content

Commit b66aedf

Browse files
committed
WIP: Bzlmod part the one hundred-twentieth
Removed all native.bind calls from twitter_scrooge Both `WORKSPACE` and Bzlmod builds pass after this change. Not surprising, since previous changes had short circuited that logic to begin with via `bzlmod_enabled = True`.
1 parent 9d3fa86 commit b66aedf

File tree

2 files changed

+5
-45
lines changed

2 files changed

+5
-45
lines changed

jmh/jmh.bzl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ def jmh_repositories(
2727
)
2828

2929
if not bzlmod_enabled:
30-
native.register_toolchains(
31-
"@io_bazel_rules_scala_toolchains//jmh:jmh_toolchain",
32-
)
30+
native.register_toolchains("@io_bazel_rules_scala_toolchains//jmh:all")
3331

3432
def _scala_generate_benchmark(ctx):
3533
# we use required providers to ensure JavaInfo exists

twitter_scrooge/twitter_scrooge.bzl

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ def _declare_and_bind(
2929
artifact_id,
3030
external_artifact_id,
3131
overriden_artifacts,
32-
maven_servers,
33-
bzlmod_enabled):
32+
maven_servers):
3433
if not label:
3534
repositories(
3635
scala_version = SCALA_VERSION,
@@ -43,12 +42,6 @@ def _declare_and_bind(
4342
)
4443
label = "@" + artifact_id
4544

46-
if not bzlmod_enabled:
47-
native.bind(
48-
name = external_artifact_id,
49-
actual = label,
50-
)
51-
5245
def twitter_scrooge(
5346
maven_servers = _default_maven_server_urls(),
5447
overriden_artifacts = {},
@@ -66,7 +59,6 @@ def twitter_scrooge(
6659
"io_bazel_rules_scala/dependency/thrift/libthrift",
6760
overriden_artifacts,
6861
maven_servers,
69-
bzlmod_enabled,
7062
)
7163

7264
_declare_and_bind(
@@ -75,7 +67,6 @@ def twitter_scrooge(
7567
"io_bazel_rules_scala/dependency/thrift/scrooge_core",
7668
overriden_artifacts,
7769
maven_servers,
78-
bzlmod_enabled,
7970
)
8071

8172
_declare_and_bind(
@@ -84,7 +75,6 @@ def twitter_scrooge(
8475
"io_bazel_rules_scala/dependency/thrift/scrooge_generator",
8576
overriden_artifacts,
8677
maven_servers,
87-
bzlmod_enabled,
8878
)
8979

9080
_declare_and_bind(
@@ -93,7 +83,6 @@ def twitter_scrooge(
9383
"io_bazel_rules_scala/dependency/thrift/util_core",
9484
overriden_artifacts,
9585
maven_servers,
96-
bzlmod_enabled,
9786
)
9887

9988
_declare_and_bind(
@@ -102,7 +91,6 @@ def twitter_scrooge(
10291
"io_bazel_rules_scala/dependency/thrift/util_logging",
10392
overriden_artifacts,
10493
maven_servers,
105-
bzlmod_enabled,
10694
)
10795

10896
repositories(
@@ -118,37 +106,11 @@ def twitter_scrooge(
118106
overriden_artifacts = overriden_artifacts,
119107
)
120108

121-
if bzlmod_enabled:
122-
return
123-
124-
native.bind(
125-
name = "io_bazel_rules_scala/dependency/thrift/mustache",
126-
actual = "@io_bazel_rules_scala_mustache",
127-
)
128-
129-
native.bind(
130-
name = "io_bazel_rules_scala/dependency/thrift/scopt",
131-
actual = "@io_bazel_rules_scala_scopt",
132-
)
133-
134-
# scrooge-generator needs these runtime_deps to generate java from thrift.
135-
if not native.existing_rule("io_bazel_rules_scala/dependency/scala/guava"):
136-
native.bind(
137-
name = "io_bazel_rules_scala/dependency/scala/guava",
138-
actual = "@io_bazel_rules_scala_guava",
139-
)
140-
141-
# This is a shim needed to import `@javax.annotation.Generated` when compiled with jdk11.
142-
if not native.existing_rule("io_bazel_rules_scala/dependency/thrift/javax_annotation_api"):
143-
native.bind(
144-
name = "io_bazel_rules_scala/dependency/thrift/javax_annotation_api",
145-
actual = "@io_bazel_rules_scala_javax_annotation_api",
109+
if not bzlmod_enabled:
110+
native.register_toolchains(
111+
"@io_bazel_rules_scala_toolchains//twitter_scrooge:all",
146112
)
147113

148-
native.register_toolchains(
149-
"@io_bazel_rules_scala_toolchains//twitter_scrooge:scrooge_toolchain",
150-
)
151-
152114
def _colon_paths(data):
153115
return ":".join([f.path for f in sorted(data)])
154116

0 commit comments

Comments
 (0)