update build to work with gradle 9.1 and Java 25

create separate test tasks for each java version
attempt to recreate project isolation failure
create separate Gradle test task for each JVM version. these are still individually invoked by github actions matrix

Author: wakingrufus

.github/workflows/build-and-check.yml

@@ -25,7 +25,7 @@ jobs:
         run: echo "The selected java versions are ${{ steps.set-matrix.outputs.version_matrix }}"
     outputs:
       version_matrix: ${{ steps.set-matrix.outputs.version_matrix }}
-  build:
+  test-jvm:
     needs: build-jvm-matrix
     strategy:
       fail-fast: false
@@ -49,7 +49,9 @@ jobs:
       - name: set up JDK
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
-          java-version: ${{ matrix.java_version }}
+          java-version: |
+            ${{ matrix.java_version }}
+            21
           distribution: 'zulu'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
@@ -66,7 +68,7 @@ jobs:
             ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }}-
             ${{ runner.os }}-gradle-wrapper-
       - name: Test Plugin
-        run: ./plugin/gradlew -p ./plugin check --no-daemon
+        run: ./plugin/gradlew -p ./plugin test${{ matrix.java_version }} --no-daemon
       - name: Upload test results
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: failure()
@@ -83,6 +85,45 @@ jobs:
             replay_pid*
             plugin/hs_err_pid*
             plugin/replay_pid*
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        with:
+          egress-policy: audit
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - name: set up JDK
+        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+        with:
+          java-version: 21
+          cache: 'gradle'
+          distribution: 'zulu'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
+        with:
+          cache-overwrite-existing: true
+      - name: Restore TestKit cache
+        # Inspired by https://github.com/actions/cache/issues/432#issuecomment-740376179
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        with:
+          path: |
+            plugin/.gradle-test-kit/caches/modules-2
+            plugin/.gradle-test-kit/caches/files-2.1
+            plugin/.gradle-test-kit/caches/metadata-2.96
+          key: gradle-wrapper-${{ hashFiles('**/gradlew') }}-${{ github.sha }}
+          restore-keys: |
+            gradle-wrapper-${{ hashFiles('**/gradlew') }}-
+            gradle-wrapper-
+      - name: Check Plugin
+        run: ./plugin/gradlew -p ./plugin check --no-daemon
+      - name: Upload test results
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        if: failure()
+        with:
+          name: test-results
+          path: plugin/build/reports/tests/test/
       - name: Check plugin codestyle
         run: ./plugin/gradlew -p ./plugin ktlintCheck --no-daemon
 
