From 1c568c2a107c3c6619af150535fca20b27375d84 Mon Sep 17 00:00:00 2001
From: Sebastian Sellmair <sebastian.sellmair@jetbrains.com>
Date: Mon, 16 Oct 2023 18:03:41 +0200
Subject: [PATCH] [Gradle] Implement RegisterBuildKotlinToolingMetadataTask

KT-61634
---
 .../org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt | 3 ---
 .../kotlin/gradle/plugin/registerKotlinPluginExtensions.kt    | 2 ++
 .../kotlin/gradle/tooling/BuildKotlinToolingMetadataTask.kt   | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt
index e81120bcd69..0909eb0b6ba 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt
@@ -53,7 +53,6 @@ import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropCommonizerArt
 import org.jetbrains.kotlin.gradle.targets.native.internal.CommonizerTargetAttribute
 import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompileTool
 import org.jetbrains.kotlin.gradle.testing.internal.KotlinTestsRegistry
-import org.jetbrains.kotlin.gradle.tooling.registerBuildKotlinToolingMetadataTask
 import org.jetbrains.kotlin.gradle.utils.*
 import org.jetbrains.kotlin.statistics.metrics.StringMetrics
 import org.jetbrains.kotlin.tooling.core.KotlinToolingVersion
@@ -264,8 +263,6 @@ abstract class KotlinBasePluginWrapper : DefaultKotlinBasePlugin() {
 
         project.runKotlinProjectSetupActions()
 
-        project.registerBuildKotlinToolingMetadataTask()
-
         project.setupDiagnosticsChecksAndReporting()
     }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt
index 23c95f0d27c..a00e04ca403 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/registerKotlinPluginExtensions.kt
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers.PreHmppDependenci
 import org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers.UnusedSourceSetsChecker
 import org.jetbrains.kotlin.gradle.plugin.diagnostics.checkers.WasmSourceSetsNotFoundChecker
 import org.jetbrains.kotlin.gradle.targets.js.npm.AddNpmDependencyExtensionProjectSetupAction
+import org.jetbrains.kotlin.gradle.tooling.RegisterBuildKotlinToolingMetadataTask
 
 /**
  * Active Extensions (using the [KotlinGradlePluginExtensionPoint] infrastructure) will be registered here by the Kotlin Gradle Plugin.
@@ -34,6 +35,7 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.AddNpmDependencyExtensionProje
 internal fun Project.registerKotlinPluginExtensions() {
     KotlinProjectSetupAction.extensionPoint.apply {
         register(project, AddNpmDependencyExtensionProjectSetupAction)
+        register(project, RegisterBuildKotlinToolingMetadataTask)
     }
 
     KotlinGradleProjectChecker.extensionPoint.apply {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tooling/BuildKotlinToolingMetadataTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tooling/BuildKotlinToolingMetadataTask.kt
index 63fa4cf5dab..b4878a3095e 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tooling/BuildKotlinToolingMetadataTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tooling/BuildKotlinToolingMetadataTask.kt
@@ -31,8 +31,8 @@ import org.jetbrains.kotlin.tooling.toJsonString
 import java.io.File
 import javax.inject.Inject
 
-internal fun Project.registerBuildKotlinToolingMetadataTask() {
-    if (!project.kotlinPropertiesProvider.enableKotlinToolingMetadataArtifact) return
+internal val RegisterBuildKotlinToolingMetadataTask = KotlinProjectSetupAction {
+    if (!project.kotlinPropertiesProvider.enableKotlinToolingMetadataArtifact) return@KotlinProjectSetupAction
     buildKotlinToolingMetadataTask
 }