Skip to content

Remove the deprecated attribute proto_source_root. #793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Aug 7, 2019
Merged

Remove the deprecated attribute proto_source_root. #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6260598
Remove the deprecated attribute proto_source_root.
lberki Jul 19, 2019
fef32bd
Update Bazel version on Travis
lberki Jul 22, 2019
b92eff6
Update rules_scala to work with Bazel >=0.27.
lberki Jul 22, 2019
272c1a6
Update to Bazel 0.26 instead.
lberki Jul 22, 2019
bd4075e
add point release number so that downloading Bazel succeeds
lberki Jul 25, 2019
383c458
change whitespace to re-trigger build
lberki Jul 29, 2019
0dcd860
update Bazel version, hopefully properly
lberki Aug 7, 2019
fcc8d6f
update test_expected_failure/
lberki Aug 7, 2019
195c3a7
minimize diff
lberki Aug 7, 2019
ce8e104
re-trigger Travis
lberki Aug 7, 2019
cdd615b
re-trigger Travis again
lberki Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ env:
# See https://github.com/bazelbuild/rules_scala/pull/622
# we want to test the last release
#- V=0.16.1 TEST_SCRIPT=test_lint.sh
- V=0.23.1 TEST_SCRIPT=test_rules_scala
- V=0.28.0 TEST_SCRIPT=test_rules_scala
#- V=0.14.1 TEST_SCRIPT=test_intellij_aspect.sh
- V=0.23.1 TEST_SCRIPT=test_reproducibility
#- V=0.14.1 TEST_SCRIPT=test_intellij_aspect.sh
- V=0.28.0 TEST_SCRIPT=test_reproducibility


before_install:
Expand Down
9 changes: 4 additions & 5 deletions test/proto/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,19 @@ scalapb_proto_library(

# Test that the `proto_source_root` 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 = "",
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(
Expand Down Expand Up @@ -158,7 +158,6 @@ scala_test(
],
)


scala_test(
name = "test_custom_object_exists",
srcs = [
Expand Down
2 changes: 1 addition & 1 deletion test_expect_failure/proto_source_root/dependency/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
proto_library(
name = "dependency",
srcs = glob(["*.proto"]),
proto_source_root = package_name(),
strip_import_prefix = "",
visibility = ["//visibility:public"],
)
2 changes: 1 addition & 1 deletion test_expect_failure/proto_source_root/user/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ load(
proto_library(
name = "user",
srcs = glob(["*.proto"]),
proto_source_root = package_name(),
strip_import_prefix = "",
deps = ["//test_expect_failure/proto_source_root/dependency"],
)

Expand Down