azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-64385 Enable K2 KAPT by default

Browse Source 
Also adds support for front-end compiler plugins in Kapt
This commit is contained in:
strangepleasures
2024-01-15 10:22:32 +00:00
committed by Space Team
parent 8156c91c47
commit 7e9d6e601d
58 changed files with 218 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-cli/src/KaptCli.kt
+1 -2
View File
@@ -107,7 +107,6 @@ private fun transformKaptToolArgs(args: List<String>, messageCollector: MessageC
}
KaptCliOption.APT_MODE_OPTION -> aptModePassed = true
KaptCliOption.VERBOSE_MODE_OPTION -> kaptVerboseModePassed = true
KaptCliOption.USE_K2 -> transformed.add("-Xuse-kapt4")
else -> {}
}
@@ -115,7 +114,7 @@ private fun transformKaptToolArgs(args: List<String>, messageCollector: MessageC
}
if (!aptModePassed) {
val isK2 = "-Xuse-kapt4" in transformed && ("-Xuse-k2" in transformed ||
val isK2 = ("-Xuse-k2" in transformed ||
transformed.any { it.startsWith("-language-version=2") } ||
transformed.lastIndexOf("-language-version").takeIf { it >= 0 }
?.let { transformed.getOrNull(it + 1)?.startsWith('2') } == true)
plugins/kapt3/kapt3-cli/src/KaptCliOption.kt
-7
View File
@@ -214,13 +214,6 @@ enum class KaptCliOption(
"Keep KDoc comments in stubs"
),
USE_K2(
"useK2",
"true | false",
"Use K2",
cliToolOption = CliToolOption("-Kapt-use-k2", FLAG)
),
DETECT_MEMORY_LEAKS_OPTION("detectMemoryLeaks", "true | false", "Detect memory leaks in annotation processors"),
INCLUDE_COMPILE_CLASSPATH(
"includeCompileClasspath",
plugins/kapt3/kapt3-cli/testData/integration-kapt4/argfile/kaptArgs.txt
Vendored
-1
View File
@@ -1,5 +1,4 @@
-language-version 2.0
-Xuse-kapt4
-Kapt-mode=stubsAndApt
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
plugins/kapt3/kapt3-cli/testData/integration-kapt4/compileModeUnsupported/build.txt
Vendored
-1
View File
@@ -1,7 +1,6 @@
# kapt
-language-version 2.0
-Xsuppress-version-warnings
-Xuse-kapt4
-Kapt-mode=compile
../simple/Test.kt
plugins/kapt3/kapt3-cli/testData/integration-kapt4/correctErrorTypesOn/build.txt
Vendored
-1
View File
@@ -12,7 +12,6 @@ ap/Processor.kt
# kapt
-language-version 2.0
-Xuse-kapt4
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
plugins/kapt3/kapt3-cli/testData/integration-kapt4/defaultPackage/build.txt
Vendored
-1
View File
@@ -17,7 +17,6 @@ ap/Processor.kt
# kapt
-language-version 2.0
-Xuse-kapt4
-Kapt-mode=stubsAndApt
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
plugins/kapt3/kapt3-cli/testData/integration-kapt4/kaptUseK2Flag/build.txt
Vendored
-1
View File
@@ -1,7 +1,6 @@
# kapt
-language-version 2.0
-Xsuppress-version-warnings
-Kapt-use-k2=true
-Kapt-mode=compile
../simple/Test.kt
plugins/kapt3/kapt3-cli/testData/integration-kapt4/kotlinFileGeneration/build.txt
Vendored
-1
View File
@@ -17,7 +17,6 @@ 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
plugins/kapt3/kapt3-cli/testData/integration-kapt4/kotlinFileGenerationDefaultOutput/build.txt
Vendored
-2
View File
@@ -20,7 +20,6 @@ ap/Processor.kt
# kapt
-language-version 2.0
-Xuse-kapt4
-Kapt-mode=stubsAndApt
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
@@ -34,7 +33,6 @@ Test.kt
# kotlinc
-language-version 2.0
-Xuse-kapt4
-d output/classes
-cp output/classes:output/ap:%KOTLIN_STDLIB%
Test.kt
plugins/kapt3/kapt3-cli/testData/integration-kapt4/kt33800/build.txt
Vendored
-1
View File
@@ -21,7 +21,6 @@ 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
plugins/kapt3/kapt3-cli/testData/integration-kapt4/multipass/build.txt
Vendored
-1
View File
@@ -13,7 +13,6 @@ ap/processors.kt
# kapt
-language-version 2.0
-Xuse-kapt4
-Kapt-mode=stubsAndApt
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
plugins/kapt3/kapt3-cli/testData/integration-kapt4/separateStubAptCompilation/build.txt
Vendored
-2
View File
@@ -21,7 +21,6 @@ ap/Processor.kt
# kapt
-language-version 2.0
-Xuse-kapt4
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
@@ -33,7 +32,6 @@ Test.kt
# kapt
-language-version 2.0
-Xuse-kapt4
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
plugins/kapt3/kapt3-cli/testData/integration-kapt4/simple/build.txt
Vendored
-1
View File
@@ -17,7 +17,6 @@ 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
plugins/kapt3/kapt3-cli/testData/integration-kapt4/withoutService/build.txt
Vendored
-1
View File
@@ -21,7 +21,6 @@ ap/Processor.kt
# kapt
-language-version 2.0
-Xuse-kapt4
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
plugins/kapt3/kapt3-cli/testData/integration/argfile/apKotlincArgs.txt
Vendored
+1
View File
@@ -1,3 +1,4 @@
-language-version 1.9
-cp %KOTLIN_STDLIB%
-d output/ap
ap/Processor.kt
plugins/kapt3/kapt3-cli/testData/integration/argfile/kaptArgs.txt
Vendored
+1
View File
@@ -1,3 +1,4 @@
-language-version 1.9
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
plugins/kapt3/kapt3-cli/testData/integration/correctErrorTypesOff/build.txt
Vendored
+2 -1
View File
@@ -14,11 +14,13 @@ output/javaClasses
output/sources
# kotlinc
-language-version 1.9
-cp %KOTLIN_STDLIB%
-d output/ap
ap/Processor.kt
# kapt
-language-version 1.9
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
@@ -41,7 +43,6 @@ test.Test
# after
Return code: 1
warning: kapt currently doesn't support language version 2.0+. Falling back to 1.9.
error: error: NonExistentClass type occurred
Test.kt:4:8: error: unresolved reference: generated
import generated.Property
plugins/kapt3/kapt3-cli/testData/integration/correctErrorTypesOn/build.txt
Vendored
+2
View File
@@ -6,11 +6,13 @@ output/javaClasses
output/sources
# kotlinc
-language-version 1.9
-cp %KOTLIN_STDLIB%
-d output/ap
ap/Processor.kt
# kapt
-language-version 1.9
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
plugins/kapt3/kapt3-cli/testData/integration/defaultPackage/build.txt
Vendored
+2
View File
@@ -10,11 +10,13 @@ output/javaClasses
output/sources
# kotlinc
-language-version 1.9
-cp %KOTLIN_STDLIB%
-d output/ap
ap/Processor.kt
# kapt
-language-version 1.9
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
plugins/kapt3/kapt3-cli/testData/integration/fallback/Test.kt
Vendored
-19
View File
@@ -1,19 +0,0 @@
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/fallback/ap/META-INF/services/javax.annotation.processing.Processor
Vendored
-1
View File
@@ -1 +0,0 @@
apt.SampleApt
plugins/kapt3/kapt3-cli/testData/integration/fallback/ap/Processor.kt
Vendored
-34
View File
@@ -1,34 +0,0 @@
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/fallback/build.txt
Vendored
-69
View File
@@ -1,69 +0,0 @@
# mkdir
output/stubs
output/classes
output/javaClasses
output/sources
output/stubsAlt
output/classesAlt
output/javaClassesAlt
output/sourcesAlt
# kotlinc
-language-version 2.0
-cp %KOTLIN_STDLIB%
-d output/ap.jar
ap/Processor.kt
# copy
ap/META-INF/services/javax.annotation.processing.Processor
output/ap/META-INF/services/javax.annotation.processing.Processor
# kapt
-Xuse-k2
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
-Kapt-classpath=output/ap
-d output/classes
-cp output/ap.jar:%KOTLIN_STDLIB%
Test.kt
# javac
-cp output/ap.jar
-d output/javaClasses
-proc:none
output/sources/generated/Function.java
output/sources/generated/Property.java
output/sources/generated/Test.java
# kapt
-language-version 2.0
-Kapt-stubs=output/stubsAlt
-Kapt-classes=output/classesAlt
-Kapt-sources=output/sourcesAlt
-Kapt-classpath=output/ap
-d output/classesAlt
-cp output/ap.jar:%KOTLIN_STDLIB%
Test.kt
# output
warning: kapt currently doesn't support language version 2.0+. Falling back to 1.9.
# java
-cp output/classes:output/javaClasses:output/ap.jar:%KOTLIN_STDLIB%
test.TestKt
# javac
-cp output/ap.jar
-d output/javaClassesAlt
-proc:none
output/sourcesAlt/generated/Function.java
output/sourcesAlt/generated/Property.java
output/sourcesAlt/generated/Test.java
# java
-cp output/classes:output/javaClassesAlt:output/ap.jar:%KOTLIN_STDLIB%
test.TestKt
# after
Generated class: generated.Test
plugins/kapt3/kapt3-cli/testData/integration/kotlinFileGeneration/build.txt
Vendored
+2
View File
@@ -6,6 +6,7 @@ output/sources
output/kotlin-sources
# kotlinc
-language-version 1.9
-cp %KOTLIN_STDLIB%
-d output/ap
ap/Processor.kt
@@ -15,6 +16,7 @@ ap/META-INF/services/javax.annotation.processing.Processor
output/ap/META-INF/services/javax.annotation.processing.Processor
# kapt
-language-version 1.9
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
plugins/kapt3/kapt3-cli/testData/integration/kotlinFileGenerationCorrectErrorTypes/build.txt
Vendored
+2
View File
@@ -10,6 +10,7 @@ output/sources
output/kotlin-sources
# kotlinc
-language-version 1.9
-cp %KOTLIN_STDLIB%
-d output/ap
ap/Processor.kt
@@ -19,6 +20,7 @@ ap/Processor.kt
output/ap/META-INF/services/javax.annotation.processing.Processor
# kapt
-language-version 1.9
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
plugins/kapt3/kapt3-cli/testData/integration/kotlinFileGenerationDefaultOutput/build.txt
Vendored
+2
View File
@@ -13,11 +13,13 @@ output/classes
output/sources
# kotlinc
-language-version 1.9
-cp %KOTLIN_STDLIB%
-d output/ap
ap/Processor.kt
# kapt
-language-version 1.9
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
plugins/kapt3/kapt3-cli/testData/integration/kt33800/build.txt
Vendored
+2
View File
@@ -10,6 +10,7 @@ output/javaClasses
output/sources
# kotlinc
-language-version 1.9
-cp %KOTLIN_STDLIB%
-d output/ap
ap/Processor.kt
@@ -19,6 +20,7 @@ ap/Processor.kt
output/ap/META-INF/services/javax.annotation.processing.Processor
# kapt
-language-version 1.9
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
plugins/kapt3/kapt3-cli/testData/integration/multipass/build.txt
Vendored
+2
View File
@@ -6,11 +6,13 @@ output/javaClasses
output/sources
# kotlinc
-language-version 1.9
-cp %KOTLIN_STDLIB%
-d output/ap
ap/processors.kt
# kapt
-language-version 1.9
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
plugins/kapt3/kapt3-cli/testData/integration/separateStubAptCompilation/build.txt
Vendored
+4
View File
@@ -14,11 +14,13 @@ output/javaClasses
output/sources
# kotlinc
-language-version 1.9
-cp %KOTLIN_STDLIB%
-d output/ap
ap/Processor.kt
# kapt
-language-version 1.9
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
@@ -29,6 +31,7 @@ ap/Processor.kt
Test.kt
# kapt
-language-version 1.9
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
@@ -40,6 +43,7 @@ Test.kt
Test.kt
# kotlinc
-language-version 1.9
-d output/classes
-cp output/ap:%KOTLIN_STDLIB%
output/sources
plugins/kapt3/kapt3-cli/testData/integration/simple/build.txt
Vendored
+2
View File
@@ -6,6 +6,7 @@ output/javaClasses
output/sources
# kotlinc
-language-version 1.9
-cp %KOTLIN_STDLIB%
-d output/ap
ap/Processor.kt
@@ -15,6 +16,7 @@ ap/META-INF/services/javax.annotation.processing.Processor
output/ap/META-INF/services/javax.annotation.processing.Processor
# kapt
-language-version 1.9
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
plugins/kapt3/kapt3-cli/testData/integration/withoutService/build.txt
Vendored
+2
View File
@@ -14,11 +14,13 @@ output/javaClasses
output/sources
# kotlinc
-language-version 1.9
-cp %KOTLIN_STDLIB%
-d output/ap
ap/Processor.kt
# kapt
-language-version 1.9
-Kapt-stubs=output/stubs
-Kapt-classes=output/classes
-Kapt-sources=output/sources
plugins/kapt3/kapt3-cli/tests-gen/org/jetbrains/kotlin/kapt/cli/test/KaptToolIntegrationTestGenerated.java
Generated
-6
View File
@@ -48,12 +48,6 @@ public class KaptToolIntegrationTestGenerated extends AbstractKaptToolIntegratio
runTest("plugins/kapt3/kapt3-cli/testData/integration/defaultPackage/");
}
@Test
@TestMetadata("fallback")
public void testFallback() throws Exception {
runTest("plugins/kapt3/kapt3-cli/testData/integration/fallback/");
}
@Test
@TestMetadata("kotlinFileGeneration")
public void testKotlinFileGeneration() throws Exception {
plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt
-1
View File
@@ -123,7 +123,6 @@ class Kapt3CommandLineProcessor : CommandLineProcessor {
STRICT_MODE_OPTION -> setFlag(KaptFlag.STRICT, value)
STRIP_METADATA_OPTION -> setFlag(KaptFlag.STRIP_METADATA, value)
KEEP_KDOC_COMMENTS_IN_STUBS -> setFlag(KaptFlag.KEEP_KDOC_COMMENTS_IN_STUBS, value)
USE_K2 -> {}
SHOW_PROCESSOR_STATS -> setFlag(KaptFlag.SHOW_PROCESSOR_STATS, value)
DUMP_PROCESSOR_STATS -> processorsStatsReportFile = File(value)