Update to K2

.github/workflows/ci.yml

@@ -17,7 +17,12 @@ concurrency:
 
 jobs:
   build:
+    name: "K2 UAST = ${{ matrix.useK2Uast }}"
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        useK2Uast: [true, false]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -35,7 +40,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
 
       - name: Build
-        run: ./gradlew check
+        run: ./gradlew check -DuseK2Uast=${{ matrix.useK2Uast }}
 
       - name: (Fail-only) Upload build reports
         if: failure()

.gitignore

@@ -1,4 +1,5 @@
 .gradle
+.kotlin/
 local.properties
 .fleet
 .idea

compose-lint-checks/build.gradle.kts

@@ -9,6 +9,7 @@ plugins {
   alias(libs.plugins.lint)
   alias(libs.plugins.ksp)
   alias(libs.plugins.mavenPublish)
+  alias(libs.plugins.buildConfig)
 }
 
 lint {
@@ -22,6 +23,20 @@ lint {
   fatal += setOf("LintDocExample", "LintImplPsiEquals", "UastImplementation")
 }
 
+buildConfig {
+  packageName("slack.lint.compose")
+  useKotlinOutput { internalVisibility = true }
+  sourceSets.getByName("test") {
+    buildConfigField(
+      "Boolean",
+      "USE_K2_UAST",
+      providers.systemProperty("useK2Uast").orElse("false"),
+    )
+  }
+}
+
+tasks.test { maxParallelForks = Runtime.getRuntime().availableProcessors() * 2 }
+
 dependencies {
   compileOnly(libs.lint.api)
   ksp(libs.autoService.ksp)

compose-lint-checks/src/test/java/slack/lint/compose/BaseComposeLintTest.kt

@@ -3,7 +3,6 @@
 package slack.lint.compose
 
 import com.android.tools.lint.checks.infrastructure.LintDetectorTest
-import com.android.tools.lint.checks.infrastructure.TestLintClient
 import com.android.tools.lint.checks.infrastructure.TestLintTask
 import com.android.tools.lint.checks.infrastructure.TestMode
 import com.android.tools.lint.detector.api.Detector
@@ -82,9 +81,6 @@ abstract class BaseComposeLintTest : LintDetectorTest() {
       ),
     )
 
-  /** Optional override to customize the lint client name when running lint test tasks. */
-  open val lintClientName: String? = null
-
   /**
    * Lint periodically adds new "TestModes" to LintDetectorTest. These modes act as a sort of chaos
    * testing mechanism, adding different common variations of code (extra spaces, extra parens, etc)
@@ -100,7 +96,7 @@ abstract class BaseComposeLintTest : LintDetectorTest() {
 
   override fun lint(): TestLintTask {
     val lintTask = super.lint()
-    lintClientName?.let { lintTask.clientFactory { TestLintClient(it) } }
+    lintTask.configureOptions { flags -> flags.setUseK2Uast(TestBuildConfig.USE_K2_UAST) }
     lintTask.allowCompilationErrors(false)
 
     skipTestModes?.let { testModesToSkip -> lintTask.skipTestModes(*testModesToSkip) }

gradle.properties

@@ -1,21 +1,23 @@
 org.gradle.jvmargs=-Xms1g -Xmx4g -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=1g
 
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
-
-# Enable remote build cache
-# https://docs.gradle.org/current/userguide/build_cache.html
 org.gradle.caching=true
+org.gradle.configureondemand=true
+org.gradle.configuration-cache=true
 
 # Suppress warnings about experimental AGP properties we're using
 # Ironically, this property itself is also experimental, so we have to suppress it too.
 android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarnings,\
-  android.experimental.lint.missingBaselineIsEmptyBaseline
+  android.experimental.lint.missingBaselineIsEmptyBaseline,\
+  android.lint.useK2Uast
 
 android.experimental.lint.missingBaselineIsEmptyBaseline=true
 
+android.lint.useK2Uast=true
+
+# https://github.com/google/ksp/issues/1839
+ksp.useKSP2=false
+
 # Versioning bits
 GROUP=com.slack.lint.compose
 POM_URL=https://github.com/slackhq/compose-lints/

gradle/libs.versions.toml

@@ -1,17 +1,18 @@
 [versions]
-kotlin = "1.9.24"
+kotlin = "2.0.0"
 ktfmt = "0.49"
 jdk = "21"
 jvmTarget = "17"
 lint = "31.4.1"
 lint-latest = "31.6.0-alpha02"
 
 [plugins]
+buildConfig = { id = "com.github.gmazzo.buildconfig", version = "5.3.5" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.6" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
 lint = { id = "com.android.lint", version = "8.6.0-alpha02" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-ksp = { id = "com.google.devtools.ksp", version = "1.9.24-1.0.20" }
+ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.21" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.28.0" }
 spotless = { id = "com.diffplug.spotless", version = "6.25.0" }