Bump min-supported JDK to 17

.github/workflows/gradle-build.yml

@@ -7,11 +7,11 @@ jobs:
     steps:
     - uses: actions/checkout@v6
     - uses: gradle/actions/wrapper-validation@v5
-    - name: "Set up JDK 11"
+    - name: "Set up JDK 17"
       uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
-        java-version: '11'
+        java-version: '17'
     - uses: gradle/actions/setup-gradle@v5
       name: Setup Gradle
     - name: Check Fladle

android-library-no-tests/build.gradle.kts

@@ -11,14 +11,14 @@ android {
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 }
 
 java {
   toolchain {
-    languageVersion = JavaLanguageVersion.of(11)
+    languageVersion = JavaLanguageVersion.of(17)
   }
 }
 

docs/changelog.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## Unreleased
+* Minimum required JVM version is now 17.
+* Minimum supported Gradle version is now 7.3.
 
 ## 0.18.0
 * Use non-deprecated device models and versions in default config. [PR](https://github.com/runningcode/fladle/pull/446) Thanks [Kaibolay](https://github.com/kaibolay)

fladle-plugin/build.gradle.kts

@@ -102,17 +102,17 @@ tasks.withType(ValidatePlugins::class.java).configureEach {
   enableStricterValidation.set(true)
 }
 
-// Ensure Java 11 Compatibility. See https://github.com/runningcode/fladle/issues/246
+// Ensure Java 17 Compatibility. See https://github.com/runningcode/fladle/issues/246
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).configureEach {
   compilerOptions {
-    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
+    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
     languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_7)
     apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_7)
   }
 }
 
 java {
   toolchain {
-    languageVersion.set(JavaLanguageVersion.of(11))
+    languageVersion.set(JavaLanguageVersion.of(17))
   }
 }

fladle-plugin/src/main/java/com/osacky/flank/gradle/FladlePluginDelegate.kt

@@ -219,7 +219,7 @@ class FladlePluginDelegate {
     get() = configurations.getByName(FLADLE_CONFIG)
 
   companion object {
-    val GRADLE_MIN_VERSION: GradleVersion = GradleVersion.version("6.5")
+    val GRADLE_MIN_VERSION: GradleVersion = GradleVersion.version("7.3")
     const val TASK_GROUP = "fladle"
     const val FLADLE_CONFIG = "fladle"
 

fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/FlankGradlePluginIntegrationTest.kt

@@ -11,8 +11,8 @@ class FlankGradlePluginIntegrationTest {
   @get:Rule
   var testProjectRoot = TemporaryFolder()
 
-  val minSupportGradleVersion = "6.5"
-  val oldVersion = "6.4"
+  val minSupportGradleVersion = "7.3"
+  val oldVersion = "7.2"
 
   fun writeBuildGradle(build: String) {
     testProjectRoot.writeBuildDotGradle(build)
@@ -32,11 +32,11 @@ class FlankGradlePluginIntegrationTest {
         .withPluginClasspath()
         .withGradleVersion(oldVersion)
         .buildAndFail()
-    assertThat(result.output).contains("Fladle requires at minimum version Gradle 6.5. Detected version Gradle 6.4")
+    assertThat(result.output).contains("Fladle requires at minimum version Gradle 7.3. Detected version Gradle 7.2")
   }
 
   @Test
-  fun testGradleSevenOh() {
+  fun testGradleEightOh() {
     writeBuildGradle(
       """plugins {
              |  id "com.osacky.fladle"
@@ -47,7 +47,7 @@ class FlankGradlePluginIntegrationTest {
       GradleRunner.create()
         .withProjectDir(testProjectRoot.root)
         .withPluginClasspath()
-        .withGradleVersion("7.0")
+        .withGradleVersion("8.0")
         .build()
 
     assertThat(result.output).contains("SUCCESS")
@@ -273,7 +273,7 @@ class FlankGradlePluginIntegrationTest {
   }
 
   @Test
-  fun testGradleSevenCompat() {
+  fun testGradleEightCompat() {
     writeBuildGradle(
       """plugins {
            id "com.osacky.fladle"
@@ -292,7 +292,7 @@ class FlankGradlePluginIntegrationTest {
     testProjectRoot.writeEmptyServiceCredential()
     val result =
       testProjectRoot.gradleRunner()
-        .withGradleVersion("7.0-rc-1")
+        .withGradleVersion("8.0")
         .withArguments("printYmlFooConfig")
         .build()
     assertThat(result.task(":printYmlFooConfig")!!.outcome).isEqualTo(TaskOutcome.SUCCESS)

sample-android-library/build.gradle.kts

@@ -25,14 +25,14 @@ android {
   }
   testOptions.execution = "ANDROIDX_TEST_ORCHESTRATOR"
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 }
 
 java {
   toolchain {
-    languageVersion = JavaLanguageVersion.of(11)
+    languageVersion = JavaLanguageVersion.of(17)
   }
 }
 

sample-flavors-kotlin/build.gradle.kts

@@ -15,8 +15,8 @@ android {
       testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
   testOptions.execution = "ANDROIDX_TEST_ORCHESTRATOR"
@@ -34,7 +34,7 @@ android {
 
 java {
   toolchain {
-    languageVersion = JavaLanguageVersion.of(11)
+    languageVersion = JavaLanguageVersion.of(17)
   }
 }
 

sample-kotlin/build.gradle.kts

@@ -15,15 +15,15 @@ android {
       testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
   testOptions.execution = "ANDROIDX_TEST_ORCHESTRATOR"
 }
 
 java {
   toolchain {
-    languageVersion = JavaLanguageVersion.of(11)
+    languageVersion = JavaLanguageVersion.of(17)
   }
 }
 

sample/build.gradle

@@ -17,14 +17,14 @@ android {
         execution 'ANDROIDX_TEST_ORCHESTRATOR'
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }