From ad9f6e63b69f58315bc4815057871eaffae0439a Mon Sep 17 00:00:00 2001
From: Ivan Gavrilovic <gavra@google.com>
Date: Mon, 26 Apr 2021 17:28:09 +0100
Subject: [PATCH] [Gradle] Extract configuration of KotlinJsIrLink to a class

Migrate KotlinJsIrLink to properties create Configurator class
to configure the task properties.
---
 .../gradle/targets/js/ir/KotlinJsIrLink.kt    | 54 ++++++++-----------
 .../js/ir/KotlinJsIrLinkWithWorkers.kt        |  2 +-
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt
index 99055052aaf..b78abad8836 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt
@@ -5,28 +5,41 @@
 
 package org.jetbrains.kotlin.gradle.targets.js.ir
 
-import org.gradle.api.file.FileCollection
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.FileTree
-import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.tasks.*
 import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
 import org.jetbrains.kotlin.gradle.dsl.KotlinJsOptions
 import org.jetbrains.kotlin.gradle.dsl.KotlinJsOptionsImpl
+import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinCompilationData
 import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBinaryMode
 import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBinaryMode.DEVELOPMENT
 import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBinaryMode.PRODUCTION
 import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
-import org.jetbrains.kotlin.gradle.utils.newFileProperty
-import java.io.File
 import javax.inject.Inject
 
 @CacheableTask
-open class KotlinJsIrLink @Inject constructor(
+abstract class KotlinJsIrLink @Inject constructor(
     objectFactory: ObjectFactory
 ): Kotlin2JsCompile(objectFactory) {
+
+    class Configurator(compilation: KotlinCompilationData<*>): Kotlin2JsCompile.Configurator<KotlinJsIrLink>(compilation) {
+
+        override fun configure(task: KotlinJsIrLink) {
+            super.configure(task)
+
+            task.entryModule.fileProvider(
+                (compilation as KotlinJsIrCompilation).output.classesDirs.elements.map { it.single().asFile }
+            ).disallowChanges()
+            task.kotlinOptionsProperty.value(KotlinJsOptionsImpl()).disallowChanges()
+            task.destinationDirectory.fileProvider(task.outputFile.map { it.parentFile }).disallowChanges()
+        }
+    }
+
     // Link tasks are not affected by compiler plugin
-    override val pluginClasspath: FileCollection = project.objects.fileCollection()
+    override val pluginClasspath: ConfigurableFileCollection = project.objects.fileCollection()
 
     @Input
     lateinit var mode: KotlinJsBinaryMode
@@ -35,34 +48,13 @@ open class KotlinJsIrLink @Inject constructor(
     @Internal
     override fun getSource(): FileTree = super.getSource()
 
-    override val kotlinOptions: KotlinJsOptions = KotlinJsOptionsImpl()
-
     @get:SkipWhenEmpty
     @get:InputDirectory
     @get:PathSensitive(PathSensitivity.RELATIVE)
-    internal val entryModule: File by lazy {
-        File(
-            (taskData.compilation as KotlinJsIrCompilation)
-                .output
-                .classesDirs
-                .asPath
-        )
-    }
+    internal abstract val entryModule: DirectoryProperty
 
-    override fun skipCondition(): Boolean =
-        !entryModule.exists()
-
-    override fun getDestinationDir(): File {
-        return if (kotlinOptions.outputFile == null) {
-            super.getDestinationDir()
-        } else {
-            outputFile.parentFile
-        }
-    }
-
-    @OutputFile
-    val outputFileProperty: RegularFileProperty = project.newFileProperty {
-        outputFile
+    override fun skipCondition(): Boolean {
+        return !entryModule.get().asFile.exists()
     }
 
     override fun setupCompilerArgs(args: K2JSCompilerArguments, defaultsOnly: Boolean, ignoreClasspathResolutionErrors: Boolean) {
@@ -80,6 +72,6 @@ open class KotlinJsIrLink @Inject constructor(
     private fun KotlinJsOptions.configureOptions(vararg additionalCompilerArgs: String) {
         freeCompilerArgs += additionalCompilerArgs.toList() +
                 PRODUCE_JS +
-                "$ENTRY_IR_MODULE=${entryModule.canonicalPath}"
+                "$ENTRY_IR_MODULE=${entryModule.get().asFile.canonicalPath}"
     }
 }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLinkWithWorkers.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLinkWithWorkers.kt
index 7b75bf5d772..c7b8066c72e 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLinkWithWorkers.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLinkWithWorkers.kt
@@ -14,7 +14,7 @@ import java.io.File
 import javax.inject.Inject
 
 @CacheableTask
-internal open class KotlinJsIrLinkWithWorkers
+internal abstract class KotlinJsIrLinkWithWorkers
 @Inject
 constructor(
     objectFactory: ObjectFactory,