From 5199981d9603941600c1715cca441f10030d60ef Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Tue, 18 Jan 2022 16:56:25 +0300 Subject: [PATCH] [Gradle] Check JVM targets only if mixed Java/Kotlin sources are present #KT-48408 Verification Pending --- .../main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index ff4110a4382..64744eaa988 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -739,7 +739,7 @@ abstract class KotlinCompile @Inject constructor( ) { sourceRoots as SourceRoots.ForJvm - validateKotlinAndJavaHasSameTargetCompatibility(args) + validateKotlinAndJavaHasSameTargetCompatibility(args, sourceRoots) val messageCollector = GradlePrintingMessageCollector(logger, args.allWarningsAsErrors) val outputItemCollector = OutputItemsCollectorImpl() @@ -781,8 +781,9 @@ abstract class KotlinCompile @Inject constructor( ) } - private fun validateKotlinAndJavaHasSameTargetCompatibility(args: K2JVMCompilerArguments) { - if (!associatedJavaCompileTaskSources.isEmpty) { + private fun validateKotlinAndJavaHasSameTargetCompatibility(args: K2JVMCompilerArguments, sourceRoots: SourceRoots.ForJvm) { + val mixedSourcesArePresent = !associatedJavaCompileTaskSources.isEmpty && !sourceRoots.kotlinSourceFiles.isEmpty + if (mixedSourcesArePresent) { associatedJavaCompileTaskTargetCompatibility.orNull?.let { targetCompatibility -> val normalizedJavaTarget = when (targetCompatibility) { "6" -> "1.6"