Skip to content

Commit ae90811

Browse files
authored
Update minimal supported Bazel version to 6.3.0 (bazelbuild#1506)
* Update minimal supported Bazel version to 6 * Suppress @SuppressWarnings("DoubleBraceInitialization") on the diagnostics test * Migrate target patterns to Bazel 6 * Use the latest 6.3.0 * Use 6.3.0 on CI for version specific jobs
1 parent 30f8fbe commit ae90811

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed

.bazelci/presubmit.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ tasks:
4242
platform: macos
4343
shell_commands:
4444
- "./test_rules_scala.sh"
45-
test_coverage_linux_5_3_1:
45+
test_coverage_linux_6_3_0:
4646
name: "./test_coverage"
4747
platform: ubuntu2004
48-
bazel: 5.3.1
48+
bazel: 6.3.0
4949
shell_commands:
5050
- "./test_coverage.sh"
51-
test_coverage_macos_5_3_1:
51+
test_coverage_macos_6.3.0:
5252
name: "./test_coverage"
5353
platform: macos
54-
bazel: 5.3.1
54+
bazel: 6.3.0
5555
shell_commands:
5656
- "./test_coverage.sh"
5757
test_reproducibility_linux:
@@ -77,7 +77,7 @@ tasks:
7777
examples_linux:
7878
name: "./test_examples"
7979
platform: ubuntu2004
80-
bazel: 5.3.1
80+
bazel: 6.3.0
8181
shell_commands:
8282
- "./test_examples.sh"
8383
lint_linux:

.bazelversion

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
5.3.1
2-
1+
6.3.0

docs/dependency-tracking.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@ Patterns prefixed with "-" will exclude targets.
155155

156156
Example patterns:
157157
- `""` includes everything - default setting
158-
- `"//"` includes all local targets
159-
- `"//foo/"` includes everything under package `//foo`, if trailing slash is omitted, it will match
160-
other packages, which start with "some", eg. `//foo_bar`
161-
- `"//foo:bar"` includes target under label `//foo:bar`
158+
- `"@//"` includes all local targets
159+
- `"@//foo/"` includes everything under package `@//foo`, if trailing slash is omitted, it will match
160+
other packages, which start with "some", eg. `@//foo_bar`
161+
- `"@//foo:bar"` includes target under label `@//foo:bar`
162162
- `@junit_junit` includes external targets, which start with `"@junit_junit"`
163-
- `"-//foo:baz"` excludes target `//foo:baz`
163+
- `"-@//foo:baz"` excludes target `@//foo:baz`
164164

165165
Exclusions take higher precedence over inclusions. Empty list will not match any targets.

test/diagnostics_reporter/DiagnosticsReporterTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.util.Map;
88

99
public class DiagnosticsReporterTest {
10+
@SuppressWarnings("DoubleBraceInitialization")
1011
private static final Map<String, diagnostics_reporter.VerifyDiagnosticsOutput[]> tests =
1112
new HashMap<String, diagnostics_reporter.VerifyDiagnosticsOutput[]>() {
1213
{

test/shell/test_scala_library.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ test_scala_library_expect_better_failure_with_target_label_from_stamped_jar_on_m
171171

172172
test_scala_library_expect_better_failure_message_on_missing_transitive_dependency_labels_from_other_jvm_rules() {
173173
transitive_target='.*transitive_dependency_without_manifest.jar'
174-
direct_target='//test_expect_failure/missing_direct_deps/internal_deps:unstamped_direct_java_provider_dependency'
174+
direct_target='@//test_expect_failure/missing_direct_deps/internal_deps:unstamped_direct_java_provider_dependency'
175175
test_target='//test_expect_failure/missing_direct_deps/internal_deps:unstamped_jar_dependent_on_some_java_provider'
176176

177177
expected_message="Unknown label of file $transitive_target which came from $direct_target"

test/shell/test_strict_dependency.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ test_strict_deps_filter_included_target() {
6666

6767
test_demonstrate_INCORRECT_scala_proto_library_stamp() {
6868
local test_target="//test_expect_failure/missing_direct_deps/scala_proto_deps:uses_transitive_scala_proto"
69-
local incorrectly_stamped_expected_message="buildozer 'add deps //test_expect_failure/missing_direct_deps/scala_proto_deps:some_proto' ${test_target}"
69+
local incorrectly_stamped_expected_message="buildozer 'add deps @//test_expect_failure/missing_direct_deps/scala_proto_deps:some_proto' ${test_target}"
7070

7171
# When stamping is fixed, expected stamp is:
7272
# 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() {
7979

8080
test_scala_proto_library_stamp_by_convention() {
8181
local test_target="//test_expect_failure/missing_direct_deps/scala_proto_deps:uses_transitive_scala_proto"
82-
local expected_message="buildozer 'add deps //test_expect_failure/missing_direct_deps/scala_proto_deps:some_scala_proto' ${test_target}"
82+
local expected_message="buildozer 'add deps @//test_expect_failure/missing_direct_deps/scala_proto_deps:some_scala_proto' ${test_target}"
8383

8484
test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message \
8585
"${expected_message}" ${test_target} \
@@ -89,7 +89,7 @@ test_scala_proto_library_stamp_by_convention() {
8989

9090
test_scala_proto_library_custom_phase_stamping() {
9191
local test_target="//test_expect_failure/missing_direct_deps/scala_proto_deps:uses_transitive_some_proto_custom_suffix"
92-
local expected_message="buildozer 'add deps //test_expect_failure/missing_direct_deps/scala_proto_deps:some_proto_custom_suffix' ${test_target}"
92+
local expected_message="buildozer 'add deps @//test_expect_failure/missing_direct_deps/scala_proto_deps:some_proto_custom_suffix' ${test_target}"
9393

9494
test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message \
9595
"${expected_message}" ${test_target} \

test_expect_failure/missing_direct_deps/filtering/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ scala_toolchain(
1313
dependency_mode = "plus-one",
1414
dependency_tracking_method = "ast",
1515
dependency_tracking_strict_deps_patterns = [
16-
"//test_expect_failure/missing_direct_deps/filtering",
17-
"-//test_expect_failure/missing_direct_deps/filtering:a",
16+
"@//test_expect_failure/missing_direct_deps/filtering",
17+
"-@//test_expect_failure/missing_direct_deps/filtering:a",
1818
],
1919
strict_deps_mode = "error",
2020
visibility = ["//visibility:public"],

test_expect_failure/unused_dependency_checker/filtering/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ scala_toolchain(
1313
dependency_mode = "plus-one",
1414
dependency_tracking_method = "ast",
1515
dependency_tracking_unused_deps_patterns = [
16-
"//test_expect_failure/unused_dependency_checker/filtering",
17-
"-//test_expect_failure/unused_dependency_checker/filtering:a",
16+
"@//test_expect_failure/unused_dependency_checker/filtering",
17+
"-@//test_expect_failure/unused_dependency_checker/filtering:a",
1818
],
1919
unused_dependency_checker_mode = "error",
2020
visibility = ["//visibility:public"],

0 commit comments

Comments
 (0)