From ff499a63614f3d47d9757511861a80fc3e90f82b Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 21 Mar 2023 06:38:30 +0100 Subject: [PATCH] [stdlib-mpp] Support java9 source set compilations in MPP library projects #KT-56106 --- .../buildsrc-compat/src/main/kotlin/LibrariesCommon.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/LibrariesCommon.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/LibrariesCommon.kt index e0e9f1f0ae1..5815cf0d52f 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/LibrariesCommon.kt +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/LibrariesCommon.kt @@ -7,6 +7,7 @@ import org.gradle.api.JavaVersion import org.gradle.api.Project +import org.gradle.api.artifacts.Configuration import org.gradle.api.file.FileCollection import org.gradle.api.java.archives.Manifest import org.gradle.api.plugins.BasePluginExtension @@ -20,11 +21,14 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile @JvmOverloads fun Project.configureJava9Compilation( moduleName: String, - moduleOutputs: Collection = setOf(sourceSets["main"].output) + moduleOutputs: Collection = setOf(sourceSets["main"].output), + compileClasspathConfiguration: Configuration = configurations["compileClasspath"], ) { - configurations["java9CompileClasspath"].extendsFrom(configurations["compileClasspath"]) + configurations["java9CompileClasspath"].extendsFrom(compileClasspathConfiguration) - tasks.named("compileJava9Kotlin", KotlinCompile::class.java) { + tasks.withType(KotlinCompile::class.java).matching { + it.name == "compileJava9Kotlin" || it.name == "compileJava9KotlinJvm" + }.configureEach { configureTaskToolchain(JdkMajorVersion.JDK_9_0) @Suppress("DEPRECATION") kotlinOptions.jvmTarget = JdkMajorVersion.JDK_9_0.targetName