From 23b343bb032d0fbb9d12f877eb43afdb7c583fcd Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Tue, 2 Aug 2016 22:43:28 +0300
Subject: [PATCH] Kapt: annotation-processing is not dependent on 'cli' module
 anymore (cherry picked from commit 4591f13)

---
 plugins/annotation-processing/annotation-processing.iml       | 1 -
 .../annotation/processing/AnnotationProcessingPlugin.kt       | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/annotation-processing/annotation-processing.iml b/plugins/annotation-processing/annotation-processing.iml
index e6933c9078a..81a78835658 100644
--- a/plugins/annotation-processing/annotation-processing.iml
+++ b/plugins/annotation-processing/annotation-processing.iml
@@ -14,6 +14,5 @@
     <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="cli" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/AnnotationProcessingPlugin.kt b/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/AnnotationProcessingPlugin.kt
index e848826114d..4016615d7b9 100644
--- a/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/AnnotationProcessingPlugin.kt
+++ b/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/AnnotationProcessingPlugin.kt
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.annotation.processing
 
 import com.intellij.mock.MockProject
 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.CliOptionProcessingException
 import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
@@ -83,7 +82,8 @@ class AnnotationProcessingComponentRegistrar : ComponentRegistrar {
         generatedOutputDirFile.mkdirs()
         
         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) 
                                ?: configuration[JVMConfigurationKeys.MODULES]!!.first().getOutputDirectory())