azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Build] Make getToolchainCompilerFor private and fix LibrariesCommon

Browse Source
This commit is contained in:
Simon Ogorodnik
2021-07-07 17:31:22 +03:00
committed by Space
parent c0e479eadb
commit ca86b7ff7d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/JvmToolchain.kt
+1 -1
View File
@@ -151,7 +151,7 @@ fun Project.updateJvmTarget(
} }
} }
fun Project.getToolchainCompilerFor( private fun Project.getToolchainCompilerFor(
jdkVersion: JdkMajorVersion jdkVersion: JdkMajorVersion
): Provider<JavaCompiler> { ): Provider<JavaCompiler> {
val service = project.extensions.getByType<JavaToolchainService>() val service = project.extensions.getByType<JavaToolchainService>()
buildSrc/src/main/kotlin/LibrariesCommon.kt
+1 -1
View File
@@ -26,9 +26,9 @@ fun Project.configureJava9Compilation(
tasks.named("compileJava9Java", JavaCompile::class.java) { tasks.named("compileJava9Java", JavaCompile::class.java) {
dependsOn(moduleOutputs) dependsOn(moduleOutputs)
javaCompiler.set(getToolchainCompilerFor(JdkMajorVersion.JDK_9))
targetCompatibility = JavaVersion.VERSION_1_9.toString() targetCompatibility = JavaVersion.VERSION_1_9.toString()
sourceCompatibility = 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 // module-info.java should be in java9 source set by convention
val java9SourceSet = sourceSets["java9"].java val java9SourceSet = sourceSets["java9"].java