From 05fa8b745176e90b1b0960149eef2f50f5fd3062 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 29 Jun 2018 19:03:54 +0300 Subject: [PATCH] Add SDK jars to compile classpath for Kapt Workers task --- .../kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt index 52c734aef69..f1a414c8af4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithoutKotlincTask.kt @@ -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.findKotlinStdlibClasspath import org.jetbrains.kotlin.gradle.tasks.findToolsJar +import org.jetbrains.kotlin.utils.PathUtil import java.io.File import java.io.Serializable import java.net.URLClassLoader @@ -123,9 +124,12 @@ private class KaptExecution @Inject constructor( } private fun createKaptPaths(classLoader: ClassLoader) = with(paths) { + val fullClasspath = ArrayList() + fullClasspath.addAll(PathUtil.getJdkClassesRootsFromCurrentJre()) + fullClasspath.addAll(compileClasspath) Class.forName("org.jetbrains.kotlin.kapt3.base.KaptPaths", true, classLoader).constructors.single().newInstance( projectBaseDir, - compileClasspath, + fullClasspath, annotationProcessingClasspath, javaSourceRoots, sourcesOutputDir,