Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
java-compilation = "21"
java-compilation = "25"
Comment thread
mateuszkwiecinski marked this conversation as resolved.
Resolved
java-target = "11"
bundletool = "1.18.3"
# Keep this values in sync with bundletool"s dependencies.
Expand Down
8 changes: 8 additions & 0 deletions gradle/plugins/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import org.gradle.kotlin.dsl.ProjectExtensionsKt
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id 'java-gradle-plugin'
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion gradle/plugins/src/main/kotlin/SetupCompilationPlugin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class SetupCompilationPlugin : Plugin<Project> {
val javaTarget = getVersionCatalogVersion("java-target").toInt()

kotlinExtension.apply {
jvmToolchain(25)
jvmToolchain(getVersionCatalogVersion("java-compilation").toInt())
}

tasks.withType<KotlinJvmCompile>().configureEach {
Expand Down
3 changes: 2 additions & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"mateuszkwiecinski"
],
"extends": [
"config:recommended"
"config:recommended",
"github>usefulness/project-starter//.github/renovate/build-jdk"
],
"packageRules": [
{
Expand Down