From 1844aab35db20e52205c59812a38807bc203c73c Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Tue, 4 Apr 2023 21:56:38 +0200 Subject: [PATCH] [Gradle] KotlinCompile: Move allowNoSourceFiles = true to KotlinJvmCompilerOptionsHelper KTIJ-24976 --- .../kotlin/generators/arguments/GenerateGradleOptions.kt | 1 + .../kotlin/gradle/dsl/KotlinJvmCompilerOptionsHelper.kt | 2 ++ .../kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompile.kt | 2 -- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt index 047d52098eb..e1fef8554cc 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt @@ -760,6 +760,7 @@ private fun Printer.addAdditionalJvmArgs(implType: FqName) { println("// Arguments with always default values when used from build tools") println("args.noStdlib = true") println("args.noReflect = true") + println("args.allowNoSourceFiles = true") } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptionsHelper.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptionsHelper.kt index c28ac8aceb0..c4441195662 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptionsHelper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmCompilerOptionsHelper.kt @@ -20,6 +20,7 @@ internal object KotlinJvmCompilerOptionsHelper { // Arguments with always default values when used from build tools args.noStdlib = true args.noReflect = true + args.allowNoSourceFiles = true } internal fun fillDefaultValues( @@ -34,6 +35,7 @@ internal object KotlinJvmCompilerOptionsHelper { // Arguments with always default values when used from build tools args.noStdlib = true args.noReflect = true + args.allowNoSourceFiles = true } internal fun syncOptionsAsConvention( diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompile.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompile.kt index 4c4674674da..29862a7b4db 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompile.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompile.kt @@ -221,8 +221,6 @@ abstract class KotlinCompile @Inject constructor( context: KotlinCompilerArgumentsProducer.CreateCompilerArgumentsContext ): K2JVMCompilerArguments = context.create { primitive { args -> - args.allowNoSourceFiles = true - args.multiPlatform = multiPlatformEnabled.get() args.pluginOptions = (pluginOptions.toSingleCompilerPluginOptions() + kotlinPluginData?.orNull?.options)