[KAPT4] KT-51982 Implement Kapt4AnalysisHandlerExtension, add KAPT CLI and Gradle IT

Co-authored-by: Alexander Udalov <Alexander.Udalov@jetbrains.com>

plugins/kapt3/kapt3-cli/test/org/jetbrains/kotlin/kapt/cli/test/AbstractKapt4ToolIntegrationTest.kt

@@ -0,0 +1,8 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.kapt.cli.test
+
+abstract class AbstractKapt4ToolIntegrationTest : AbstractKaptToolIntegrationTest()

plugins/kapt3/kapt3-cli/test/org/jetbrains/kotlin/kapt/cli/test/AbstractKaptToolIntegrationTest.kt

@@ -9,7 +9,6 @@ import com.intellij.openapi.util.SystemInfo
 import org.jetbrains.kotlin.cli.common.arguments.readArgumentsFromArgFile
 import org.jetbrains.kotlin.test.services.JUnit5Assertions
 import org.jetbrains.kotlin.test.util.KtTestUtil
-import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.TestInfo
 import java.io.File
@@ -88,7 +87,7 @@ abstract class AbstractKaptToolIntegrationTest {
 
     private fun runJavac(args: List<String>) {
         val executableName = if (SystemInfo.isWindows) "javac.exe" else "javac"
-        val executablePath = File(getJdk8Home(), "bin/" + executableName).absolutePath
+        val executablePath = File(KtTestUtil.getJdk8Home(), "bin/" + executableName).absolutePath
         runProcess(executablePath, args)
     }
 
@@ -96,7 +95,7 @@ abstract class AbstractKaptToolIntegrationTest {
         val outputFile = File(tmpdir, "javaOutput.txt")
 
         val executableName = if (SystemInfo.isWindows) "java.exe" else "java"
-        val executablePath = File(getJdk8Home(), "bin/" + executableName).absolutePath
+        val executablePath = File(KtTestUtil.getJdk8Home(), "bin/" + executableName).absolutePath
         runProcess(executablePath, args, outputFile)
 
         throw GotResult(outputFile.takeIf { it.isFile }?.readText() ?: "")
@@ -126,18 +125,13 @@ abstract class AbstractKaptToolIntegrationTest {
     private fun transformArguments(args: List<String>): List<String> {
         return args.map {
             val arg = it.replace("%KOTLIN_STDLIB%", File("dist/kotlinc/lib/kotlin-stdlib.jar").absolutePath)
-            if (SystemInfo.isWindows && (arg.contains("=") || arg.contains(":"))) {
+            if (SystemInfo.isWindows && (arg.contains("=") || arg.contains(":") || arg.contains(";"))) {
                 "\"" + arg + "\""
             } else {
                 arg
             }
         }
     }
-
-    private fun getJdk8Home(): File {
-        val homePath = System.getenv()["JDK_1_8"] ?: System.getenv()["JDK_18"] ?: error("Can't find JDK 1.8 home, please define JDK_1_8 variable")
-        return File(homePath)
-    }
 }
 
 private val Section.args get() = readArgumentsFromArgFile(preprocessPathSeparators(content))

plugins/kapt3/kapt3-cli/testData/integration-kapt4/argfile/apKotlincArgs.txt

@@ -0,0 +1,3 @@
+-language-version 2.0
+-d output/ap
+ap/Processor.kt

plugins/kapt3/kapt3-cli/testData/integration-kapt4/argfile/build.txt

@@ -0,0 +1,36 @@
+# copy
+../simple/ap
+ap
+
+# copy
+../simple/Test.kt
+Test.kt
+
+# mkdir
+output/ap
+output/stubs
+output/classes
+output/javaClasses
+output/sources
+
+# kotlinc
+@apKotlincArgs.txt
+
+# kapt
+@kaptArgs.txt
+
+# javac
+@javacArgs.txt
+
+# kotlinc
+-language-version 2.0
+-d output/classes
+-cp output/ap:output/classes:output/javaClasses
+Test.kt
+
+# java
+-cp output/classes:output/javaClasses:output/ap:%KOTLIN_STDLIB%
+test.TestKt
+
+# after
+Generated class: generated.Test

plugins/kapt3/kapt3-cli/testData/integration-kapt4/argfile/javacArgs.txt

@@ -0,0 +1,6 @@
+-cp output/ap
+-d output/javaClasses
+-proc:none
+output/sources/generated/Function.java
+output/sources/generated/Property.java
+output/sources/generated/Test.java

plugins/kapt3/kapt3-cli/testData/integration-kapt4/argfile/kaptArgs.txt

@@ -0,0 +1,11 @@
+-language-version 2.0
+-Xuse-kapt4
+-Kapt-mode=stubsAndApt
+-Kapt-stubs=output/stubs
+-Kapt-classes=output/classes
+-Kapt-sources=output/sources
+-Kapt-classpath=output/ap
+-Kapt-processors=apt.SampleApt
+-d output/classes
+-cp output/ap
+Test.kt

plugins/kapt3/kapt3-cli/testData/integration-kapt4/compileModeUnsupported/build.txt

@@ -0,0 +1,11 @@
+# kapt
+-language-version 2.0
+-Xsuppress-version-warnings
+-Xuse-kapt4
+-Kapt-mode=compile
+../simple/Test.kt
+
+# after
+Return code: 1
+
+error: [kapt] KAPT "compile" mode is not supported in Kotlin 2.x. Run kapt with -Kapt-mode=stubsAndApt and use kotlinc for the final compilation step.

plugins/kapt3/kapt3-cli/testData/integration-kapt4/correctErrorTypesOn/Test.kt

@@ -0,0 +1,14 @@
+package test
+
+import apt.Anno
+import generated.Property
+
+object Test {
+    @field:Anno
+    lateinit var property: Property
+
+    @JvmStatic
+    fun main(args: Array<String>) {
+        print(javaClass.getDeclaredField("property").type.toGenericString())
+    }
+}

plugins/kapt3/kapt3-cli/testData/integration-kapt4/correctErrorTypesOn/ap/Processor.kt

@@ -0,0 +1,31 @@
+package apt
+
+import javax.annotation.processing.*
+import javax.lang.model.SourceVersion
+import javax.lang.model.element.*
+import javax.lang.model.type.DeclaredType
+import javax.tools.Diagnostic.Kind.*
+
+annotation class Anno
+
+class SampleApt : AbstractProcessor() {
+    override fun process(annotations: Set<TypeElement>, roundEnv: RoundEnvironment): Boolean {
+        for (element in roundEnv.getElementsAnnotatedWith(Anno::class.java).filterIsInstance<VariableElement>()) {
+            val type = element.asType() as? DeclaredType ?: continue
+            if (type.toString() == "error.NonExistentClass") {
+                processingEnv.messager.printMessage(ERROR, "NonExistentClass type occurred")
+            }
+
+            val generatedSimpleName = element.simpleName.toString().capitalize()
+            processingEnv.filer.createSourceFile("generated.$generatedSimpleName").openWriter().use {
+                it.write("package generated;\npublic class $generatedSimpleName {}")
+            }
+        }
+
+        return true
+    }
+
+    override fun getSupportedOptions() = emptySet<String>()
+    override fun getSupportedSourceVersion() = SourceVersion.RELEASE_8
+    override fun getSupportedAnnotationTypes() = setOf("apt.Anno")
+}

plugins/kapt3/kapt3-cli/testData/integration-kapt4/correctErrorTypesOn/build.txt

@@ -0,0 +1,44 @@
+# mkdir
+output/ap
+output/stubs
+output/classes
+output/javaClasses
+output/sources
+
+# kotlinc
+-cp %KOTLIN_STDLIB%
+-d output/ap
+ap/Processor.kt
+
+# kapt
+-language-version 2.0
+-Xuse-kapt4
+-Kapt-stubs=output/stubs
+-Kapt-classes=output/classes
+-Kapt-sources=output/sources
+-Kapt-classpath=output/ap
+-Kapt-processors=apt.SampleApt
+-Kapt-correct-error-types=true
+-d output/classes
+-cp output/ap:%KOTLIN_STDLIB%
+Test.kt
+
+# javac
+-cp output/ap
+-d output/javaClasses
+-proc:none
+output/sources/generated/Property.java
+
+# kotlinc
+-language-version 2.0
+-d output/classes
+-cp output/ap:output/classes:%KOTLIN_STDLIB%
+Test.kt
+output/sources
+
+# java
+-cp output/classes:output/javaClasses:output/ap:%KOTLIN_STDLIB%
+test.Test
+
+# after
+public class generated.Property

plugins/kapt3/kapt3-cli/testData/integration-kapt4/defaultPackage/RootClass.kt

@@ -0,0 +1 @@
+class RootClass

plugins/kapt3/kapt3-cli/testData/integration-kapt4/defaultPackage/Usage.kt

@@ -0,0 +1,7 @@
+package test
+
+import RootClass
+
+interface Usage {
+    fun test(): RootClass
+}

plugins/kapt3/kapt3-cli/testData/integration-kapt4/defaultPackage/build.txt

@@ -0,0 +1,47 @@
+# copy
+../simple/ap
+ap
+
+# mkdir
+output/ap
+output/stubs
+output/classes
+output/javaClasses
+output/sources
+
+# kotlinc
+-language-version 2.0
+-cp %KOTLIN_STDLIB%
+-d output/ap
+ap/Processor.kt
+
+# kapt
+-language-version 2.0
+-Xuse-kapt4
+-Kapt-mode=stubsAndApt
+-Kapt-stubs=output/stubs
+-Kapt-classes=output/classes
+-Kapt-sources=output/sources
+-Kapt-classpath=output/ap
+-Kapt-processors=apt.SampleApt
+-d output/classes
+-cp output/ap:%KOTLIN_STDLIB%
+RootClass.kt
+Usage.kt
+
+# kotlinc
+-language-version 2.0
+-d output/classes
+-cp output/ap:output/classes:output/sources:%KOTLIN_STDLIB%
+RootClass.kt
+Usage.kt
+
+# after
+Return code: 1
+
+warning: [kapt] test.Usage: Can't reference type 'RootClass' from default package in Java stub.
+error: output/stubs/test/Usage.java:9: error: cannot find symbol
+    public abstract RootClass test();
+                    ^
+  symbol:   class RootClass
+  location: interface Usage

plugins/kapt3/kapt3-cli/testData/integration-kapt4/kotlinFileGeneration/Test.kt

@@ -0,0 +1,19 @@
+package test
+
+import apt.Anno
+import generated.Test as TestGenerated
+
+@Anno
+class Test {
+    @field:Anno
+    val property: String = ""
+
+    @Anno
+    fun function() {
+
+    }
+}
+
+fun main() {
+    println("Generated class: " + TestGenerated::class.java.name)
+}

plugins/kapt3/kapt3-cli/testData/integration-kapt4/kotlinFileGeneration/ap/META-INF/services/javax.annotation.processing.Processor

@@ -0,0 +1 @@
+apt.SampleApt

plugins/kapt3/kapt3-cli/testData/integration-kapt4/kotlinFileGeneration/ap/Processor.kt

@@ -0,0 +1,37 @@
+package apt
+
+import java.io.File
+import javax.annotation.processing.*
+import javax.lang.model.SourceVersion
+import javax.lang.model.element.TypeElement
+import javax.tools.Diagnostic.Kind.*
+
+annotation class Anno
+
+class SampleApt : AbstractProcessor() {
+    private companion object {
+        const val KAPT_KOTLIN_GENERATED_OPTION_NAME = "kapt.kotlin.generated"
+    }
+
+    override fun process(annotations: Set<TypeElement>, roundEnv: RoundEnvironment): Boolean {
+        val kaptKotlinGeneratedDir = processingEnv.options[KAPT_KOTLIN_GENERATED_OPTION_NAME] ?: run {
+            processingEnv.messager.printMessage(ERROR, "Can't find the target directory for generated Kotlin files.")
+            return false
+        }
+
+        val baseDir = File(kaptKotlinGeneratedDir, "generated")
+        baseDir.mkdirs()
+
+        for (element in roundEnv.getElementsAnnotatedWith(Anno::class.java)) {
+            val generatedSimpleName = element.simpleName.toString().capitalize()
+            val file = File(baseDir, "$generatedSimpleName.kt")
+            file.writeText("package generated\n@apt.Anno\nclass $generatedSimpleName")
+        }
+
+        return true
+    }
+
+    override fun getSupportedOptions() = emptySet<String>()
+    override fun getSupportedSourceVersion() = SourceVersion.RELEASE_8
+    override fun getSupportedAnnotationTypes() = setOf("apt.Anno")
+}

plugins/kapt3/kapt3-cli/testData/integration-kapt4/kotlinFileGeneration/build.txt

@@ -0,0 +1,43 @@
+# mkdir
+output/ap
+output/stubs
+output/classes
+output/sources
+output/kotlin-sources
+
+# kotlinc
+-language-version 2.0
+-cp %KOTLIN_STDLIB%
+-d output/ap
+ap/Processor.kt
+
+# copy
+ap/META-INF/services/javax.annotation.processing.Processor
+output/ap/META-INF/services/javax.annotation.processing.Processor
+
+# kapt
+-language-version 2.0
+-Xuse-kapt4
+-Kapt-mode=stubsAndApt
+-Kapt-stubs=output/stubs
+-Kapt-classes=output/classes
+-Kapt-sources=output/sources
+-Kapt-classpath=output/ap
+-Kapt-option:kapt.kotlin.generated=output/kotlin-sources
+-d output/classes
+-cp output/ap:%KOTLIN_STDLIB%
+Test.kt
+
+# kotlinc
+-language-version 2.0
+-d output/classes
+-cp output/ap:%KOTLIN_STDLIB%
+Test.kt
+output/kotlin-sources
+
+# java
+-cp output/classes:output/ap:%KOTLIN_STDLIB%
+test.TestKt
+
+# after
+Generated class: generated.Test

plugins/kapt3/kapt3-cli/testData/integration-kapt4/kotlinFileGenerationDefaultOutput/build.txt

@@ -0,0 +1,48 @@
+# copy
+../simple/ap
+ap
+
+# copy
+../simple/Test.kt
+Test.kt
+
+# mkdir
+output/ap
+output/stubs
+output/classes
+output/sources
+
+# kotlinc
+-language-version 2.0
+-cp %KOTLIN_STDLIB%
+-d output/ap
+ap/Processor.kt
+
+# kapt
+-language-version 2.0
+-Xuse-kapt4
+-Kapt-mode=stubsAndApt
+-Kapt-stubs=output/stubs
+-Kapt-classes=output/classes
+-Kapt-sources=output/sources
+-Kapt-classpath=output/ap
+-Kapt-processors=apt.SampleApt
+-Kapt-option:kapt.test.writeKotlinFiles=true
+-d output/classes
+-cp output/ap:%KOTLIN_STDLIB%
+Test.kt
+
+# kotlinc
+-language-version 2.0
+-Xuse-kapt4
+-d output/classes
+-cp output/classes:output/ap:%KOTLIN_STDLIB%
+Test.kt
+output/sources
+
+# java
+-cp output/classes:output/ap:%KOTLIN_STDLIB%
+test.TestKt
+
+# after
+Generated class: generated.Test

plugins/kapt3/kapt3-cli/testData/integration-kapt4/kt33800/Test.kt

@@ -0,0 +1,19 @@
+package test
+
+import apt.Anno
+import generated.Example as ExampleGenerated
+
+@Anno
+class Example() {
+    private val callback = object : Any() {
+        val obj = Object()
+    }
+
+    fun call() {
+        callback.obj
+    }
+}
+
+fun main() {
+    println("Generated class: " + ExampleGenerated::class.java.name)
+}

plugins/kapt3/kapt3-cli/testData/integration-kapt4/kt33800/build.txt

@@ -0,0 +1,52 @@
+# copy
+../simple/ap
+ap
+
+# mkdir
+output/ap
+output/stubs
+output/classes
+output/javaClasses
+output/sources
+
+# kotlinc
+-language-version 2.0
+-cp %KOTLIN_STDLIB%
+-d output/ap
+ap/Processor.kt
+
+# copy
+../simple/ap/META-INF/services/javax.annotation.processing.Processor
+output/ap/META-INF/services/javax.annotation.processing.Processor
+
+# kapt
+-language-version 2.0
+-Xuse-kapt4
+-Kapt-mode=stubsAndApt
+-Kapt-stubs=output/stubs
+-Kapt-classes=output/classes
+-Kapt-sources=output/sources
+-Kapt-classpath=output/ap
+-d output/classes
+-cp output/ap:%KOTLIN_STDLIB%
+Test.kt
+
+# kotlinc
+-language-version 2.0
+-d output/classes
+-cp output/ap:output/classes:%KOTLIN_STDLIB%
+Test.kt
+output/sources
+
+# javac
+-cp output/ap
+-d output/javaClasses
+-proc:none
+output/sources/generated/Example.java
+
+# java
+-cp output/classes:output/javaClasses:output/ap:%KOTLIN_STDLIB%
+test.TestKt
+
+# after
+Generated class: generated.Example

plugins/kapt3/kapt3-cli/testData/integration-kapt4/multipass/Test.kt

@@ -0,0 +1,11 @@
+package test
+
+import apt.Annotation1
+import generated.Test123
+
+@Annotation1
+class Test
+
+fun main() {
+    println("Generated class: " + Test123::class.java.name)
+}

plugins/kapt3/kapt3-cli/testData/integration-kapt4/multipass/ap/processors.kt

@@ -0,0 +1,68 @@
+package apt
+
+import javax.annotation.processing.*
+import javax.lang.model.SourceVersion
+import javax.lang.model.element.TypeElement
+import javax.tools.Diagnostic
+
+
+annotation class Annotation1
+annotation class Annotation2
+annotation class Annotation3
+
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedAnnotationTypes("apt.Annotation1")
+class AnnotationProcessor1 : AbstractProcessor() {
+    override fun process(annotations: Set<TypeElement>, roundEnv: RoundEnvironment): Boolean {
+        val elements = roundEnv.getElementsAnnotatedWith(Annotation1::class.java)
+        for (element in elements) {
+            val generatedSimpleName = "${element.simpleName}1"
+
+            val file = processingEnv.filer.createSourceFile("generated.$generatedSimpleName")
+
+            file.openWriter().use {
+                it.write("package generated;\n@apt.Annotation2\npublic class $generatedSimpleName {}")
+            }
+        }
+
+        return true
+    }
+}
+
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedAnnotationTypes("apt.Annotation2")
+class AnnotationProcessor2 : AbstractProcessor() {
+    override fun process(annotations: Set<TypeElement>, roundEnv: RoundEnvironment): Boolean {
+        val elements = roundEnv.getElementsAnnotatedWith(Annotation2::class.java)
+        for (element in elements) {
+            val generatedSimpleName = "${element.simpleName}2"
+
+            val file = processingEnv.filer.createSourceFile("generated.$generatedSimpleName")
+
+            file.openWriter().use {
+                it.write("package generated;\n@apt.Annotation3\npublic class $generatedSimpleName {}")
+            }
+        }
+
+        return true
+    }
+}
+
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedAnnotationTypes("apt.Annotation3")
+class AnnotationProcessor3 : AbstractProcessor() {
+    override fun process(annotations: Set<TypeElement>, roundEnv: RoundEnvironment): Boolean {
+        val elements = roundEnv.getElementsAnnotatedWith(Annotation3::class.java)
+        for (element in elements) {
+            val generatedSimpleName = "${element.simpleName}3"
+
+            val file = processingEnv.filer.createSourceFile("generated.$generatedSimpleName")
+
+            file.openWriter().use {
+                it.write("package generated;\npublic class $generatedSimpleName {}")
+            }
+        }
+
+        return true
+    }
+}

plugins/kapt3/kapt3-cli/testData/integration-kapt4/multipass/build.txt

@@ -0,0 +1,48 @@
+# mkdir
+output/ap
+output/stubs
+output/classes
+output/javaClasses
+output/sources
+
+# kotlinc
+-language-version 2.0
+-cp %KOTLIN_STDLIB%
+-d output/ap
+ap/processors.kt
+
+# kapt
+-language-version 2.0
+-Xuse-kapt4
+-Kapt-mode=stubsAndApt
+-Kapt-stubs=output/stubs
+-Kapt-classes=output/classes
+-Kapt-sources=output/sources
+-Kapt-classpath=output/ap
+-Kapt-processors=apt.AnnotationProcessor3
+-Kapt-processors=apt.AnnotationProcessor2
+-Kapt-processors=apt.AnnotationProcessor1
+-d output/classes
+-cp output/ap:%KOTLIN_STDLIB%
+Test.kt
+
+# javac
+-cp output/ap
+-d output/javaClasses
+-proc:none
+output/sources/generated/Test1.java
+output/sources/generated/Test12.java
+output/sources/generated/Test123.java
+
+# kotlinc
+-language-version 2.0
+-d output/classes
+-cp output/ap:output/javaClasses:output/classes:%KOTLIN_STDLIB%
+Test.kt
+
+# java
+-cp output/classes:output/javaClasses:output/ap:%KOTLIN_STDLIB%
+test.TestKt
+
+# after
+Generated class: generated.Test123

plugins/kapt3/kapt3-cli/testData/integration-kapt4/separateStubAptCompilation/build.txt

@@ -0,0 +1,67 @@
+# copy
+../simple/ap
+ap
+
+# copy
+../simple/Test.kt
+Test.kt
+
+# mkdir
+output/ap
+output/stubs
+output/classes
+output/javaClasses
+output/sources
+
+# kotlinc
+-language-version 2.0
+-cp %KOTLIN_STDLIB%
+-d output/ap
+ap/Processor.kt
+
+# kapt
+-language-version 2.0
+-Xuse-kapt4
+-Kapt-stubs=output/stubs
+-Kapt-classes=output/classes
+-Kapt-sources=output/sources
+-Kapt-classpath=output/ap
+-Kapt-mode=stubs
+-d output/classes
+-cp output/ap:%KOTLIN_STDLIB%
+Test.kt
+
+# kapt
+-language-version 2.0
+-Xuse-kapt4
+-Kapt-stubs=output/stubs
+-Kapt-classes=output/classes
+-Kapt-sources=output/sources
+-Kapt-classpath=output/ap
+-Kapt-mode=apt
+-Kapt-processors=apt.SampleApt
+-d output/classes
+-cp output/ap:%KOTLIN_STDLIB%
+Test.kt
+
+# kotlinc
+-language-version 2.0
+-d output/classes
+-cp output/ap:%KOTLIN_STDLIB%
+output/sources
+Test.kt
+
+# javac
+-cp output/ap
+-d output/javaClasses
+-proc:none
+output/sources/generated/Function.java
+output/sources/generated/Property.java
+output/sources/generated/Test.java
+
+# java
+-cp output/classes:output/javaClasses:output/ap:%KOTLIN_STDLIB%
+test.TestKt
+
+# after
+Generated class: generated.Test

plugins/kapt3/kapt3-cli/testData/integration-kapt4/simple/Test.kt

@@ -0,0 +1,19 @@
+package test
+
+import apt.Anno
+import generated.Test as TestGenerated
+
+@Anno
+class Test {
+    @field:Anno
+    val property: String = ""
+
+    @Anno
+    fun function() {
+
+    }
+}
+
+fun main() {
+    println("Generated class: " + TestGenerated::class.java.name)
+}

plugins/kapt3/kapt3-cli/testData/integration-kapt4/simple/ap/META-INF/services/javax.annotation.processing.Processor

@@ -0,0 +1 @@
+apt.SampleApt

plugins/kapt3/kapt3-cli/testData/integration-kapt4/simple/ap/Processor.kt

@@ -0,0 +1,34 @@
+package apt
+
+import javax.annotation.processing.*
+import javax.lang.model.SourceVersion
+import javax.lang.model.element.TypeElement
+import javax.tools.Diagnostic.Kind.*
+import javax.tools.StandardLocation
+
+annotation class Anno
+
+class SampleApt : AbstractProcessor() {
+    override fun process(annotations: Set<TypeElement>, roundEnv: RoundEnvironment): Boolean {
+        val writeKotlinFiles = processingEnv.options["kapt.test.writeKotlinFiles"] == "true"
+
+        for (element in roundEnv.getElementsAnnotatedWith(Anno::class.java)) {
+            val generatedSimpleName = element.simpleName.toString().capitalize()
+
+            val file = when (writeKotlinFiles) {
+                true -> processingEnv.filer.createResource(StandardLocation.SOURCE_OUTPUT, "generated", "$generatedSimpleName.kt")
+                false -> processingEnv.filer.createSourceFile("generated.$generatedSimpleName")
+            }
+
+            file.openWriter().use {
+                it.write("package generated;\npublic class $generatedSimpleName {}")
+            }
+        }
+
+        return true
+    }
+
+    override fun getSupportedOptions() = setOf("kapt.test.writeKotlinFiles")
+    override fun getSupportedSourceVersion() = SourceVersion.RELEASE_8
+    override fun getSupportedAnnotationTypes() = setOf("apt.Anno")
+}

plugins/kapt3/kapt3-cli/testData/integration-kapt4/simple/build.txt

@@ -0,0 +1,49 @@
+# mkdir
+output/ap
+output/stubs
+output/classes
+output/javaClasses
+output/sources
+
+# kotlinc
+-language-version 2.0
+-cp %KOTLIN_STDLIB%
+-d output/ap
+ap/Processor.kt
+
+# copy
+ap/META-INF/services/javax.annotation.processing.Processor
+output/ap/META-INF/services/javax.annotation.processing.Processor
+
+# kapt
+-language-version 2.0
+-Xuse-kapt4
+-Kapt-mode=stubsAndApt
+-Kapt-stubs=output/stubs
+-Kapt-classes=output/classes
+-Kapt-sources=output/sources
+-Kapt-classpath=output/ap
+-d output/classes
+-cp output/ap:%KOTLIN_STDLIB%
+Test.kt
+
+# javac
+-cp output/ap
+-d output/javaClasses
+-proc:none
+output/sources/generated/Function.java
+output/sources/generated/Property.java
+output/sources/generated/Test.java
+
+# kotlinc
+-language-version 2.0
+-d output/classes
+-cp output/ap:output/javaClasses:output/classes:%KOTLIN_STDLIB%
+Test.kt
+
+# java
+-cp output/classes:output/javaClasses:output/ap:%KOTLIN_STDLIB%
+test.TestKt
+
+# after
+Generated class: generated.Test

plugins/kapt3/kapt3-cli/testData/integration-kapt4/withoutService/build.txt

@@ -0,0 +1,54 @@
+# copy
+../simple/ap
+ap
+
+# copy
+../simple/Test.kt
+Test.kt
+
+# mkdir
+output/ap
+output/stubs
+output/classes
+output/javaClasses
+output/sources
+
+# kotlinc
+-language-version 2.0
+-cp %KOTLIN_STDLIB%
+-d output/ap
+ap/Processor.kt
+
+# kapt
+-language-version 2.0
+-Xuse-kapt4
+-Kapt-stubs=output/stubs
+-Kapt-classes=output/classes
+-Kapt-sources=output/sources
+-Kapt-classpath=output/ap
+-Kapt-processors=apt.SampleApt
+-d output/classes
+-cp output/ap:%KOTLIN_STDLIB%
+Test.kt
+
+# kotlinc
+-language-version 2.0
+-d output/classes
+-cp output/ap:output/classes:%KOTLIN_STDLIB%
+Test.kt
+output/sources
+
+# javac
+-cp output/ap
+-d output/javaClasses
+-proc:none
+output/sources/generated/Function.java
+output/sources/generated/Property.java
+output/sources/generated/Test.java
+
+# java
+-cp output/classes:output/javaClasses:output/ap:%KOTLIN_STDLIB%
+test.TestKt
+
+# after
+Generated class: generated.Test

plugins/kapt3/kapt3-cli/testData/integration/multipass/Test.kt

@@ -0,0 +1,11 @@
+package test
+
+import apt.Annotation1
+import generated.Test123
+
+@Annotation1
+class Test
+
+fun main() {
+    println("Generated class: " + Test123::class.java.name)
+}

plugins/kapt3/kapt3-cli/testData/integration/multipass/ap/processors.kt

@@ -0,0 +1,68 @@
+package apt
+
+import javax.annotation.processing.*
+import javax.lang.model.SourceVersion
+import javax.lang.model.element.TypeElement
+import javax.tools.Diagnostic
+
+
+annotation class Annotation1
+annotation class Annotation2
+annotation class Annotation3
+
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedAnnotationTypes("apt.Annotation1")
+class AnnotationProcessor1 : AbstractProcessor() {
+    override fun process(annotations: Set<TypeElement>, roundEnv: RoundEnvironment): Boolean {
+        val elements = roundEnv.getElementsAnnotatedWith(Annotation1::class.java)
+        for (element in elements) {
+            val generatedSimpleName = "${element.simpleName}1"
+
+            val file = processingEnv.filer.createSourceFile("generated.$generatedSimpleName")
+
+            file.openWriter().use {
+                it.write("package generated;\n@apt.Annotation2\npublic class $generatedSimpleName {}")
+            }
+        }
+
+        return true
+    }
+}
+
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedAnnotationTypes("apt.Annotation2")
+class AnnotationProcessor2 : AbstractProcessor() {
+    override fun process(annotations: Set<TypeElement>, roundEnv: RoundEnvironment): Boolean {
+        val elements = roundEnv.getElementsAnnotatedWith(Annotation2::class.java)
+        for (element in elements) {
+            val generatedSimpleName = "${element.simpleName}2"
+
+            val file = processingEnv.filer.createSourceFile("generated.$generatedSimpleName")
+
+            file.openWriter().use {
+                it.write("package generated;\n@apt.Annotation3\npublic class $generatedSimpleName {}")
+            }
+        }
+
+        return true
+    }
+}
+
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedAnnotationTypes("apt.Annotation3")
+class AnnotationProcessor3 : AbstractProcessor() {
+    override fun process(annotations: Set<TypeElement>, roundEnv: RoundEnvironment): Boolean {
+        val elements = roundEnv.getElementsAnnotatedWith(Annotation3::class.java)
+        for (element in elements) {
+            val generatedSimpleName = "${element.simpleName}3"
+
+            val file = processingEnv.filer.createSourceFile("generated.$generatedSimpleName")
+
+            file.openWriter().use {
+                it.write("package generated;\npublic class $generatedSimpleName {}")
+            }
+        }
+
+        return true
+    }
+}

plugins/kapt3/kapt3-cli/testData/integration/multipass/build.txt

@@ -0,0 +1,38 @@
+# mkdir
+output/ap
+output/stubs
+output/classes
+output/javaClasses
+output/sources
+
+# kotlinc
+-cp %KOTLIN_STDLIB%
+-d output/ap
+ap/processors.kt
+
+# kapt
+-Kapt-stubs=output/stubs
+-Kapt-classes=output/classes
+-Kapt-sources=output/sources
+-Kapt-classpath=output/ap
+-Kapt-processors=apt.AnnotationProcessor3
+-Kapt-processors=apt.AnnotationProcessor2
+-Kapt-processors=apt.AnnotationProcessor1
+-d output/classes
+-cp output/ap:%KOTLIN_STDLIB%
+Test.kt
+
+# javac
+-cp output/ap
+-d output/javaClasses
+-proc:none
+output/sources/generated/Test1.java
+output/sources/generated/Test12.java
+output/sources/generated/Test123.java
+
+# java
+-cp output/classes:output/javaClasses:output/ap:%KOTLIN_STDLIB%
+test.TestKt
+
+# after
+Generated class: generated.Test123

plugins/kapt3/kapt3-cli/tests-gen/org/jetbrains/kotlin/kapt/cli/test/Kapt4ToolIntegrationTestGenerated.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.kapt.cli.test;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.util.KtTestUtil;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateTestsKt}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@TestMetadata("plugins/kapt3/kapt3-cli/testData/integration-kapt4")
+@TestDataPath("$PROJECT_ROOT")
+public class Kapt4ToolIntegrationTestGenerated extends AbstractKapt4ToolIntegrationTest {
+    @Test
+    public void testAllFilesPresentInIntegration_kapt4() throws Exception {
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/kapt3/kapt3-cli/testData/integration-kapt4"), Pattern.compile("^([^\\.]+)$"), null, false);
+    }
+
+    @Test
+    @TestMetadata("argfile")
+    public void testArgfile() throws Exception {
+        runTest("plugins/kapt3/kapt3-cli/testData/integration-kapt4/argfile/");
+    }
+
+    @Test
+    @TestMetadata("compileModeUnsupported")
+    public void testCompileModeUnsupported() throws Exception {
+        runTest("plugins/kapt3/kapt3-cli/testData/integration-kapt4/compileModeUnsupported/");
+    }
+
+    @Test
+    @TestMetadata("correctErrorTypesOn")
+    public void testCorrectErrorTypesOn() throws Exception {
+        runTest("plugins/kapt3/kapt3-cli/testData/integration-kapt4/correctErrorTypesOn/");
+    }
+
+    @Test
+    @TestMetadata("defaultPackage")
+    public void testDefaultPackage() throws Exception {
+        runTest("plugins/kapt3/kapt3-cli/testData/integration-kapt4/defaultPackage/");
+    }
+
+    @Test
+    @TestMetadata("kotlinFileGeneration")
+    public void testKotlinFileGeneration() throws Exception {
+        runTest("plugins/kapt3/kapt3-cli/testData/integration-kapt4/kotlinFileGeneration/");
+    }
+
+    @Test
+    @TestMetadata("kotlinFileGenerationDefaultOutput")
+    public void testKotlinFileGenerationDefaultOutput() throws Exception {
+        runTest("plugins/kapt3/kapt3-cli/testData/integration-kapt4/kotlinFileGenerationDefaultOutput/");
+    }
+
+    @Test
+    @TestMetadata("kt33800")
+    public void testKt33800() throws Exception {
+        runTest("plugins/kapt3/kapt3-cli/testData/integration-kapt4/kt33800/");
+    }
+
+    @Test
+    @TestMetadata("multipass")
+    public void testMultipass() throws Exception {
+        runTest("plugins/kapt3/kapt3-cli/testData/integration-kapt4/multipass/");
+    }
+
+    @Test
+    @TestMetadata("separateStubAptCompilation")
+    public void testSeparateStubAptCompilation() throws Exception {
+        runTest("plugins/kapt3/kapt3-cli/testData/integration-kapt4/separateStubAptCompilation/");
+    }
+
+    @Test
+    @TestMetadata("simple")
+    public void testSimple() throws Exception {
+        runTest("plugins/kapt3/kapt3-cli/testData/integration-kapt4/simple/");
+    }
+
+    @Test
+    @TestMetadata("withoutService")
+    public void testWithoutService() throws Exception {
+        runTest("plugins/kapt3/kapt3-cli/testData/integration-kapt4/withoutService/");
+    }
+}

plugins/kapt3/kapt3-cli/tests-gen/org/jetbrains/kotlin/kapt/cli/test/KaptToolIntegrationTestGenerated.java

@@ -78,6 +78,12 @@ public class KaptToolIntegrationTestGenerated extends AbstractKaptToolIntegratio
         runTest("plugins/kapt3/kapt3-cli/testData/integration/kt33800/");
     }
 
+    @Test
+    @TestMetadata("multipass")
+    public void testMultipass() throws Exception {
+        runTest("plugins/kapt3/kapt3-cli/testData/integration/multipass/");
+    }
+
     @Test
     @TestMetadata("separateStubAptCompilation")
     public void testSeparateStubAptCompilation() throws Exception {