Remove support for Java 7.

We're aiming to add proper nullable annotations to Dagger's runtime API types in the upcoming Dagger release. In order to do this we need to drop support for Java 7. Given Java 7 itself was officially out of support after July 2022, dropping support for Java 7 in Dagger seem reasonable. RELNOTES=Remove support for Java 7 PiperOrigin-RevId: 668231703
google · Aug 28, 2024 · 74dcec5 · 74dcec5
1 parent 5d61a6c
commit 74dcec5
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 841 deletions.
diff --git a/build_defs.bzl b/build_defs.bzl
@@ -19,7 +19,7 @@ DOCLINT_HTML_AND_SYNTAX = ["-Xdoclint:html,syntax"]
 DOCLINT_REFERENCES = ["-Xdoclint:reference"]
 
 JAVA_RELEASE_MIN = [
-    "-source 7 -target 7",
+    "-source 8 -target 8",
 ]
 
 POM_VERSION = "${project.version}"
diff --git a/javatests/dagger/internal/codegen/CompilerMode.java b/javatests/dagger/internal/codegen/CompilerMode.java
@@ -28,10 +28,7 @@
 // TODO(bcorso): Consider moving the java version into its own separate enum.
 public enum CompilerMode {
   DEFAULT_MODE,
-  DEFAULT_JAVA7_MODE("-source", "7", "-target", "7"),
-  FAST_INIT_MODE("-Adagger.fastInit=enabled"),
-  FAST_INIT_JAVA7_MODE("-Adagger.fastInit=enabled", "-source", "7", "-target", "7"),
-  ;
+  FAST_INIT_MODE("-Adagger.fastInit=enabled");
 
   /** Returns the compiler modes as a list of parameters for parameterized tests */
   public static final ImmutableList<Object[]> TEST_PARAMETERS =

diff --git a/javatests/dagger/internal/codegen/InaccessibleTypeBindsTest.java b/javatests/dagger/internal/codegen/InaccessibleTypeBindsTest.java
@@ -38,11 +38,7 @@ public static Collection<Object[]> parameters() {
     return ImmutableList.copyOf(
         new Object[][] {
             {CompilerMode.DEFAULT_MODE},
-            {CompilerMode.DEFAULT_JAVA7_MODE},
             {CompilerMode.FAST_INIT_MODE},
-            // FastInit with Java7 is the mode that motivated this test, but do the other
-            // modes anyway for completeness.
-            {CompilerMode.FAST_INIT_JAVA7_MODE}
         });
   }
 

diff --git a/javatests/dagger/internal/codegen/OptionalBindingRequestFulfillmentTest.java b/javatests/dagger/internal/codegen/OptionalBindingRequestFulfillmentTest.java
@@ -38,9 +38,7 @@ public static Collection<Object[]> parameters() {
     return ImmutableList.copyOf(
         new Object[][] {
             {CompilerMode.DEFAULT_MODE},
-            {CompilerMode.DEFAULT_JAVA7_MODE},
             {CompilerMode.FAST_INIT_MODE},
-            {CompilerMode.FAST_INIT_JAVA7_MODE}
         });
   }
 

diff --git a/...eBindsTest_inaccessibleTypeBoundInALoopScoped_DEFAULT_JAVA7_MODE_test.DaggerTestComponent b/...eBindsTest_inaccessibleTypeBoundInALoopScoped_DEFAULT_JAVA7_MODE_test.DaggerTestComponent
diff --git a/...indsTest_inaccessibleTypeBoundInALoopScoped_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent b/...indsTest_inaccessibleTypeBoundInALoopScoped_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent
diff --git a/...bleTypeBindsTest_inaccessibleTypeBoundInALoop_DEFAULT_JAVA7_MODE_test.DaggerTestComponent b/...bleTypeBindsTest_inaccessibleTypeBoundInALoop_DEFAULT_JAVA7_MODE_test.DaggerTestComponent
diff --git a/...eTypeBindsTest_inaccessibleTypeBoundInALoop_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent b/...eTypeBindsTest_inaccessibleTypeBoundInALoop_FAST_INIT_JAVA7_MODE_test.DaggerTestComponent