Merge branch 'main' into problems-api

vanessamj99 · web-flow · commit e303fb08c88f · 2025-08-20T15:40:20.000-05:00
Signed-off-by: Vanessa Johnson &lt;53568178+vanessamj99@users.noreply.github.com&gt;
diff --git a/.github/workflows/build-and-check.yml b/.github/workflows/build-and-check.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps: # https://michaelheap.com/dynamic-matrix-generation-github-actions/
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
       - id: set-matrix
@@ -35,7 +35,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -52,10 +52,10 @@ jobs:
           java-version: ${{ matrix.java_version }}
           distribution: 'zulu'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
       - name: Restore TestKit cache
         # Inspired by https://github.com/actions/cache/issues/432#issuecomment-740376179
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: |
             plugin/.gradle-test-kit/caches/modules-2
@@ -90,7 +90,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -101,7 +101,7 @@ jobs:
           java-version: 11
           distribution: 'zulu'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
       - name: update apt
         run: sudo apt update
       - name: Install lintian
@@ -120,7 +120,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -130,11 +130,11 @@ jobs:
           java-version: 11
           distribution: 'zulu'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
       - name: Check ktlint-plugin on samples
         run: ./gradlew ktlintCheck --no-daemon
       - name: Generate and submit dependency graph
-        uses: gradle/actions/dependency-submission@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/dependency-submission@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
         with:
           dependency-graph: generate-and-upload
 
@@ -143,7 +143,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -62,11 +62,11 @@ jobs:
 
       - name: Setup Gradle
         if: matrix.language == 'java-kotlin'
-        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/init@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
@@ -81,9 +81,9 @@ jobs:
         # Now that an explicit java version has been set, use it
         if: matrix.language == 'java-kotlin'
         run: |
-          ./gradlew -p plugin --no-daemon --no-build-cache --console=plain --no-configuration-cache -x test -x check
+          ./plugin/gradlew -p ./plugin classes --no-daemon --no-build-cache --console=plain --no-configuration-cache -x test -x check
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/analyze@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/new-release.yml b/.github/workflows/new-release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -72,6 +72,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/submit-dependency-graph.yml b/.github/workflows/submit-dependency-graph.yml
@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
       - name: Download and submit dependency graph
-        uses: gradle/actions/dependency-submission@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        uses: gradle/actions/dependency-submission@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
         with:
           dependency-graph: download-and-submit # Download saved dependency-graph and submit
