From 87f3b574aabef69c2c06ab69a6cc4c595ed84339 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Mon, 22 May 2017 18:34:05 +0300
Subject: [PATCH] Kapt: Filter the content root items for the compile classpath
 properly

---
 plugins/kapt3/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt b/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt
index 3216883fa15..a5ac3ab124d 100644
--- a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt
+++ b/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.kapt3
 
 import com.intellij.mock.MockProject
-import com.intellij.openapi.extensions.Extensions
 import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.analyzer.AnalysisResult
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
@@ -27,7 +26,7 @@ import org.jetbrains.kotlin.kapt3.Kapt3ConfigurationKeys.ANNOTATION_PROCESSOR_CL
 import org.jetbrains.kotlin.kapt3.Kapt3ConfigurationKeys.APT_OPTIONS
 import org.jetbrains.kotlin.kapt3.Kapt3ConfigurationKeys.JAVAC_CLI_OPTIONS
 import org.jetbrains.kotlin.cli.jvm.config.JavaSourceRoot
-import org.jetbrains.kotlin.cli.jvm.config.JvmContentRoot
+import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot
 import org.jetbrains.kotlin.compiler.plugin.CliOption
 import org.jetbrains.kotlin.compiler.plugin.CliOptionProcessingException
 import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
@@ -237,7 +236,7 @@ class Kapt3ComponentRegistrar : ComponentRegistrar {
 
         val contentRoots = configuration[JVMConfigurationKeys.CONTENT_ROOTS] ?: emptyList()
 
-        val compileClasspath = contentRoots.filterIsInstance<JvmContentRoot>().map { it.file }
+        val compileClasspath = contentRoots.filterIsInstance<JvmClasspathRoot>().map { it.file }
 
         val javaSourceRoots = contentRoots.filterIsInstance<JavaSourceRoot>().map { it.file }