From 977da5c9b1915800466576da355ca6204aa4c9f8 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sun, 5 Nov 2023 19:45:01 +0100
Subject: [PATCH] Support multiple java9 compilations in a project

Required for KT-61969
---
 .../src/main/kotlin/LibrariesCommon.kt         | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/LibrariesCommon.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/LibrariesCommon.kt
index 4decdb33da3..f40ee61dbf5 100644
--- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/LibrariesCommon.kt
+++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/LibrariesCommon.kt
@@ -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(