diff --git a/buildSrc/src/main/kotlin/LibrariesCommon.kt b/buildSrc/src/main/kotlin/LibrariesCommon.kt index d3a97c61b5f..011f629af9a 100644 --- a/buildSrc/src/main/kotlin/LibrariesCommon.kt +++ b/buildSrc/src/main/kotlin/LibrariesCommon.kt @@ -11,6 +11,7 @@ import org.gradle.api.file.FileCollection import org.gradle.api.tasks.compile.JavaCompile import org.gradle.kotlin.dsl.get import org.gradle.process.CommandLineArgumentProvider +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @JvmOverloads fun Project.configureJava9Compilation( @@ -19,6 +20,11 @@ fun Project.configureJava9Compilation( ) { configurations["java9CompileClasspath"].extendsFrom(configurations["compileClasspath"]) + tasks.named("compileJava9Kotlin", KotlinCompile::class.java) { + configureTaskToolchain(JdkMajorVersion.JDK_9) + kotlinOptions.jvmTarget = JdkMajorVersion.JDK_9.targetName + } + tasks.named("compileJava9Java", JavaCompile::class.java) { dependsOn(moduleOutputs)