[Build] Make getToolchainCompilerFor private and fix LibrariesCommon
This commit is contained in:
@@ -151,7 +151,7 @@ fun Project.updateJvmTarget(
|
||||
}
|
||||
}
|
||||
|
||||
fun Project.getToolchainCompilerFor(
|
||||
private fun Project.getToolchainCompilerFor(
|
||||
jdkVersion: JdkMajorVersion
|
||||
): Provider<JavaCompiler> {
|
||||
val service = project.extensions.getByType<JavaToolchainService>()
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user