Support ksp 2

gradle-plugin/src/functionalTest/kotlin/schwarz/it/lightsaber/gradle/LightsaberPluginIntegrationTest.kt

@@ -3,6 +3,8 @@ package schwarz.it.lightsaber.gradle
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
 import schwarz.it.lightsaber.gradle.truth.assertThat
 import java.io.File
 import java.nio.file.Files
@@ -45,10 +47,11 @@ class LightsaberPluginIntegrationTest {
         assertThat(buildResult).doesNotContain("warning:")
     }
 
-    @Test
-    fun ksp() {
+    @ParameterizedTest
+    @ValueSource(strings = ["ksp1", "ksp2"])
+    fun ksp(resourcePath: String) {
         val buildResult = GradleRunner.create()
-            .withProjectDirFromResources("ksp")
+            .withProjectDirFromResources(resourcePath)
             .withPluginClasspath()
             .withArguments("lightsaberCheck")
             .buildAndFail()
@@ -108,10 +111,11 @@ class LightsaberPluginIntegrationTest {
         assertThat(buildResult).doesNotContain("warning:")
     }
 
-    @Test
-    fun ksp_cache() {
+    @ParameterizedTest
+    @ValueSource(strings = ["ksp1", "ksp2"])
+    fun ksp_cache(resourcePath: String) {
         val runner = GradleRunner.create()
-            .withProjectDirFromResources("ksp")
+            .withProjectDirFromResources(resourcePath)
             .withPluginClasspath()
             .withArguments("lightsaberCheck", "--build-cache")
 
@@ -166,10 +170,11 @@ class LightsaberPluginIntegrationTest {
         assertThat(buildResult).doesNotContain("warning:")
     }
 
-    @Test
-    fun androidKsp() {
+    @ParameterizedTest
+    @ValueSource(strings = ["androidKsp1", "androidKsp2"])
+    fun androidKsp(resourcePath: String) {
         val buildResult = GradleRunner.create()
-            .withProjectDirFromResources("androidKsp")
+            .withProjectDirFromResources(resourcePath)
             .withPluginClasspath()
             .withArguments("lightsaberCheck")
             .buildAndFail()

gradle-plugin/src/functionalTest/kotlin/schwarz/it/lightsaber/gradle/LightsaberPluginOtherTasksTest.kt

@@ -8,7 +8,7 @@ import java.io.File
 class LightsaberPluginOtherTasksTest {
 
     @ParameterizedTest
-    @ValueSource(strings = ["annotationProcessor", "kapt", "ksp", "androidAnnotationProcessor", "androidKapt", "androidKsp"])
+    @ValueSource(strings = ["annotationProcessor", "kapt", "ksp1", "ksp2", "androidAnnotationProcessor", "androidKapt", "androidKsp1", "androidKsp2"])
     fun `Execute test task correctly`(resourcePath: String) {
         val dir: File
         GradleRunner.create()

gradle-plugin/src/functionalTest/resources/testProjects/androidKsp1/build.gradle.kts

@@ -0,0 +1,26 @@
+plugins {
+    id("com.android.application") version "8.10.1"
+    id("io.github.schwarzit.lightsaber")
+    kotlin("android") version "2.0.21"
+    id("com.google.devtools.ksp") version "2.0.21-1.0.28"
+}
+
+@OptIn(com.google.devtools.ksp.KspExperimental::class)
+ksp {
+    useKsp2.set(false)
+}
+
+android {
+    compileSdk = 33
+    namespace = "test.namespace"
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}
+
+dependencies {
+    implementation("com.google.dagger:dagger:2.48.1")
+    ksp("com.google.dagger:dagger-compiler:2.48.1")
+}

gradle-plugin/src/functionalTest/resources/testProjects/androidKsp/build.gradle.kts → gradle-plugin/src/functionalTest/resources/testProjects/androidKsp2/build.gradle.kts

@@ -5,6 +5,11 @@ plugins {
     id("com.google.devtools.ksp") version "2.0.21-1.0.28"
 }
 
+@OptIn(com.google.devtools.ksp.KspExperimental::class)
+ksp {
+    useKsp2.set(true)
+}
+
 android {
     compileSdk = 33
     namespace = "test.namespace"

gradle-plugin/src/functionalTest/resources/testProjects/androidKsp2/settings.gradle.kts

@@ -0,0 +1,16 @@
+rootProject.name = "lightsaber-android-kapt-test"
+
+pluginManagement {
+    repositories {
+        mavenCentral()
+        google()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        google()
+    }
+}

gradle-plugin/src/functionalTest/resources/testProjects/androidKsp2/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>

gradle-plugin/src/functionalTest/resources/testProjects/androidKsp2/src/main/kotlin/MyComponent.kt

@@ -0,0 +1,26 @@
+package com.example
+
+import dagger.Component
+import dagger.Module
+import dagger.Provides
+
+@Component(modules = [MyModule::class])
+interface MyComponent {
+    fun myInt(): Int
+}
+
+@Module
+abstract class MyModule {
+
+    companion object {
+        @Provides
+        fun myInt(): Int {
+            return 42
+        }
+
+        @Provides
+        fun myLong(): Long {
+            return 42L
+        }
+    }
+}

gradle-plugin/src/functionalTest/resources/testProjects/ksp1/build.gradle.kts

@@ -0,0 +1,15 @@
+plugins {
+    kotlin("jvm") version "2.0.21"
+    id("com.google.devtools.ksp") version "2.0.21-1.0.28"
+    id("io.github.schwarzit.lightsaber")
+}
+
+@OptIn(com.google.devtools.ksp.KspExperimental::class)
+ksp {
+    useKsp2.set(false)
+}
+
+dependencies {
+    implementation("com.google.dagger:dagger:2.48.1")
+    ksp("com.google.dagger:dagger-compiler:2.48.1")
+}

gradle-plugin/src/functionalTest/resources/testProjects/ksp/build.gradle.kts → gradle-plugin/src/functionalTest/resources/testProjects/ksp2/build.gradle.kts

@@ -4,6 +4,11 @@ plugins {
     id("io.github.schwarzit.lightsaber")
 }
 
+@OptIn(com.google.devtools.ksp.KspExperimental::class)
+ksp {
+    useKsp2.set(true)
+}
+
 dependencies {
     implementation("com.google.dagger:dagger:2.48.1")
     ksp("com.google.dagger:dagger-compiler:2.48.1")

gradle-plugin/src/functionalTest/resources/testProjects/ksp2/settings.gradle.kts

@@ -0,0 +1,9 @@
+rootProject.name = "lightsaber-ksp-test"
+
+dependencyResolutionManagement {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        google()
+    }
+}

gradle-plugin/src/functionalTest/resources/testProjects/ksp2/src/main/kotlin/MyComponent.kt

@@ -0,0 +1,33 @@
+package com.example
+
+import dagger.Component
+import dagger.Module
+import dagger.Provides
+import javax.inject.Inject
+
+@Component(modules = [MyModule::class])
+interface MyComponent {
+    fun myInt(): Int
+    fun foo(): Foo
+}
+
+@Module
+abstract class MyModule {
+
+    companion object {
+        @Provides
+        fun myInt(): Int {
+            return 42
+        }
+
+        @Provides
+        fun myLong(): Long {
+            return 42L
+        }
+
+        @Provides
+        fun provideFoo(): Foo = Foo()
+    }
+}
+
+class Foo @Inject constructor()

gradle-plugin/src/main/kotlin/schwarz/it/lightsaber/gradle/processors/Ksp.kt

@@ -1,5 +1,6 @@
 package schwarz.it.lightsaber.gradle.processors
 
+import com.google.devtools.ksp.gradle.KspAATask
 import com.google.devtools.ksp.gradle.KspExtension
 import com.google.devtools.ksp.gradle.KspTaskJvm
 import org.gradle.api.Project
@@ -19,24 +20,43 @@ internal fun Project.registerKspTask(
     val lightsaberCheck = registerTask(extension, variantName.orEmpty())
     lightsaberCheck.configure { task ->
         val lightsaberOutputDir = lightsaberOutputDir("ksp")
-        val taskProvider = provider {
-            tasks.withType(KspTaskJvm::class.java)
-                .matching { it.name.startsWith("ksp${variantName.orEmpty()}") }
-                .apply {
-                    configureEach { kspTask ->
-                        val sourceSet = kspTask.name
-                            .removePrefix("kapt")
-                            .removeSuffix("Kotlin")
-                            .ifEmpty { "main" }
-                            .replaceFirstChar { it.lowercaseChar() }
-                        val output = lightsaberOutputDir.map { it.dir(sourceSet) }
-                        kspTask.commandLineArgumentProviders.add(LightsaberArgumentProvider(output, ksp = true))
+        task.dependsOn(
+            project.extensions.getByType(KspExtension::class.java).useKsp2.map { useKsp2 ->
+                if (useKsp2) {
+                    tasks.withType(KspAATask::class.java)
+                        .matching { it.name.startsWith("ksp${variantName.orEmpty()}") }
+                        .apply {
+                            configureEach { kspTask ->
+                                val sourceSet = kspTask.name
+                                    .removePrefix("ksp")
+                                    .removeSuffix("Kotlin")
+                                    .ifEmpty { "main" }
+                                    .replaceFirstChar { it.lowercaseChar() }
+                                val output = lightsaberOutputDir.map { it.dir(sourceSet) }
+                                kspTask.commandLineArgumentProviders.add(LightsaberArgumentProvider(output, ksp = true))
 
-                        kspTask.outputs.dir(output)
-                    }
+                                kspTask.outputs.dir(output)
+                            }
+                        }
+                } else {
+                    tasks.withType(KspTaskJvm::class.java)
+                        .matching { it.name.startsWith("ksp${variantName.orEmpty()}") }
+                        .apply {
+                            configureEach { kspTask ->
+                                val sourceSet = kspTask.name
+                                    .removePrefix("ksp")
+                                    .removeSuffix("Kotlin")
+                                    .ifEmpty { "main" }
+                                    .replaceFirstChar { it.lowercaseChar() }
+                                val output = lightsaberOutputDir.map { it.dir(sourceSet) }
+                                kspTask.commandLineArgumentProviders.add(LightsaberArgumentProvider(output, ksp = true))
+
+                                kspTask.outputs.dir(output)
+                            }
+                        }
                 }
-        }
-        task.dependsOn(taskProvider)
+            },
+        )
 
         task.source += fileTree(lightsaberOutputDir)
     }