fix tests

Author: mateuszkuta256

MODULE.bazel

@@ -21,6 +21,7 @@ use_repo(non_module_deps, "io_bazel_rules_scala_scala_reflect")
 use_repo(non_module_deps, "org_scalameta_semanticdb_scalac")
 use_repo(non_module_deps, "io_bazel_rules_scala_scala_tasty_core")
 use_repo(non_module_deps, "io_bazel_rules_scala_scala_asm")
+use_repo(non_module_deps, "io_bazel_rules_scala_scala_library_2")
 use_repo(non_module_deps, "io_bazel_rules_scala_org_openjdk_jmh_jmh_core")
 use_repo(non_module_deps, "io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_asm")
 use_repo(non_module_deps, "io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_reflection")

scala/private/phases/phase_dependency.bzl

@@ -85,11 +85,11 @@ def _get_unused_deps_mode(ctx):
 
 def _is_target_included(target, includes, excludes):
     for exclude in excludes:
-        if target.startswith(exclude):
+        if target.startswith(exclude) or target.startswith("@" + exclude):
             return False
 
     for include in includes:
-        if target.startswith(include):
+        if target.startswith(include) or target.startswith("@" + include):
             return True
 
     return False

test/shell/test_scala_library.sh

@@ -177,7 +177,7 @@ test_scala_library_expect_better_failure_with_target_label_from_stamped_jar_on_m
 
 test_scala_library_expect_better_failure_message_on_missing_transitive_dependency_labels_from_other_jvm_rules() {
   transitive_target='.*transitive_dependency_without_manifest.jar'
-  direct_target='@//test_expect_failure/missing_direct_deps/internal_deps:unstamped_direct_java_provider_dependency'
+  direct_target='@.*//test_expect_failure/missing_direct_deps/internal_deps:unstamped_direct_java_provider_dependency'
   test_target='//test_expect_failure/missing_direct_deps/internal_deps:unstamped_jar_dependent_on_some_java_provider'
 
   expected_message="Unknown label of file $transitive_target which came from $direct_target"

test/shell/test_strict_dependency.sh

@@ -41,7 +41,7 @@ test_plus_one_ast_analyzer_strict_deps() {
 
 test_stamped_target_label_loading() {
   local test_target="//test_expect_failure/missing_direct_deps/external_deps:java_lib_with_a_transitive_external_dep"
-  local expected_message="buildozer 'add deps @io_bazel_rules_scala_guava//:io_bazel_rules_scala_guava' ${test_target}"
+  local expected_message="buildozer 'add deps @.*io_bazel_rules_scala_guava//:io_bazel_rules_scala_guava' ${test_target}"
 
   test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message \
     "${expected_message}" ${test_target} \
@@ -56,7 +56,7 @@ test_strict_deps_filter_excluded_target() {
 
 test_strict_deps_filter_included_target() {
   local test_target="//test_expect_failure/missing_direct_deps/filtering:b"
-  local expected_message="buildozer 'add deps @com_google_guava_guava_21_0//:com_google_guava_guava_21_0' ${test_target}"
+  local expected_message="buildozer 'add deps @.*com_google_guava_guava_21_0//:com_google_guava_guava_21_0' ${test_target}"
 
   test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message \
     "${expected_message}" ${test_target} \
@@ -66,7 +66,7 @@ test_strict_deps_filter_included_target() {
 
 test_demonstrate_INCORRECT_scala_proto_library_stamp() {
   local test_target="//test_expect_failure/missing_direct_deps/scala_proto_deps:uses_transitive_scala_proto"
-  local incorrectly_stamped_expected_message="buildozer 'add deps @//test_expect_failure/missing_direct_deps/scala_proto_deps:some_proto' ${test_target}"
+  local incorrectly_stamped_expected_message="buildozer 'add deps @.*//test_expect_failure/missing_direct_deps/scala_proto_deps:some_proto' ${test_target}"
 
   # When stamping is fixed, expected stamp is:
   # local correctly_stamped_expected_message="buildozer 'add deps //test_expect_failure/missing_direct_deps/scala_proto_deps:some_scala_proto' ${test_target}"
@@ -79,7 +79,7 @@ test_demonstrate_INCORRECT_scala_proto_library_stamp() {
 
 test_scala_proto_library_stamp_by_convention() {
   local test_target="//test_expect_failure/missing_direct_deps/scala_proto_deps:uses_transitive_scala_proto"
-  local expected_message="buildozer 'add deps @//test_expect_failure/missing_direct_deps/scala_proto_deps:some_scala_proto' ${test_target}"
+  local expected_message="buildozer 'add deps @.*//test_expect_failure/missing_direct_deps/scala_proto_deps:some_scala_proto' ${test_target}"
 
   test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message \
     "${expected_message}" ${test_target} \
@@ -89,7 +89,7 @@ test_scala_proto_library_stamp_by_convention() {
 
 test_scala_proto_library_custom_phase_stamping() {
   local test_target="//test_expect_failure/missing_direct_deps/scala_proto_deps:uses_transitive_some_proto_custom_suffix"
-  local expected_message="buildozer 'add deps @//test_expect_failure/missing_direct_deps/scala_proto_deps:some_proto_custom_suffix' ${test_target}"
+  local expected_message="buildozer 'add deps .*@//test_expect_failure/missing_direct_deps/scala_proto_deps:some_proto_custom_suffix' ${test_target}"
 
   test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message \
     "${expected_message}" ${test_target} \

test_version/WORKSPACE.template

@@ -12,22 +12,6 @@ http_archive(
     ],
 )
 
-http_archive(
-    name = "rules_proto",
-    sha256 = "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da",
-    strip_prefix = "rules_proto-7e4afce6fe62dbff0a4a03450143146f9f2d7488",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
-        "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
-    ],
-)
-
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
-
-rules_proto_dependencies()
-
-rules_proto_toolchains()
-
 local_repository(
     name = "io_bazel_rules_scala",
     path = "../../"
@@ -42,6 +26,12 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories")
 
 scala_repositories(fetch_sources = True)
 
+load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
+
+rules_proto_dependencies()
+
+rules_proto_toolchains()
+
 load(":scrooge_repositories.bzl", "scrooge_repositories")
 ${twitter_scrooge_repositories}