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

Add SDK jars to compile classpath for Kapt Workers task

Browse Source
This commit is contained in:
Alexey Tsvetkov
2018-06-29 19:03:54 +03:00
parent bfc608de29
commit 05fa8b7451
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt
+5 -1
View File
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.gradle.internal.Kapt3KotlinGradleSubplugin.Companion
import org.jetbrains.kotlin.gradle.tasks.clearOutputDirectories import org.jetbrains.kotlin.gradle.tasks.clearOutputDirectories
import org.jetbrains.kotlin.gradle.tasks.findKotlinStdlibClasspath import org.jetbrains.kotlin.gradle.tasks.findKotlinStdlibClasspath
import org.jetbrains.kotlin.gradle.tasks.findToolsJar import org.jetbrains.kotlin.gradle.tasks.findToolsJar
import org.jetbrains.kotlin.utils.PathUtil
import java.io.File import java.io.File
import java.io.Serializable import java.io.Serializable
import java.net.URLClassLoader import java.net.URLClassLoader
@@ -123,9 +124,12 @@ private class KaptExecution @Inject constructor(
} }
private fun createKaptPaths(classLoader: ClassLoader) = with(paths) { private fun createKaptPaths(classLoader: ClassLoader) = with(paths) {
val fullClasspath = ArrayList<File>()
fullClasspath.addAll(PathUtil.getJdkClassesRootsFromCurrentJre())
fullClasspath.addAll(compileClasspath)
Class.forName("org.jetbrains.kotlin.kapt3.base.KaptPaths", true, classLoader).constructors.single().newInstance( Class.forName("org.jetbrains.kotlin.kapt3.base.KaptPaths", true, classLoader).constructors.single().newInstance(
projectBaseDir, projectBaseDir,
compileClasspath, fullClasspath,
annotationProcessingClasspath, annotationProcessingClasspath,
javaSourceRoots, javaSourceRoots,
sourcesOutputDir, sourcesOutputDir,