diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt index dd84915a294..ca3e1b474d8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt @@ -80,7 +80,6 @@ internal open class GradleCompilerRunner( fun runJvmCompilerAsync( sourcesToCompile: List, commonSources: List, - javaSourceRoots: Iterable, javaPackagePrefix: String?, args: K2JVMCompilerArguments, environment: GradleCompilerEnvironment, @@ -89,7 +88,6 @@ internal open class GradleCompilerRunner( ): WorkQueue? { args.freeArgs += sourcesToCompile.map { it.absolutePath } args.commonSources = commonSources.map { it.absolutePath }.toTypedArray() - args.javaSourceRoots = javaSourceRoots.map { it.absolutePath }.toTypedArray() args.javaPackagePrefix = javaPackagePrefix if (args.jdkHome == null && !args.noJdk) args.jdkHome = jdkHome.absolutePath loggerProvider.kotlinInfo("Kotlin compilation 'jdkHome' argument: ${args.jdkHome}") diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt index fda91e1fd51..ae0e1b68dcb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptWithKotlincTask.kt @@ -122,9 +122,8 @@ abstract class KaptWithKotlincTask @Inject constructor( metrics.get(), ) compilerRunner.runJvmCompilerAsync( - sourcesToCompile = emptyList(), + sourcesToCompile = source.files.toList(), commonSources = emptyList(), - javaSourceRoots = source.files, javaPackagePrefix = javaPackagePrefix.orNull, args = args, environment = environment, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index 40b7564c189..bf0362fa79f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -723,9 +723,8 @@ abstract class KotlinCompile @Inject constructor( logger.info("Script source files: ${scriptSources.joinToString()}") logger.info("Script file extensions: ${scriptExtensions.get().joinToString()}") compilerRunner.runJvmCompilerAsync( - (kotlinSources + scriptSources).toList(), + (kotlinSources + scriptSources + javaSources.files).toList(), commonSourceSet.toList(), - javaSources.files, // we need here only directories where Java sources are located javaPackagePrefix, args, environment,