diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index 864ba362..54ea6316 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -29,7 +29,11 @@ jobs: java-version: | 11 17 - 25 + + - uses: actions/setup-java@v6 + with: + distribution: 'temurin' + java-version-file: .java-version - uses: gradle/actions/wrapper-validation@v6 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d3e9a9e4..4d5fe6a6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -java-compilation = "21" +java-compilation = "25" java-target = "11" bundletool = "1.18.3" # Keep this values in sync with bundletool"s dependencies. diff --git a/gradle/plugins/build.gradle b/gradle/plugins/build.gradle index d492c7e1..5bd709e8 100644 --- a/gradle/plugins/build.gradle +++ b/gradle/plugins/build.gradle @@ -1,4 +1,5 @@ import org.gradle.kotlin.dsl.ProjectExtensionsKt +import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { id 'java-gradle-plugin' @@ -10,8 +11,15 @@ samWithReceiver { annotation("org.gradle.api.HasImplicitReceiver") } +def buildLogicTarget = JavaVersion.VERSION_17 + kotlin { jvmToolchain(libs.versions.java.compilation.get().toInteger()) + compilerOptions.jvmTarget = JvmTarget.fromTarget(buildLogicTarget.toString()) +} + +tasks.withType(JavaCompile).configureEach { + options.release.set(buildLogicTarget.majorVersion.toInteger()) } dependencies { diff --git a/gradle/plugins/src/main/kotlin/SetupCompilationPlugin.kt b/gradle/plugins/src/main/kotlin/SetupCompilationPlugin.kt index 9ad8b0b3..4a0553eb 100644 --- a/gradle/plugins/src/main/kotlin/SetupCompilationPlugin.kt +++ b/gradle/plugins/src/main/kotlin/SetupCompilationPlugin.kt @@ -20,7 +20,7 @@ class SetupCompilationPlugin : Plugin { val javaTarget = getVersionCatalogVersion("java-target").toInt() kotlinExtension.apply { - jvmToolchain(25) + jvmToolchain(getVersionCatalogVersion("java-compilation").toInt()) } tasks.withType().configureEach { diff --git a/renovate.json b/renovate.json index aa52b764..d6d13266 100644 --- a/renovate.json +++ b/renovate.json @@ -5,7 +5,8 @@ "mateuszkwiecinski" ], "extends": [ - "config:recommended" + "config:recommended", + "github>usefulness/project-starter//.github/renovate/build-jdk" ], "packageRules": [ {