Skip to content

Commit 5ab2eda

Browse files
authored
Remove use of deprecated java_toolchain to fix builds with Bazel master (#1324)
* Remove use of deprecated java_toolchain to fix builds with Bazel master
1 parent 97110c9 commit 5ab2eda

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

test/shell/test_toolchain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ test_scalaopts_from_scala_toolchain() {
1111
java_toolchain_javacopts_are_used(){
1212
action_should_fail_with_message \
1313
"invalid flag: -InvalidFlag" \
14-
build --java_toolchain=//test_expect_failure/compilers_javac_opts:a_java_toolchain \
14+
build --javacopt="-InvalidFlag" \
1515
--verbose_failures //test_expect_failure/compilers_javac_opts:can_configure_jvm_flags_for_javac_via_javacopts
1616
}
1717

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
load("//scala:scala.bzl", "scala_library")
2-
load("@bazel_tools//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain")
32

43
scala_library(
54
name = "can_configure_jvm_flags_for_javac_via_javacopts",
65
srcs = ["WillNotCompileSinceJavaToolchainAddsAnInvalidJvmFlag.java"],
76
)
8-
9-
default_java_toolchain(
10-
name = "a_java_toolchain",
11-
javacopts = ["-InvalidFlag"],
12-
visibility = ["//visibility:public"],
13-
)

0 commit comments

Comments
 (0)