@@ -124,10 +165,10 @@ jobs:
         with:
           egress-policy: audit
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - name: set up JDK 11
+      - name: set up JDK 21
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
-          java-version: 11
+          java-version: 21
           distribution: 'zulu'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+- Update build to work with gradle 9.1 and Java 25 [#962](https://github.com/JLLeitschuh/ktlint-gradle/pull/962)
 - Collapse sourcesets to simply build [#964](https://github.com/JLLeitschuh/ktlint-gradle/pull/964)
 
 ## [13.1.0] - 2025-08-21

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1 @@
+toolchainVersion=21

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

plugin/build.gradle.kts

@@ -1,9 +1,9 @@
 import com.github.breadmoirai.githubreleaseplugin.GithubReleaseTask
-import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.util.prefixIfNot
@@ -13,7 +13,7 @@ plugins {
     `kotlin-dsl`
     `maven-publish`
     id("org.jlleitschuh.gradle.ktlint")
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
     id("com.github.breadmoirai.github-release")
     id("com.netflix.nebula.release")
 }
@@ -27,6 +27,8 @@ repositories {
 }
 
 java {
+    withJavadocJar()
+    withSourcesJar()
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(8))
     }
@@ -38,30 +40,12 @@ ktlint {
 
 tasks.withType<KotlinCompile> {
     compilerOptions {
-        languageVersion.set(KotlinVersion.KOTLIN_1_7)
-        apiVersion.set(KotlinVersion.KOTLIN_1_7)
+        languageVersion.set(KotlinVersion.KOTLIN_1_8)
+        apiVersion.set(KotlinVersion.KOTLIN_1_8)
         jvmTarget.set(JvmTarget.JVM_1_8)
     }
 }
 
-tasks.withType<PluginUnderTestMetadata>().configureEach {
-    pluginClasspath.from(configurations.compileOnly)
-}
-
-/**
- * Special configuration to be included in resulting shadowed jar, but not added to the generated pom and gradle
- * metadata files.
- */
-val shadowImplementation by configurations.creating
-configurations {
-    val compileOnly by getting {
-        extendsFrom(shadowImplementation)
-        isCanBeResolved = true
-    }
-}
-configurations["compileOnly"].extendsFrom(shadowImplementation)
-configurations["testImplementation"].extendsFrom(shadowImplementation)
-
 dependencies {
     compileOnly("com.pinterest.ktlint:ktlint-cli-reporter-core:1.0.0")
     compileOnly("com.pinterest.ktlint:ktlint-rule-engine:1.0.0")
@@ -70,23 +54,70 @@ dependencies {
     compileOnly(libs.kotlin.gradle.plugin)
     compileOnly(libs.android.gradle.plugin)
     compileOnly(kotlin("stdlib-jdk8"))
+    implementation(libs.semver)
+    implementation(libs.jgit)
+    implementation(libs.commons.io)
 
-    shadowImplementation(libs.semver)
-    shadowImplementation(libs.jgit)
-    shadowImplementation(libs.commons.io)
-    // Explicitly added for shadow plugin to relocate implementation as well
-    shadowImplementation(libs.slf4j.nop)
-
-    testImplementation(libs.junit.jupiter)
     testImplementation(libs.assertj.core)
     testImplementation(libs.kotlin.reflect)
     testImplementation(libs.ktlint.rule.engine)
     testImplementation(libs.archunit.junit5)
 }
 
+fun JvmTestSuite.extendFromTest() {
+    sources {
+        java {
+            source(project.sourceSets.named("test").map { it.java }.get())
+        }
+        kotlin {
+            source(project.sourceSets.named("test").map { it.kotlin }.get())
+        }
+        resources {
+            source(project.sourceSets.named("test").map { it.resources }.get())
+        }
+        compileClasspath += project.sourceSets["test"].compileClasspath + project.sourceSets["main"].compileClasspath
+        runtimeClasspath += project.sourceSets["test"].runtimeClasspath + project.sourceSets["main"].runtimeClasspath
+
+        // make internal classes available to tests
+        val compilations = project
+            .extensions
+            .getByType(KotlinJvmProjectExtension::class.java).target.compilations
+        compilations.getByName(sources.name)
+            .associateWith(compilations.getByName(SourceSet.MAIN_SOURCE_SET_NAME))
+    }
+}
+
+fun getCurrentJavaVersion(): String {
+    return Runtime::class.java.getPackage().specificationVersion // java 8
+        ?: Runtime::class.java.getMethod("version").invoke(null).toString() // java 9+
+}
+testing {
+    suites {
+        named<JvmTestSuite>("test") {
+            useJUnitJupiter()
+        }
+        listOf(8, 11, 17, 21, 25) // TODO get from data feed
+            .forEach {
+                register<JvmTestSuite>("test$it") {
+                    extendFromTest()
+                    targets.all {
+                        dependencies {
+                            implementation(gradleTestKit())
+                        }
+                        testTask.configure {
+                            javaLauncher.set(
+                                javaToolchains.launcherFor {
+                                    languageVersion.set(JavaLanguageVersion.of(JavaVersion.current().majorVersion))
+                                }
+                            )
+                        }
+                    }
+                }
+            }
+    }
+}
 tasks.withType<Test> {
     dependsOn("publishToMavenLocal")
-    useJUnitPlatform()
     maxParallelForks = 6 // no point in this being higher than the number of gradle workers
 
     // Set the system property for the project version to be used in the tests
@@ -110,15 +141,8 @@ tasks.withType<Test> {
             maxFailures.set(10)
         }
     }
-
-    javaLauncher.set(
-        javaToolchains.launcherFor {
-            languageVersion.set(JavaLanguageVersion.of(JavaVersion.current().majorVersion))
-        }
-    )
 }
 
-val relocateShadowJar = tasks.register<ConfigureShadowRelocation>("relocateShadowJar")
 val shadowJarTask = tasks.named<ShadowJar>("shadowJar") {
     manifest {
         attributes(
@@ -128,16 +152,12 @@ val shadowJarTask = tasks.named<ShadowJar>("shadowJar") {
             "Implementation-Vendor-Id" to project.group
         )
     }
-    // Enable package relocation in resulting shadow jar
-    relocateShadowJar.get().apply {
-        prefix = "$pluginGroup.shadow"
-        target = this@named
-    }
-
-    dependsOn(relocateShadowJar)
-    minimize()
-    archiveClassifier.set("")
-    configurations = listOf(shadowImplementation)
+    relocate("com.googlecode.javaewah", "$pluginGroup.shadow.com.googlecode.javaewah")
+    relocate("net.swiftzer", "$pluginGroup.shadow.net.swiftzer")
+    relocate("org.apache.commons.io", "$pluginGroup.shadow.org.apache.commons.io")
+    relocate("org.eclipse.jgit", "$pluginGroup.shadow.org.eclipse.jgit")
+    relocate("org.slf4j", "$pluginGroup.shadow.org.slf4j")
+    archiveClassifier.set(null)
 }
 
 // Add shadow jar to the Gradle module metadata api and runtime configurations
@@ -150,7 +170,7 @@ configurations {
 
 tasks.whenTaskAdded {
     if (name == "publishPluginJar" || name == "generateMetadataFileForPluginMavenPublication") {
-        dependsOn(tasks.named("shadowJar"))
+        dependsOn(tasks.named("jar"))
     }
 }
 
@@ -162,11 +182,11 @@ tasks.named("jar").configure {
 val ensureDependenciesAreInlined by tasks.registering {
     description = "Ensures all declared dependencies are inlined into shadowed jar"
     group = HelpTasksPlugin.HELP_GROUP
-    dependsOn(tasks.shadowJar)
+    dependsOn(tasks.named<Jar>("shadowJar"))
 
     doLast {
         val nonInlinedDependencies = mutableListOf<String>()
-        zipTree(tasks.shadowJar.flatMap { it.archiveFile }).visit {
+        zipTree(tasks.named<Jar>("shadowJar").flatMap { it.archiveFile }).visit {
             if (!isDirectory) {
                 val path = relativePath
                 if (!path.startsWith("META-INF") &&
@@ -234,18 +254,22 @@ fun setupPublishingEnvironment() {
 
 setupPublishingEnvironment()
 
-configurations.named("implementation") {
+configurations.named("runtimeClasspath") {
     attributes {
         attribute(GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE, objects.named("7.4"))
     }
 }
 
 gradlePlugin {
+    vcsUrl = "https://github.com/JLLeitschuh/ktlint-gradle"
+    website = vcsUrl
+    description = "Provides a convenient wrapper plugin over the ktlint project."
     (plugins) {
         register("ktlintPlugin") {
             id = "org.jlleitschuh.gradle.ktlint"
             implementationClass = "org.jlleitschuh.gradle.ktlint.KtlintPlugin"
             displayName = "Ktlint Gradle Plugin"
+            tags = listOf("ktlint", "kotlin", "linting")
         }
     }
 }
@@ -254,46 +278,12 @@ tasks.named<ValidatePlugins>("validatePlugins").configure {
     enableStricterValidation = true
 }
 
-// Need to move publishing configuration into afterEvaluate {}
-// to override changes done by "com.gradle.plugin-publish" plugin in afterEvaluate {} block
-// See PublishPlugin class for details
-afterEvaluate {
-    publishing {
-        publications {
-            withType<MavenPublication> {
-                // Special workaround to publish shadow jar instead of normal one. Name to override peeked here:
-                // https://github.com/gradle/gradle/blob/master/subprojects/plugin-development/src/main/java/org/gradle/plugin/devel/plugins/MavenPluginPublishPlugin.java#L73
-                if (name == "pluginMaven") {
-                    setArtifacts(
-                        listOf(
-                            shadowJarTask.get()
-                        )
-                    )
-                }
-            }
-        }
-    }
-}
-
-pluginBundle {
-    vcsUrl = "https://github.com/JLLeitschuh/ktlint-gradle"
-    website = vcsUrl
-    description = "Provides a convenient wrapper plugin over the ktlint project."
-    tags = listOf("ktlint", "kotlin", "linting")
-
-    (plugins) {
-        "ktlintPlugin" {
-            displayName = "Ktlint Gradle Plugin"
-        }
-    }
-}
-
 githubRelease {
     setToken(providers.systemProperty("github.secret"))
     owner = "JLLeitschuh"
     repo = "ktlint-gradle"
     overwrite = true
-    releaseAssets(tasks.named("shadowJar"))
+    releaseAssets(tasks.named("jar"))
 
     fun isPreReleaseVersion(): Boolean {
         val version = project.version.toString()

plugin/gradle/gradle-daemon-jvm.properties

@@ -0,0 +1 @@
+toolchainVersion=21