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
11 changes: 10 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,16 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v6

- name: Set up JDK
# Kotlin DSL compilation uses JDK 21 today (Gradle embeds Kotlin 2.2.x)
- name: Set up JDK 21 (Kotlin DSL toolchain)
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 21

# Tests/Java toolchain tasks use JDK 25
# JDK declaration order matters as the last one declared will be the default one (thus used to run Gradle itself)
- name: Set up JDK 25 (Gradle runtime + Java toolchain/tests)
uses: actions/setup-java@v5
with:
distribution: temurin
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ tasks.withType<JacocoCoverageVerification>().configureEach {
violationRules {
rules.forEach { rule ->
rule.limits.forEach { limit ->
limit.minimum = "0.91".toBigDecimal()
limit.minimum = "0.83".toBigDecimal()
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
}

group = "io.github.leanish"
version = "0.3.1"
version = "0.3.2-SNAPSHOT"

repositories {
gradlePluginPortal()
Expand All @@ -19,13 +19,14 @@ repositories {

java {
toolchain {
// Build/test the plugin on Java 25 to mirror the conventions' default toolchain.
// No Java sources today, but pinning Java toolchain tasks (especially tests) to 25 to mirror the conventions' default toolchain.
languageVersion.set(JavaLanguageVersion.of(25))
}
}

kotlin {
// Gradle embeds Kotlin 2.2.x today; pinning it to JDK 21 until Gradle uses Kotlin 2.3+.
// Gradle embeds Kotlin 2.2.x today; kotlin-dsl compilation stays on JDK 21 until Gradle moves to Kotlin 2.3+.
// At that point we should align this to 25 and simplify CI back to a single JDK.
jvmToolchain(21)
}

Expand Down
Loading