Skip to content

Commit b6a1a59

Browse files
committed
WIP: Bzlmod part the one hundred-sixteenth
Move testing repos to dev_deps, update tag reading As I was about to work on `WORKSPACE` compatibiity, I realized we shouldn't bake `rules_scala` testing repos into the main `deps.bzl` module extension. In the process of moving them to the internal `dev_deps.bzl` extension, I rethought my earlier tag reading design. The new version seems more correct and readable.
1 parent 2dc9540 commit b6a1a59

File tree

15 files changed

+898
-546
lines changed

15 files changed

+898
-546
lines changed

MODULE.bazel

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -88,29 +88,22 @@ dev_deps.toolchains(
8888
twitter_scrooge = True,
8989
)
9090

91-
# Default versions of version specific repos needed by some of our tests. Tests
92-
# that set `--repo_env=SCALA_VERSION=...` break without using the default here,
93-
# because version specific repos for other versions won't be available.
9491
use_repo(
9592
dev_deps,
96-
"io_bazel_rules_scala_guava",
93+
"scala_proto_rules_protoc_bridge",
94+
"scala_proto_rules_scalapb_plugin",
95+
"scalafmt_default",
9796
)
9897

99-
# See //testing/private:repositories.bzl for notes on some of these repos.
98+
# Default versions of version specific repos needed by some of our tests. Tests
99+
# that set `--repo_env=SCALA_VERSION=...` break without using the default here,
100+
# because version specific repos for other versions won't be available.
100101
use_repo(
101102
dev_deps,
102-
"com_github_jnr_jffi_native",
103-
"com_google_guava_guava_21_0",
104-
"com_google_guava_guava_21_0_with_file",
105-
"com_twitter__scalding_date",
106-
"org_apache_commons_commons_lang_3_5",
107-
"org_springframework_spring_core",
108-
"org_springframework_spring_tx",
109-
"org_typelevel__cats_core",
110-
"org_typelevel_kind_projector",
111-
"scala_proto_rules_protoc_bridge",
112-
"scala_proto_rules_scalapb_plugin",
113-
"scalafmt_default",
103+
"io_bazel_rules_scala_guava",
104+
"io_bazel_rules_scala_junit_junit",
105+
"io_bazel_rules_scala_scala_compiler",
106+
"io_bazel_rules_scala_scala_library",
114107
)
115108

116109
[
@@ -140,6 +133,21 @@ internal_dev_deps = use_extension(
140133
"dev_deps",
141134
dev_dependency = True,
142135
)
136+
137+
# See //testing/private:repositories.bzl for notes on some of these repos.
138+
use_repo(
139+
internal_dev_deps,
140+
"com_github_jnr_jffi_native",
141+
"com_google_guava_guava_21_0",
142+
"com_google_guava_guava_21_0_with_file",
143+
"com_twitter__scalding_date",
144+
"org_apache_commons_commons_lang_3_5",
145+
"org_springframework_spring_core",
146+
"org_springframework_spring_tx",
147+
"org_typelevel__cats_core",
148+
"org_typelevel_kind_projector",
149+
)
150+
143151
use_repo(
144152
internal_dev_deps,
145153
"com_github_bazelbuild_buildtools",

MODULE.bazel.lock

Lines changed: 701 additions & 321 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dt_patches/test_dt_patches/MODULE.bazel.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dt_patches/test_dt_patches_user_srcjar/MODULE.bazel.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/crossbuild/MODULE.bazel.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/scala3/MODULE.bazel.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/semanticdb/MODULE.bazel.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/testing/multi_frameworks_toolchain/MODULE.bazel.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/testing/scalatest_repositories/MODULE.bazel.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/testing/specs2_junit_repositories/MODULE.bazel.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)