diff --git a/examples/crossbuild/.bazelrc b/examples/crossbuild/.bazelrc index 100128b44..005efba2f 100644 --- a/examples/crossbuild/.bazelrc +++ b/examples/crossbuild/.bazelrc @@ -1,3 +1 @@ -# Remove upon completing Bzlmod compatibility work. -# - https://github.com/bazelbuild/rules_scala/issues/1482 -build --noenable_bzlmod +import ../../.bazelrc diff --git a/examples/scala3/.bazelrc b/examples/scala3/.bazelrc index 100128b44..005efba2f 100644 --- a/examples/scala3/.bazelrc +++ b/examples/scala3/.bazelrc @@ -1,3 +1 @@ -# Remove upon completing Bzlmod compatibility work. -# - https://github.com/bazelbuild/rules_scala/issues/1482 -build --noenable_bzlmod +import ../../.bazelrc diff --git a/examples/semanticdb/.bazelrc b/examples/semanticdb/.bazelrc index 100128b44..005efba2f 100644 --- a/examples/semanticdb/.bazelrc +++ b/examples/semanticdb/.bazelrc @@ -1,3 +1 @@ -# Remove upon completing Bzlmod compatibility work. -# - https://github.com/bazelbuild/rules_scala/issues/1482 -build --noenable_bzlmod +import ../../.bazelrc diff --git a/examples/testing/multi_frameworks_toolchain/.bazelrc b/examples/testing/multi_frameworks_toolchain/.bazelrc index 46e8bdec7..993d550ea 100644 --- a/examples/testing/multi_frameworks_toolchain/.bazelrc +++ b/examples/testing/multi_frameworks_toolchain/.bazelrc @@ -1,6 +1 @@ -build --enable_platform_specific_config -windows:build --enable_runfiles - -# Remove upon completing Bzlmod compatibility work. -# - https://github.com/bazelbuild/rules_scala/issues/1482 -build --noenable_bzlmod +import ../../../.bazelrc diff --git a/examples/testing/scalatest_repositories/.bazelrc b/examples/testing/scalatest_repositories/.bazelrc index 100128b44..993d550ea 100644 --- a/examples/testing/scalatest_repositories/.bazelrc +++ b/examples/testing/scalatest_repositories/.bazelrc @@ -1,3 +1 @@ -# Remove upon completing Bzlmod compatibility work. -# - https://github.com/bazelbuild/rules_scala/issues/1482 -build --noenable_bzlmod +import ../../../.bazelrc diff --git a/examples/testing/specs2_junit_repositories/.bazelrc b/examples/testing/specs2_junit_repositories/.bazelrc index 46e8bdec7..993d550ea 100644 --- a/examples/testing/specs2_junit_repositories/.bazelrc +++ b/examples/testing/specs2_junit_repositories/.bazelrc @@ -1,6 +1 @@ -build --enable_platform_specific_config -windows:build --enable_runfiles - -# Remove upon completing Bzlmod compatibility work. -# - https://github.com/bazelbuild/rules_scala/issues/1482 -build --noenable_bzlmod +import ../../../.bazelrc diff --git a/scripts/sync-bazelversion.sh b/scripts/sync-bazelversion.sh index 6692c7b06..0397d069a 100755 --- a/scripts/sync-bazelversion.sh +++ b/scripts/sync-bazelversion.sh @@ -29,4 +29,4 @@ while IFS="" read repo_marker_path; do if [[ "$repo_path" != "$repo_marker_path" ]]; then cp .bazelversion "$repo_path" fi -done < <(find [A-Za-z0-9]* \( -name "WORKSPACE*" -or -name "MODULE.bazel" \)) +done < <(find [A-Za-z0-9]* \( -name "WORKSPACE" -or -name "MODULE.bazel" \)) diff --git a/test/shell/test_scala_proto_library.sh b/test/shell/test_scala_proto_library.sh index 133bdb5c4..48e9e5586 100755 --- a/test/shell/test_scala_proto_library.sh +++ b/test/shell/test_scala_proto_library.sh @@ -28,7 +28,7 @@ test_scala_proto_show_generator_exception() { --extra_toolchains=//test/proto/custom_generator:failing_scala_proto_toolchain } -export USE_BAZEL_VERSION=${USE_BAZEL_VERSION:-$(cat ../../../.bazelversion)} +export USE_BAZEL_VERSION=${USE_BAZEL_VERSION:-$(cat $dir/../../.bazelversion)} $runner test_scala_proto_library_action_label $runner test_scala_proto_custom_generator $runner test_scala_proto_show_generator_exception diff --git a/test_cross_build/.bazelrc b/test_cross_build/.bazelrc index 100128b44..40c756345 100644 --- a/test_cross_build/.bazelrc +++ b/test_cross_build/.bazelrc @@ -1,3 +1,2 @@ -# Remove upon completing Bzlmod compatibility work. -# - https://github.com/bazelbuild/rules_scala/issues/1482 -build --noenable_bzlmod +# Remove after moving to Bazel 7. +import ../.bazelrc diff --git a/test_version/.bazelrc b/test_version/.bazelrc deleted file mode 100644 index 100128b44..000000000 --- a/test_version/.bazelrc +++ /dev/null @@ -1,3 +0,0 @@ -# Remove upon completing Bzlmod compatibility work. -# - https://github.com/bazelbuild/rules_scala/issues/1482 -build --noenable_bzlmod diff --git a/test_version/.bazelversion b/test_version/.bazelversion deleted file mode 100644 index f22d756da..000000000 --- a/test_version/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -6.5.0 diff --git a/third_party/test/example_external_workspace/.bazelrc b/third_party/test/example_external_workspace/.bazelrc index 100128b44..993d550ea 100644 --- a/third_party/test/example_external_workspace/.bazelrc +++ b/third_party/test/example_external_workspace/.bazelrc @@ -1,3 +1 @@ -# Remove upon completing Bzlmod compatibility work. -# - https://github.com/bazelbuild/rules_scala/issues/1482 -build --noenable_bzlmod +import ../../../.bazelrc diff --git a/third_party/test/proto/.bazelrc b/third_party/test/proto/.bazelrc index 100128b44..993d550ea 100644 --- a/third_party/test/proto/.bazelrc +++ b/third_party/test/proto/.bazelrc @@ -1,3 +1 @@ -# Remove upon completing Bzlmod compatibility work. -# - https://github.com/bazelbuild/rules_scala/issues/1482 -build --noenable_bzlmod +import ../../../.bazelrc