Skip to content

Commit c7e5ca7

Browse files
committed
Add/update .bazelrc, WORKSPACE in examples/testing
Copied the `build --noenable_bzlmod --enable_workspace` flags into the `.bazelrc` files. Updated the `rules_proto` initialization stanzas.
1 parent 88815f6 commit c7e5ca7

File tree

6 files changed

+33
-4
lines changed

6 files changed

+33
-4
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
build --enable_platform_specific_config
22
windows:build --enable_runfiles
3+
4+
# Remove these upon completing Bzlmod compatibility work.
5+
# - https://github.com/bazelbuild/rules_scala/issues/1482
6+
build --noenable_bzlmod --enable_workspace

examples/testing/multi_frameworks_toolchain/WORKSPACE

+7-1
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,16 @@ rules_scala_setup()
3030

3131
rules_scala_toolchain_deps_repositories(fetch_sources = True)
3232

33-
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
33+
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
3434

3535
rules_proto_dependencies()
3636

37+
load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
38+
39+
rules_proto_setup()
40+
41+
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
42+
3743
rules_proto_toolchains()
3844

3945
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Remove these upon completing Bzlmod compatibility work.
2+
# - https://github.com/bazelbuild/rules_scala/issues/1482
3+
build --noenable_bzlmod --enable_workspace

examples/testing/scalatest_repositories/WORKSPACE

+7-1
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,16 @@ rules_scala_setup()
3030

3131
rules_scala_toolchain_deps_repositories(fetch_sources = True)
3232

33-
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
33+
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
3434

3535
rules_proto_dependencies()
3636

37+
load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
38+
39+
rules_proto_setup()
40+
41+
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
42+
3743
rules_proto_toolchains()
3844

3945
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
build --enable_platform_specific_config
2-
windows:build --enable_runfiles
2+
windows:build --enable_runfiles
3+
4+
# Remove these upon completing Bzlmod compatibility work.
5+
# - https://github.com/bazelbuild/rules_scala/issues/1482
6+
build --noenable_bzlmod --enable_workspace

examples/testing/specs2_junit_repositories/WORKSPACE

+7-1
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,16 @@ rules_scala_setup()
3030

3131
rules_scala_toolchain_deps_repositories(fetch_sources = True)
3232

33-
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
33+
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
3434

3535
rules_proto_dependencies()
3636

37+
load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
38+
39+
rules_proto_setup()
40+
41+
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
42+
3743
rules_proto_toolchains()
3844

3945
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")

0 commit comments

Comments
 (0)