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

Kapt: annotation-processing is not dependent on 'cli' module anymore

Browse Source 
(cherry picked from commit 4591f13)
This commit is contained in:
Yan Zhulanow
2016-08-02 22:43:28 +03:00
committed by Yan Zhulanow
parent f61367df28
commit 23b343bb03
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/annotation-processing/annotation-processing.iml
-1
View File
@@ -14,6 +14,5 @@
<orderEntry type="module" module-name="light-classes" /> <orderEntry type="module" module-name="light-classes" />
<orderEntry type="module" module-name="util" /> <orderEntry type="module" module-name="util" />
<orderEntry type="library" name="kotlin-runtime" level="project" /> <orderEntry type="library" name="kotlin-runtime" level="project" />
<orderEntry type="module" module-name="cli" />
</component> </component>
</module> </module>
plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/AnnotationProcessingPlugin.kt
+2 -2
View File
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.annotation.processing
import com.intellij.mock.MockProject import com.intellij.mock.MockProject
import org.jetbrains.kotlin.annotation.AnnotationProcessingExtension import org.jetbrains.kotlin.annotation.AnnotationProcessingExtension
import org.jetbrains.kotlin.cli.jvm.config.JavaSourceRoot
import org.jetbrains.kotlin.compiler.plugin.CliOption import org.jetbrains.kotlin.compiler.plugin.CliOption
import org.jetbrains.kotlin.compiler.plugin.CliOptionProcessingException import org.jetbrains.kotlin.compiler.plugin.CliOptionProcessingException
import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
@@ -83,7 +82,8 @@ class AnnotationProcessingComponentRegistrar : ComponentRegistrar {
generatedOutputDirFile.mkdirs() generatedOutputDirFile.mkdirs()
val javaRoots = configuration[JVMConfigurationKeys.CONTENT_ROOTS] val javaRoots = configuration[JVMConfigurationKeys.CONTENT_ROOTS]
?.filterIsInstance<JavaSourceRoot>()?.map { it.file } ?: emptyList() ?.filter { it.javaClass.canonicalName == "org.jetbrains.kotlin.cli.jvm.config.JavaSourceRoot" }
?.map { it.javaClass.getMethod("getFile")(it) as File } ?: emptyList()
val classesOutputDir = File(configuration.get(AnnotationProcessingConfigurationKeys.CLASS_FILES_OUTPUT_DIR) val classesOutputDir = File(configuration.get(AnnotationProcessingConfigurationKeys.CLASS_FILES_OUTPUT_DIR)
?: configuration[JVMConfigurationKeys.MODULES]!!.first().getOutputDirectory()) ?: configuration[JVMConfigurationKeys.MODULES]!!.first().getOutputDirectory())