Gradle 9 Support

remove use of ConfigureUtil
update max kotlin version for testing to 2.2.0

Author: wakingrufus

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+- Gradle 9 Support [#937](https://github.com/JLLeitschuh/ktlint-gradle/pull/937)
+
 ## [13.0.0] - 2025-07-07
 
 - remove support for ktlint < 1 [#889](https://github.com/JLLeitschuh/ktlint-gradle/pull/889)

plugin/build.gradle.kts

@@ -169,12 +169,6 @@ tasks.withType<Test> {
             maxFailures.set(10)
         }
     }
-
-    javaLauncher.set(
-        javaToolchains.launcherFor {
-            languageVersion.set(JavaLanguageVersion.of(JavaVersion.current().majorVersion))
-        }
-    )
 }
 
 val relocateShadowJar = tasks.register<ConfigureShadowRelocation>("relocateShadowJar")

plugin/gradle/gradle-daemon-jvm.properties

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

plugin/settings.gradle.kts

@@ -16,7 +16,7 @@ pluginManagement {
 
 plugins {
     id("com.gradle.develocity") version "3.17"
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 
 develocity {

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
         )

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)
         }
     }
 }

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,

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
@@ -11,12 +12,15 @@ import kotlin.streams.asStream
 @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(Runtime::class.java.getPackage().specificationVersion).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 +29,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 +58,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)