Fix javacopts for guice tests to also set --source 11

PiperOrigin-RevId: 720748642
google · Jan 29, 2025 · c583c65 · c583c65
1 parent 2a17feb
commit c583c65
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 9 deletions.
diff --git a/.github/actions/bazel-test/action.yml b/.github/actions/bazel-test/action.yml
@@ -17,5 +17,5 @@ runs:
         restore-keys: |
           ${{ runner.os }}-java-${{matrix.java}}-bazel-test-
     - name: Bazel test
-      run: bazel test //... --test_output=errors
+      run: bazel test --javacopt="--release 11" //... --test_output=errors
       shell: bash
diff --git a/core/test/com/google/inject/BUILD b/core/test/com/google/inject/BUILD
@@ -2,6 +2,7 @@
 # Author: sameb@google.com (Sam Berlin)
 
 load("@rules_java//java:defs.bzl", "java_library")
+load("//:build_defs.bzl", "JAVAC_OPTS")
 load("//:test_defs.bzl", "guice_test_suites")
 
 package(
@@ -17,14 +18,19 @@ ADD_OPENS_SRCS = [
     "ImplicitBindingJdkPackagePrivateTest.java",
 ]
 
+TEST_JAVAC_OPTS = [
+    "-Xep:BetaApi:OFF",
+    "-Xdoclint:none",
+] + JAVAC_OPTS
+
 # Files that are shared by extensions also.
 # Typically this would go in a java/../testing package,
 # but we need to work with the open-source code structure,
 # so it is here.
 java_library(
     name = "testsupport",
     srcs = TEST_SUPPORT_SRCS,
-    javacopts = ["-Xep:BetaApi:OFF"],
+    javacopts = TEST_JAVAC_OPTS,
     visibility = [
         "//:src",
     ],
@@ -47,7 +53,7 @@ java_library(
             "AllTests.java",
         ],
     ),
-    javacopts = ["-Xep:BetaApi:OFF"],
+    javacopts = TEST_JAVAC_OPTS,
     deps = [
         ":testsupport",
         "//core/src/com/google/inject",
@@ -66,7 +72,7 @@ java_library(
 java_library(
     name = "add_opens_tests",
     srcs = ADD_OPENS_SRCS,
-    javacopts = ["-Xep:BetaApi:OFF"],
+    javacopts = TEST_JAVAC_OPTS,
     deps = [
         "//core/src/com/google/inject",
         "//third_party/java/guava/base",

diff --git a/core/test/com/google/inject/ImplicitBindingTest.java b/core/test/com/google/inject/ImplicitBindingTest.java
@@ -124,8 +124,8 @@ public void go() {}
    * dependencies. And so we can successfully create a binding for B. But later, when the binding
    * for A ultimately fails, we need to clean up the dependent binding for B.
    *
-   * <p>The test loops through linked bindings & bindings with constructor and member injections, to
-   * make sure that all are cleaned up and traversed. It also makes sure we don't touch explicit
+   * <p>The test loops through linked bindings and bindings with constructor and member injections,
+   * to make sure that all are cleaned up and traversed. It also makes sure we don't touch explicit
    * bindings.
    */
   public void testCircularJitBindingsLeaveNoResidue() {

diff --git a/core/test/com/google/inject/KeyTest.java b/core/test/com/google/inject/KeyTest.java
@@ -101,7 +101,7 @@ public void testTypeEquality() throws Exception {
   }
 
   /**
-   * Key canonicalizes {@link int.class} to {@code Integer.class}, and won't expose wrapper types.
+   * Key canonicalizes {@code int.class} to {@code Integer.class}, and won't expose wrapper types.
    */
   @SuppressWarnings("rawtypes") // Unavoidable because class literal uses raw type
   public void testPrimitivesAndWrappersAreEqual() {

diff --git a/core/test/com/google/inject/errors/BUILD b/core/test/com/google/inject/errors/BUILD
@@ -1,4 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
+load("//:build_defs.bzl", "JAVAC_OPTS")
 load("//:test_defs.bzl", "guice_test_suites")
 
 package(
@@ -10,6 +11,7 @@ ERROR_MESSAGE_TEST_UTILS_SRCS = ["ErrorMessageTestUtils.java"]
 java_library(
     name = "error_message_test_utils",
     srcs = ERROR_MESSAGE_TEST_UTILS_SRCS,
+    javacopts = JAVAC_OPTS,
     deps = [
         "//third_party/java/guava/io",
         "//third_party/java/truth",
@@ -22,7 +24,7 @@ java_library(
         ["*.java"],
         exclude = ERROR_MESSAGE_TEST_UTILS_SRCS,
     ),
-    javacopts = ["-Xep:BetaApi:OFF"],
+    javacopts = ["-Xep:BetaApi:OFF"] + JAVAC_OPTS,
     resources = [
         ":test_error_files",
     ],

diff --git a/core/test/com/googlecode/guice/BUILD b/core/test/com/googlecode/guice/BUILD
@@ -2,6 +2,7 @@
 # Author: sameb@google.com (Sam Berlin)
 
 load("@rules_java//java:defs.bzl", "java_library")
+load("//:build_defs.bzl", "JAVAC_OPTS")
 load("//:test_defs.bzl", "guice_test_suites")
 
 package(
@@ -15,6 +16,7 @@ java_library(
         ["**/*.java"],
         exclude = ["*Tck.java"],
     ),
+    javacopts = JAVAC_OPTS,
     deps = [
         "//core/src/com/google/inject",
         "//core/test/com/google/inject:testsupport",

diff --git a/extensions/assistedinject/test/com/google/inject/assistedinject/BUILD b/extensions/assistedinject/test/com/google/inject/assistedinject/BUILD
@@ -1,6 +1,7 @@
 # Copyright 2011 Google Inc.  All rights reserved.
 # Author: sameb@google.com (Sam Berlin)
 load("@rules_java//java:defs.bzl", "java_library")
+load("//:build_defs.bzl", "JAVAC_OPTS")
 load("//:test_defs.bzl", "guice_test_suites")
 
 package(
@@ -15,6 +16,7 @@ java_library(
             "subpkg/SubpackageTestPrivateFallbackOnly.java",
         ],
     ),
+    javacopts = JAVAC_OPTS,
     deps = [
         "//core/src/com/google/inject",
         "//core/test/com/google/inject:testsupport",

diff --git a/extensions/dagger-adapter/test/com/google/inject/daggeradapter/BUILD b/extensions/dagger-adapter/test/com/google/inject/daggeradapter/BUILD
@@ -1,6 +1,7 @@
 # Copyright 2015 Google Inc.  All rights reserved.
 # Author: cgruber@google.com (Christian Gruber)
 load("@rules_java//java:defs.bzl", "java_library")
+load("//:build_defs.bzl", "JAVAC_OPTS")
 load("//:test_defs.bzl", "guice_test_suites")
 
 package(
@@ -10,6 +11,7 @@ package(
 java_library(
     name = "tests",
     srcs = glob(["**/*.java"]),
+    javacopts = JAVAC_OPTS,
     deps = [
         "//core/src/com/google/inject",
         "//extensions/dagger-adapter/src/com/google/inject/daggeradapter",

diff --git a/extensions/grapher/test/com/google/inject/grapher/BUILD b/extensions/grapher/test/com/google/inject/grapher/BUILD
@@ -1,6 +1,7 @@
 # Copyright 2011 Google Inc.  All rights reserved.
 # Author: sameb@google.com (Sam Berlin)
 load("@rules_java//java:defs.bzl", "java_library")
+load("//:build_defs.bzl", "JAVAC_OPTS")
 load("//:test_defs.bzl", "guice_test_suites")
 
 package(
@@ -10,6 +11,7 @@ package(
 java_library(
     name = "tests",
     srcs = glob(["**/*.java"]),
+    javacopts = JAVAC_OPTS,
     deps = [
         "//core/src/com/google/inject",
         "//extensions/assistedinject/src/com/google/inject/assistedinject",

diff --git a/extensions/jmx/test/com/google/inject/tools/jmx/BUILD b/extensions/jmx/test/com/google/inject/tools/jmx/BUILD
@@ -1,6 +1,7 @@
 # Copyright 2011 Google Inc.  All rights reserved.
 # Author: sameb@google.com (Sam Berlin)
 load("@rules_java//java:defs.bzl", "java_library")
+load("//:build_defs.bzl", "JAVAC_OPTS")
 
 package(
     default_testonly = 1,
@@ -9,6 +10,7 @@ package(
 java_library(
     name = "tests",
     srcs = glob(["**/*.java"]),
+    javacopts = JAVAC_OPTS,
     deps = [
         "//core/src/com/google/inject",
         "//extensions/jmx/src/com/google/inject/tools/jmx",

diff --git a/extensions/servlet/test/com/google/inject/servlet/BUILD b/extensions/servlet/test/com/google/inject/servlet/BUILD
@@ -1,6 +1,7 @@
 # Copyright 2011 Google Inc.  All rights reserved.
 # Author: sameb@google.com (Sam Berlin)
 load("@rules_java//java:defs.bzl", "java_library")
+load("//:build_defs.bzl", "JAVAC_OPTS")
 load("//:test_defs.bzl", "guice_test_suites")
 
 package(
@@ -13,7 +14,7 @@ java_library(
     javacopts = [
         "-Xep:FutureReturnValueIgnored:OFF",
         "-Xep:MixedArrayDimensions:OFF",
-    ],
+    ] + JAVAC_OPTS,
     deps = [
         "//core/src/com/google/inject",
         "//core/test/com/google/inject:testsupport",

diff --git a/extensions/spring/test/com/google/inject/spring/BUILD b/extensions/spring/test/com/google/inject/spring/BUILD
@@ -1,6 +1,7 @@
 # Copyright 2011 Google Inc.  All rights reserved.
 # Author: sameb@google.com (Sam Berlin)
 load("@rules_java//java:defs.bzl", "java_library")
+load("//:build_defs.bzl", "JAVAC_OPTS")
 load("//:test_defs.bzl", "guice_test_suites")
 
 package(
@@ -10,6 +11,7 @@ package(
 java_library(
     name = "tests",
     srcs = glob(["**/*.java"]),
+    javacopts = JAVAC_OPTS,
     deps = [
         "//core/src/com/google/inject",
         "//extensions/spring/src/com/google/inject/spring",

diff --git a/extensions/testlib/test/com/google/inject/testing/fieldbinder/BUILD b/extensions/testlib/test/com/google/inject/testing/fieldbinder/BUILD
@@ -1,6 +1,7 @@
 # Copyright 2014 Google Inc.  All rights reserved.
 # Author: eatnumber1@google.com (Russ Harmon)
 load("@rules_java//java:defs.bzl", "java_library")
+load("//:build_defs.bzl", "JAVAC_OPTS")
 load("//:test_defs.bzl", "guice_test_suites")
 
 package(
@@ -10,6 +11,7 @@ package(
 java_library(
     name = "tests",
     srcs = glob(["*.java"]),
+    javacopts = JAVAC_OPTS,
     deps = [
         "//core/src/com/google/inject",
         "//core/test/com/google/inject:testsupport",

diff --git a/extensions/testlib/test/com/google/inject/testing/throwingproviders/BUILD b/extensions/testlib/test/com/google/inject/testing/throwingproviders/BUILD
@@ -1,4 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library")
+load("//:build_defs.bzl", "JAVAC_OPTS")
 load("//:test_defs.bzl", "guice_test_suites")
 
 package(
@@ -8,6 +9,7 @@ package(
 java_library(
     name = "tests",
     srcs = glob(["*.java"]),
+    javacopts = JAVAC_OPTS,
     deps = [
         "//extensions/testlib/src/com/google/inject/testing/throwingproviders",
         "//extensions/throwingproviders/src/com/google/inject/throwingproviders",

diff --git a/extensions/throwingproviders/test/com/google/inject/throwingproviders/BUILD b/extensions/throwingproviders/test/com/google/inject/throwingproviders/BUILD
@@ -1,6 +1,7 @@
 # Copyright 2011 Google Inc.  All rights reserved.
 # Author: sameb@google.com (Sam Berlin)
 load("@rules_java//java:defs.bzl", "java_library")
+load("//:build_defs.bzl", "JAVAC_OPTS")
 load("//:test_defs.bzl", "guice_test_suites")
 
 package(
@@ -10,6 +11,7 @@ package(
 java_library(
     name = "tests",
     srcs = glob(["**/*.java"]),
+    javacopts = JAVAC_OPTS,
     deps = [
         "//core/src/com/google/inject",
         "//core/test/com/google/inject:testsupport",