From ca86b7ff7d9be05fe53e640ed2e58d10f59d4ed2 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Wed, 7 Jul 2021 17:31:22 +0300 Subject: [PATCH] [Build] Make getToolchainCompilerFor private and fix LibrariesCommon --- buildSrc/src/main/kotlin/JvmToolchain.kt | 2 +- buildSrc/src/main/kotlin/LibrariesCommon.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/JvmToolchain.kt b/buildSrc/src/main/kotlin/JvmToolchain.kt index 625713c7083..94bebc6d99a 100644 --- a/buildSrc/src/main/kotlin/JvmToolchain.kt +++ b/buildSrc/src/main/kotlin/JvmToolchain.kt @@ -151,7 +151,7 @@ fun Project.updateJvmTarget( } } -fun Project.getToolchainCompilerFor( +private fun Project.getToolchainCompilerFor( jdkVersion: JdkMajorVersion ): Provider { val service = project.extensions.getByType() diff --git a/buildSrc/src/main/kotlin/LibrariesCommon.kt b/buildSrc/src/main/kotlin/LibrariesCommon.kt index 815bd0ca9c9..17645e79e0d 100644 --- a/buildSrc/src/main/kotlin/LibrariesCommon.kt +++ b/buildSrc/src/main/kotlin/LibrariesCommon.kt @@ -26,9 +26,9 @@ fun Project.configureJava9Compilation( tasks.named("compileJava9Java", JavaCompile::class.java) { dependsOn(moduleOutputs) - javaCompiler.set(getToolchainCompilerFor(JdkMajorVersion.JDK_9)) targetCompatibility = JavaVersion.VERSION_1_9.toString() sourceCompatibility = JavaVersion.VERSION_1_9.toString() + configureTaskToolchain(JdkMajorVersion.JDK_9) // module-info.java should be in java9 source set by convention val java9SourceSet = sourceSets["java9"].java