Migrate rules_scala for bazelbuild/bazel#7153

This PR simply follows the migration instructions in bazelbuild/bazel#7153, that is renames `proto_source_root` to `strip_import_prefix` and prepends the attribute value with `/`
hlopko · Jun 20, 2019 · e151aba · e151aba
1 parent a1c3b58
commit e151aba
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/test/proto/BUILD b/test/proto/BUILD
@@ -80,21 +80,21 @@ scalapb_proto_library(
     deps = [":test_external_dep_proto"],
 )
 
-# Test that the `proto_source_root` attribute is handled properly
+# Test that the `strip_import_prefix` attribute is handled properly
 proto_library(
-    name = "proto_source_root",
+    name = "strip_import_prefix",
     srcs = [
         "different_root.proto",
         "different_root2.proto",
     ],
-    proto_source_root = package_name(),
+    strip_import_prefix = "/" + package_name(),
     visibility = ["//visibility:public"],
 )
 
 scalapb_proto_library(
-    name = "test_proto_source_root",
+    name = "test_strip_import_prefix",
     visibility = ["//visibility:public"],
-    deps = [":proto_source_root"],
+    deps = [":strip_import_prefix"],
 )
 
 proto_library(

diff --git a/...ailure/proto_source_root/dependency/BUILD → ...lure/strip_import_prefix/dependency/BUILD b/...ailure/proto_source_root/dependency/BUILD → ...lure/strip_import_prefix/dependency/BUILD
@@ -1,6 +1,6 @@
 proto_library(
     name = "dependency",
     srcs = glob(["*.proto"]),
-    proto_source_root = package_name(),
+    strip_import_prefix = "/" + package_name(),
     visibility = ["//visibility:public"],
 )
diff --git a/...oto_source_root/dependency/zip_code.proto → ...p_import_prefix/dependency/zip_code.proto b/...oto_source_root/dependency/zip_code.proto → ...p_import_prefix/dependency/zip_code.proto
diff --git a/...pect_failure/proto_source_root/user/BUILD → ...ct_failure/strip_import_prefix/user/BUILD b/...pect_failure/proto_source_root/user/BUILD → ...ct_failure/strip_import_prefix/user/BUILD
@@ -6,7 +6,7 @@ load(
 proto_library(
     name = "user",
     srcs = glob(["*.proto"]),
-    proto_source_root = package_name(),
+    strip_import_prefix = "/" + package_name(),
     deps = ["//test_expect_failure/proto_source_root/dependency"],
 )
 

diff --git a/...lure/proto_source_root/user/address.proto → ...re/strip_import_prefix/user/address.proto b/...lure/proto_source_root/user/address.proto → ...re/strip_import_prefix/user/address.proto
diff --git a/...ilure/proto_source_root/user/person.proto → ...ure/strip_import_prefix/user/person.proto b/...ilure/proto_source_root/user/person.proto → ...ure/strip_import_prefix/user/person.proto
diff --git a/test_rules_scala.sh b/test_rules_scala.sh
@@ -1035,7 +1035,7 @@ $runner test_scalaopts_from_scala_toolchain
 $runner test_scala_import_library_passes_labels_of_direct_deps
 $runner java_toolchain_javacopts_are_used
 $runner test_scala_classpath_resources_expect_warning_on_namespace_conflict
-$runner bazel build //test_expect_failure/proto_source_root/... --strict_proto_deps=off
+$runner bazel build //test_expect_failure/strip_import_prefix/... --strict_proto_deps=off
 $runner scala_binary_jar_is_exposed_in_build_event_protocol
 $runner scala_test_jar_is_exposed_in_build_event_protocol
 $runner scala_junit_test_jar_is_exposed_in_build_event_protocol