Ktlint 2.x support

plugin now requires java 17+ and kotlin 2.0+

Author: wakingrufus

plugin/build.gradle.kts

@@ -30,7 +30,7 @@ java {
     withJavadocJar()
     withSourcesJar()
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 
@@ -40,9 +40,8 @@ ktlint {
 
 tasks.withType<KotlinCompile> {
     compilerOptions {
-        languageVersion.set(KotlinVersion.KOTLIN_1_8)
-        apiVersion.set(KotlinVersion.KOTLIN_1_8)
-        jvmTarget.set(JvmTarget.JVM_1_8)
+        languageVersion.set(KotlinVersion.KOTLIN_2_0)
+        apiVersion.set(KotlinVersion.KOTLIN_2_0)
     }
 }
 
@@ -51,6 +50,11 @@ dependencies {
     compileOnly("com.pinterest.ktlint:ktlint-rule-engine:1.0.0")
     compileOnly("com.pinterest.ktlint:ktlint-ruleset-standard:1.0.0")
     compileOnly("com.pinterest.ktlint:ktlint-cli-reporter-baseline:1.0.0")
+
+    compileOnly("io.github.ktlint.core:ktlint-cli-reporter-core:2.0.0-ALPHA-4")
+    compileOnly("io.github.ktlint.core:ktlint-rule-engine:2.0.0-ALPHA-4")
+    compileOnly("io.github.ktlint.core:ktlint-ruleset-standard:2.0.0-ALPHA-4")
+    compileOnly("io.github.ktlint.core:ktlint-cli-reporter-baseline:2.0.0-ALPHA-4")
     compileOnly(libs.kotlin.gradle.plugin)
     compileOnly(libs.android.gradle.plugin)
     compileOnly(kotlin("stdlib-jdk8"))

plugin/gradle.properties

@@ -1,4 +1,5 @@
 org.gradle.parallel=true
+org.gradle.
 org.gradle.configureondemand=false
 org.gradle.vfs.watch=true
 # Shadow plugin does not fully support configuration cache: https://github.com/johnrengelman/shadow/issues/687

plugin/gradle/libs.versions.toml

@@ -2,11 +2,11 @@
 kotlin = "1.5.31"
 ktlint = "1.0.0"
 androidPlugin = "4.1.0"
-semver = "1.1.1"
+semver = "2.1.0"
 jgit = "5.13.3.202401111512-r"
 sl4fj = "2.0.17"
-gradleWrapper = "9.1.0"
-gradleWrapperSha = "a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806"
+gradleWrapper = "9.7.1"
+gradleWrapperSha = "acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a"
 assertJ = "3.27.4"
 commonsIo = "2.17.0"
 archUnit = "1.4.0"

plugin/gradle/wrapper/gradle-wrapper.jar

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

plugin/gradle/wrapper/gradle-wrapper.properties

@@ -36,13 +36,15 @@ internal fun createKtlintConfiguration(target: Project, extension: KtlintExtensi
         dependencies.addAllLater(
             oldProp.value(
                 extension.version.map {
-                    if (SemVer.parse(it) < SemVer(1, 0, 0)) {
+                    val semver = SemVer.parse(it)
+                    if (semver < SemVer(1, 0, 0)) {
                         target.logger.info("Add dependency: ktlint version $it")
                         listOf(target.dependencies.create("com.pinterest:ktlint:$it"))
                     } else {
                         target.logger.info("Add dependencies: ktlint version $it")
+                        val groupId = if(semver.major > 1) "io.github.ktlint.core" else "com.pinterest.ktlint"
                         listOf(
-                            target.dependencies.create("com.pinterest.ktlint:ktlint-cli:$it"),
+                            target.dependencies.create("$groupId:ktlint-cli:$it"),
                             // these transitive deps were introduced in ktlint 1.0, but for some reason not picked up automatically
                             target.dependencies.create("io.github.oshai:kotlin-logging:5.1.0"),
                             target.dependencies.create("io.github.detekt.sarif4k:sarif4k:0.5.0")
@@ -68,7 +70,9 @@ internal fun createKtlintRulesetConfiguration(
         dependencies.addLater(
             target.provider {
                 val ktlintVersion = extension.version.get()
-                target.dependencies.create("com.pinterest.ktlint:ktlint-ruleset-standard:$ktlintVersion")
+                val semver = SemVer.parse(ktlintVersion)
+                val groupId = if(semver.major > 1) "io.github.ktlint.core" else "com.pinterest.ktlint"
+                target.dependencies.create("$groupId:ktlint-ruleset-standard:$ktlintVersion")
             }
         )
     }

plugin/gradlew

@@ -2,26 +2,40 @@ package org.jlleitschuh.gradle.ktlint
 
 import net.swiftzer.semver.SemVer
 import org.gradle.api.GradleException
+import org.jlleitschuh.gradle.ktlint.baseline.BaselineAdapter
+import org.jlleitschuh.gradle.ktlint.baseline.Ktlint1BaselineAdapter
+import org.jlleitschuh.gradle.ktlint.baseline.Ktlint2BaselineAdapter
+import org.jlleitschuh.gradle.ktlint.reporter.Ktlint2ReportersProviderV2Loader
 import org.jlleitschuh.gradle.ktlint.reporter.ReportersLoaderAdapter
 import org.jlleitschuh.gradle.ktlint.reporter.ReportersProviderV2Loader
 import org.jlleitschuh.gradle.ktlint.worker.KtLintInvocation100
+import org.jlleitschuh.gradle.ktlint.worker.KtLintInvocation2
 import org.jlleitschuh.gradle.ktlint.worker.KtLintInvocationFactory
 import java.io.Serializable
 
 internal fun selectInvocation(version: String): KtLintInvocationFactory {
     val semVer = SemVer.parse(version)
-    return if (semVer.major == 0) {
-        throw GradleException("ktlint $version is incompatible with ktlint-gradle. Please upgrade to 1+")
-    } else {
-        KtLintInvocation100
+    return when (semVer.major) {
+        0 -> throw GradleException("ktlint $version is incompatible with ktlint-gradle. Please upgrade to 1+")
+        1 -> KtLintInvocation100
+        else -> KtLintInvocation2
     }
 }
 
 internal fun selectReportersLoaderAdapter(version: String): ReportersLoaderAdapter<*, out Serializable, *, *> {
     val semVer = SemVer.parse(version)
-    return if (semVer.major == 0) {
-        throw GradleException("ktlint $version is incompatible with ktlint-gradle. Please upgrade to 1+")
-    } else {
-        ReportersProviderV2Loader()
+    return when (semVer.major) {
+        0 -> throw GradleException("ktlint $version is incompatible with ktlint-gradle. Please upgrade to 1+")
+        1 -> ReportersProviderV2Loader()
+        else -> Ktlint2ReportersProviderV2Loader()
+    }
+}
+
+internal fun selectBaselineAdapter(version: String): BaselineAdapter<*> {
+    val semVer = SemVer.parse(version)
+    return when (semVer.major) {
+        0 -> throw GradleException("ktlint $version is incompatible with ktlint-gradle. Please upgrade to 1+")
+        1 -> Ktlint1BaselineAdapter()
+        else -> Ktlint2BaselineAdapter()
     }
 }

plugin/gradlew.bat

@@ -0,0 +1,14 @@
+package org.jlleitschuh.gradle.ktlint.baseline
+
+import org.jlleitschuh.gradle.ktlint.worker.LintErrorResult
+import org.jlleitschuh.gradle.ktlint.worker.SerializableLintError
+import java.io.File
+
+interface BaselineAdapter<E> {
+    fun loadBaselineFile(baselineFile: File)
+
+    fun filterOutBaseline(
+        projectDir: File,
+        lintErrorResult: LintErrorResult
+    ): List<Pair<SerializableLintError, Boolean>>
+}