diff --git a/.github/workflows/trigger-release.yaml b/.github/workflows/trigger-release.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
-Problems API Integration [#927](https://github.com/JLLeitschuh/ktlint-gradle/pull/927)
+- Gradle 9 Support [#937](https://github.com/JLLeitschuh/ktlint-gradle/pull/937)
+- Problems API Integration [#927](https://github.com/JLLeitschuh/ktlint-gradle/pull/927)
 
 ## [13.0.0] - 2025-07-07
 
diff --git a/plugin/gradle/libs.versions.toml b/plugin/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ sl4fj = "1.7.30"
 gradleWrapper = "8.13"
 gradleWrapperSha = "20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78"
 junit5 = "5.5.2"
-assertJ = "3.11.1"
+assertJ = "3.27.4"
 commonsIo = "2.17.0"
 archUnit = "1.4.0"
 mockitoKotlin = "4.1.0"
diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/KtlintBasePlugin.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/KtlintBasePlugin.kt
@@ -8,7 +8,6 @@ import org.gradle.api.Task
 import org.gradle.api.file.ConfigurableFileTree
 import org.gradle.api.tasks.util.PatternFilterable
 import org.gradle.util.GradleVersion
-import org.jlleitschuh.gradle.ktlint.reporter.CustomReporter
 import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask
 import org.jlleitschuh.gradle.ktlint.tasks.KtLintCheckTask
 import org.jlleitschuh.gradle.ktlint.tasks.KtLintFormatTask
@@ -47,7 +46,6 @@ open class KtlintBasePlugin : Plugin<Project> {
             "ktlint",
             KtlintExtension::class.java,
             target.objects,
-            target.container(CustomReporter::class.java) { CustomReporter(it) },
             filterTargetApplier,
             kotlinScriptAdditionalPathApplier
         )
diff --git a/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/KtlintExtension.kt b/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/KtlintExtension.kt
@@ -1,6 +1,5 @@
 package org.jlleitschuh.gradle.ktlint
 
-import groovy.lang.Closure
 import org.gradle.api.Action
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.file.ConfigurableFileTree
@@ -11,27 +10,24 @@ import org.gradle.api.provider.MapProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.util.PatternFilterable
-import org.gradle.util.ConfigureUtil
+import org.gradle.kotlin.dsl.domainObjectContainer
+import org.gradle.kotlin.dsl.newInstance
 import org.jlleitschuh.gradle.ktlint.reporter.CustomReporter
 import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
+import javax.inject.Inject
 
 /**
  * Extension class for configuring the [KtlintPlugin].
  * @param filterTargetApplier When [KtlintExtension.filter] is called, this function is executed.
  */
 @Suppress("UnstableApiUsage")
-open class KtlintExtension
-internal constructor(
+open class KtlintExtension @Inject internal constructor(
     objectFactory: ObjectFactory,
     projectLayout: ProjectLayout,
-    customReportersContainer: NamedDomainObjectContainer<CustomReporter>,
     private val filterTargetApplier: FilterApplier,
     kotlinScriptAdditionalPathApplier: KotlinScriptAdditionalPathApplier
 ) {
-    internal val reporterExtension = ReporterExtension(
-        customReportersContainer,
-        objectFactory
-    )
+    val reporterExtension = objectFactory.newInstance(ReporterExtension::class)
 
     /**
      * The version of KtLint to use.
@@ -154,13 +150,14 @@ internal constructor(
         }
     }
 
-    class ReporterExtension(
-        val customReporters: NamedDomainObjectContainer<CustomReporter>,
+    open class ReporterExtension @Inject constructor(
         objectFactory: ObjectFactory
     ) {
         internal val reporters: SetProperty<ReporterType> = objectFactory.setProperty {
             set(emptySet())
         }
+        val customReporters: NamedDomainObjectContainer<CustomReporter> =
+            objectFactory.domainObjectContainer(CustomReporter::class) { CustomReporter(it) }
 
         /**
          * Use one of default Ktlint output reporter
@@ -176,10 +173,8 @@ internal constructor(
         /**
          * Add 3rd party reporters.
          */
-        fun customReporters(configuration: Closure<NamedDomainObjectContainer<CustomReporter>>) {
-            // This method is needed for Groovy interop
-            // See https://discuss.gradle.org/t/multi-level-dsl-for-plugin-extension/19029/16
-            ConfigureUtil.configure(configuration, customReporters)
+        fun customReporters(configuration: Action<NamedDomainObjectContainer<CustomReporter>>) {
+            configuration.execute(customReporters)
         }
     }
 }
diff --git a/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/android/KtlintPluginAndroidTest.kt b/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/android/KtlintPluginAndroidTest.kt
@@ -88,11 +88,6 @@ class KtlintPluginAndroidTest : AbstractPluginTest() {
             minimumJava = 11,
             maximumJava = 17
         ),
-        MAX_GRADLE_MIN_AGP(
-            GradleVersion.version(TestVersions.maxSupportedGradleVersion),
-            TestVersions.minAgpVersion,
-            TestVersions.minSupportedKotlinPluginVersion
-        ),
         MAX(
             GradleVersion.version(TestVersions.maxSupportedGradleVersion),
             TestVersions.maxAgpVersion,
diff --git a/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/testdsl/TestAnnotations.kt b/plugin/src/test/kotlin/org/jlleitschuh/gradle/ktlint/testdsl/TestAnnotations.kt
@@ -1,5 +1,6 @@
 package org.jlleitschuh.gradle.ktlint.testdsl
 
+import net.swiftzer.semver.SemVer
 import org.gradle.util.GradleVersion
 import org.jlleitschuh.gradle.ktlint.KtlintPlugin
 import org.junit.jupiter.api.extension.ExtensionContext
@@ -8,15 +9,26 @@ import org.junit.jupiter.params.provider.ArgumentsProvider
 import java.util.stream.Stream
 import kotlin.streams.asStream
 
+fun getCurrentJavaVersion(): String {
+    return Runtime::class.java.getPackage().specificationVersion // java 8
+        ?: Runtime::class.java.getMethod("version").invoke(null).toString() // java 9+
+}
+
 @Suppress("ConstPropertyName")
 object TestVersions {
     const val minSupportedGradleVersion = "7.6.3" // lowest version for testing
-    const val maxSupportedGradleVersion = "8.13"
+    val maxSupportedGradleVersion =
+        // gradle 9 requires Java 17
+        if (SemVer.parse(getCurrentJavaVersion()).major >= 17) {
+            "9.0.0"
+        } else {
+            "8.14.3"
+        }
     val pluginVersion = System.getProperty("project.version")
         ?: KtlintPlugin::class.java.`package`.implementationVersion
         ?: error("Unable to determine plugin version.")
     const val minSupportedKotlinPluginVersion = "1.6.21"
-    const val maxSupportedKotlinPluginVersion = "2.1.21"
+    const val maxSupportedKotlinPluginVersion = "2.2.0"
     const val minAgpVersion = "4.1.0"
     const val maxAgpVersion = "8.8.0"
 }
@@ -25,7 +37,6 @@ object TestVersions {
 @Retention(AnnotationRetention.RUNTIME)
 annotation class GradleTestVersions(
     val minVersion: String = TestVersions.minSupportedGradleVersion,
-    val maxVersion: String = TestVersions.maxSupportedGradleVersion,
     val additionalVersions: Array<String> = []
 )
 
@@ -55,7 +66,7 @@ open class GradleArgumentsProvider : ArgumentsProvider {
         } else {
             GradleVersion.version(versionsAnnotation.minVersion)
         }
-        val maxGradleVersion = GradleVersion.version(versionsAnnotation.maxVersion)
+        val maxGradleVersion = GradleVersion.version(TestVersions.maxSupportedGradleVersion)
         val additionalGradleVersions = versionsAnnotation
             .additionalVersions
             .map(GradleVersion::version)
