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

Kapt3: Minor: Annotation processor classes may be initialized only once, so SIMPLE_PROCESSOR became a factory method

Browse Source
This commit is contained in:
Yan Zhulanow
2016-10-29 07:05:55 +03:00
committed by Yan Zhulanow
parent 03244123c9
commit e61a7c7f2c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt
+1 -1
View File
@@ -97,7 +97,7 @@ abstract class AbstractKotlinKaptRunnerTest : AbstractKotlinKapt3Test() {
val compilationUnits = convert(kaptRunner, typeMapper, classBuilderFactory.compiledClasses, classBuilderFactory.origins) val compilationUnits = convert(kaptRunner, typeMapper, classBuilderFactory.compiledClasses, classBuilderFactory.origins)
val sourceOutputDir = Files.createTempDirectory("kaptRunner").toFile() val sourceOutputDir = Files.createTempDirectory("kaptRunner").toFile()
try { try {
kaptRunner.doAnnotationProcessing(emptyList(), listOf(KaptRunnerTest.SIMPLE_PROCESSOR), kaptRunner.doAnnotationProcessing(emptyList(), listOf(KaptRunnerTest.simpleProcessor()),
classpath = listOf(), sourcesOutputDir = sourceOutputDir, classesOutputDir = sourceOutputDir, classpath = listOf(), sourcesOutputDir = sourceOutputDir, classesOutputDir = sourceOutputDir,
additionalSources = compilationUnits) additionalSources = compilationUnits)
plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/KaptRunnerTest.kt
+3 -3
View File
@@ -47,7 +47,7 @@ class KaptRunnerTest {
companion object { companion object {
private val TEST_DATA_DIR = File("plugins/kapt3/testData/runner") private val TEST_DATA_DIR = File("plugins/kapt3/testData/runner")
val SIMPLE_PROCESSOR = object : AbstractProcessor() { fun simpleProcessor() = object : AbstractProcessor() {
override fun process(annotations: Set<TypeElement>, roundEnv: RoundEnvironment): Boolean { override fun process(annotations: Set<TypeElement>, roundEnv: RoundEnvironment): Boolean {
for (annotation in annotations) { for (annotation in annotations) {
val annotationName = annotation.simpleName.toString() val annotationName = annotation.simpleName.toString()
@@ -78,7 +78,7 @@ class KaptRunnerTest {
try { try {
KaptRunner(Logger(isVerbose = true)).doAnnotationProcessing( KaptRunner(Logger(isVerbose = true)).doAnnotationProcessing(
listOf(File(TEST_DATA_DIR, "Simple.java")), listOf(File(TEST_DATA_DIR, "Simple.java")),
listOf(SIMPLE_PROCESSOR), listOf(simpleProcessor()),
emptyList(), // classpath emptyList(), // classpath
sourceOutputDir, sourceOutputDir,
sourceOutputDir) sourceOutputDir)
@@ -119,7 +119,7 @@ class KaptRunnerTest {
try { try {
KaptRunner(Logger(isVerbose = true)).doAnnotationProcessing( KaptRunner(Logger(isVerbose = true)).doAnnotationProcessing(
listOf(File(TEST_DATA_DIR, "ParseError.java")), listOf(File(TEST_DATA_DIR, "ParseError.java")),
listOf(SIMPLE_PROCESSOR), listOf(simpleProcessor()),
emptyList(), emptyList(),
TEST_DATA_DIR, TEST_DATA_DIR,
TEST_DATA_DIR) TEST_DATA_DIR)