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

Support multiple java9 compilations in a project

Browse Source 
Required for KT-61969
This commit is contained in:
Ilya Gorbunov
2023-11-05 19:45:01 +01:00
committed by Space Team
parent 1d1645fd2d
commit 977da5c9b1
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/LibrariesCommon.kt
+11 -7
View File
@@ -23,18 +23,21 @@ fun Project.configureJava9Compilation(
moduleName: String,
moduleOutputs: Collection<FileCollection> = setOf(sourceSets["main"].output),
compileClasspathConfiguration: Configuration = configurations["compileClasspath"],
sourceSetName: String = "java9"
) {
configurations["java9CompileClasspath"].extendsFrom(compileClasspathConfiguration)
val sourceSetNameC = sourceSetName.capitalize()
val java9CompileClasspath = configurations["${sourceSetName}CompileClasspath"]
java9CompileClasspath.extendsFrom(compileClasspathConfiguration)
tasks.withType(KotlinCompile::class.java).matching {
it.name == "compileJava9Kotlin" || it.name == "compileJava9KotlinJvm"
}.configureEach {
val kotlinCompileTaskNames = setOf("compile${sourceSetNameC}Kotlin", "compile${sourceSetNameC}KotlinJvm")
tasks.withType(KotlinCompile::class.java).matching { it.name in kotlinCompileTaskNames }.configureEach {
configureTaskToolchain(JdkMajorVersion.JDK_9_0)
@Suppress("DEPRECATION")
kotlinOptions.jvmTarget = JdkMajorVersion.JDK_9_0.targetName
}
tasks.named("compileJava9Java", JavaCompile::class.java) {
tasks.named("compile${sourceSetNameC}Java", JavaCompile::class.java) {
dependsOn(moduleOutputs)
targetCompatibility = JavaVersion.VERSION_1_9.toString()
@@ -42,12 +45,13 @@ fun Project.configureJava9Compilation(
configureTaskToolchain(JdkMajorVersion.JDK_9_0)
// module-info.java should be in java9 source set by convention
val java9SourceSet = sourceSets["java9"].java
val java9SourceSet = sourceSets[sourceSetName].java
destinationDirectory.set(java9SourceSet.destinationDirectory.asFile.get().resolve("META-INF/versions/9"))
options.sourcepath = files(java9SourceSet.srcDirs)
val compileClasspath = configurations["java9CompileClasspath"]
val compileClasspath = java9CompileClasspath
val moduleFiles = objects.fileCollection().from(moduleOutputs)
val modulePath = compileClasspath.filter { it !in moduleFiles.files }
dependsOn(modulePath)
classpath = objects.fileCollection().from()
options.compilerArgumentProviders.add(
Java9AdditionalArgumentsProvider(