Skip to content

Commit 0a973ca

Browse files
committed
Use the javac --release flag to enforce API compatibility
This is better than just using the `source` and `target` flags since it also ensures that we don't accidentally use symbols from the wrong version of java.
1 parent 0adaa73 commit 0a973ca

File tree

9 files changed

+10
-27
lines changed

9 files changed

+10
-27
lines changed

.bazelrc

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ try-import .bazelrc.local
44
build --java_toolchain=@bazel_tools//tools/jdk:toolchain_java11
55

66
# We target java 8 by default
7-
build --javacopt="-source 8"
8-
build --javacopt="-target 8"
7+
build --javacopt="--release 8"
98

109
# Require java dependencies to be used and first-order
1110
build --strict_java_deps=strict

java/buildtools/src/dev/selenium/tools/jar/BUILD.bazel

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ java_binary(
44
name = "MergeJars",
55
srcs = glob(["*.java"]),
66
javacopts = [
7-
"-source",
8-
"11",
9-
"-target",
7+
"--release",
108
"11",
119
],
1210
main_class = "dev.selenium.tools.jar.MergeJars",

java/buildtools/src/dev/selenium/tools/javadoc/BUILD.bazel

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ java_binary(
44
name = "javadoc",
55
srcs = glob(["*.java"]),
66
javacopts = [
7-
"-source",
8-
"11",
9-
"-target",
7+
"--release",
108
"11",
119
],
1210
main_class = "dev.selenium.tools.javadoc.JavadocJarMaker",

java/buildtools/src/dev/selenium/tools/maven/BUILD.bazel

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ java_binary(
55
name = "MavenPublisher",
66
srcs = ["MavenPublisher.java"],
77
javacopts = [
8-
"-source",
9-
"11",
10-
"-target",
8+
"--release",
119
"11",
1210
],
1311
main_class = "dev.selenium.tools.maven.MavenPublisher",

java/buildtools/src/dev/selenium/tools/modules/BUILD.bazel

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ java_binary(
55
name = "ModuleGenerator",
66
srcs = glob(["*.java"]),
77
javacopts = [
8-
"-source",
9-
"11",
10-
"-target",
8+
"--release",
119
"11",
1210
],
1311
main_class = "dev.selenium.tools.modules.ModuleGenerator",

java/client/test/org/openqa/selenium/environment/BUILD.bazel

+1-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ java_library(
3636
"@com_google_javascript_closure_library",
3737
],
3838
javacopts = [
39-
"-source",
40-
"11",
41-
"-target",
39+
"--release",
4240
"11",
4341
],
4442
visibility = [

java/client/test/org/openqa/selenium/remote/http/BUILD.bazel

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ java_test_suite(
66
size = "small",
77
srcs = glob(["*.java"]),
88
javacopts = [
9-
"-source",
10-
"11",
11-
"-target",
9+
"--release",
1210
"11",
1311
],
1412
deps = [

java/client/test/org/openqa/selenium/tools/modules/BUILD.bazel

+2-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ load("//java:defs.bzl", "java_test_suite")
1212
# "with-module-info.jar",
1313
# ],
1414
# javacopts = [
15-
# "-source",
16-
# "9",
17-
# "-target",
18-
# "9",
15+
# "--release",
16+
# "11",
1917
# ],
2018
# deps = [
2119
# "//java/buildtools/src/dev/selenium/tools/modules:ModuleGenerator",

java/server/test/org/openqa/selenium/grid/graphql/BUILD.bazel

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ java_test_suite(
66
size = "small",
77
srcs = glob(["*.java"]),
88
javacopts = [
9-
"-source",
10-
"11",
11-
"-target",
9+
"--release",
1210
"11",
1311
],
1412
deps = [

0 commit comments

Comments
 (0)