From b85b733e42737dd8f03449fc11ec8c0032a58829 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Fri, 24 Apr 2020 15:52:00 +0300
Subject: [PATCH] Build: Remove explicit legacy maven plugin application

---
 .../kotlin/plugins/PublishedKotlinModule.kt     |  8 +++++++-
 buildSrc/src/main/kotlin/publish.kt             | 12 ++++++++++++
 .../kotlin-gradle-plugin-api/build.gradle.kts   |  1 -
 .../kotlin-gradle-plugin-model/build.gradle.kts |  1 -
 native/commonizer/build.gradle.kts              | 17 ++++-------------
 .../compiler-client-embeddable/build.gradle.kts |  1 -
 6 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/buildSrc/src/main/kotlin/plugins/PublishedKotlinModule.kt b/buildSrc/src/main/kotlin/plugins/PublishedKotlinModule.kt
index 72b498b7323..7755ad6c873 100644
--- a/buildSrc/src/main/kotlin/plugins/PublishedKotlinModule.kt
+++ b/buildSrc/src/main/kotlin/plugins/PublishedKotlinModule.kt
@@ -31,12 +31,18 @@ open class PublishedKotlinModule : Plugin<Project> {
 
             plugins.apply("maven")
 
-            val publishedRuntime by configurations.creating {
+            configurations.maybeCreate("publishedRuntime").apply {
                 the<MavenPluginConvention>()
                     .conf2ScopeMappings
                     .addMapping(0, this, Conf2ScopeMappingContainer.RUNTIME)
             }
 
+            configurations.maybeCreate("publishedCompile").apply {
+                the<MavenPluginConvention>()
+                    .conf2ScopeMappings
+                    .addMapping(0, this, Conf2ScopeMappingContainer.COMPILE)
+            }
+
             if (!project.hasProperty("prebuiltJar")) {
                 plugins.apply("signing")
 
diff --git a/buildSrc/src/main/kotlin/publish.kt b/buildSrc/src/main/kotlin/publish.kt
index 9386337f74e..4742172ae12 100644
--- a/buildSrc/src/main/kotlin/publish.kt
+++ b/buildSrc/src/main/kotlin/publish.kt
@@ -23,3 +23,15 @@ fun DependencyHandler.publishedRuntime(
 ): ExternalModuleDependency =
     addDependencyTo(this, "publishedRuntime", dependencyNotation, dependencyConfiguration)
 
+
+val NamedDomainObjectContainer<Configuration>.publishedCompile: NamedDomainObjectProvider<Configuration> get() = named("publishedCompile")
+
+fun DependencyHandler.publishedCompile(dependencyNotation: Any): Dependency? =
+    add("publishedCompile", dependencyNotation)
+
+fun DependencyHandler.publishedCompile(
+    dependencyNotation: String,
+    dependencyConfiguration: Action<ExternalModuleDependency>
+): ExternalModuleDependency =
+    addDependencyTo(this, "publishedCompile", dependencyNotation, dependencyConfiguration)
+
diff --git a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts
index c6bba6b061b..22b35e0b162 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts
@@ -3,7 +3,6 @@ import org.jetbrains.kotlin.pill.PillExtension
 
 plugins {
     kotlin("jvm")
-    maven
     id("jps-compatible")
 }
 
diff --git a/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts
index 1a3db832f1c..04214b73db8 100644
--- a/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts
@@ -3,7 +3,6 @@ import org.jetbrains.kotlin.pill.PillExtension
 
 plugins {
     kotlin("jvm")
-    maven
     id("jps-compatible")
 }
 
diff --git a/native/commonizer/build.gradle.kts b/native/commonizer/build.gradle.kts
index 3669d7844cd..e7c31b60723 100644
--- a/native/commonizer/build.gradle.kts
+++ b/native/commonizer/build.gradle.kts
@@ -1,23 +1,16 @@
-import org.gradle.api.artifacts.maven.Conf2ScopeMappingContainer.COMPILE
-
 plugins {
-    maven
     kotlin("jvm")
     id("jps-compatible")
 }
 
-val mavenCompileScope by configurations.creating {
-    the<MavenPluginConvention>()
-        .conf2ScopeMappings
-        .addMapping(0, this, COMPILE)
-}
+description = "Kotlin KLIB Library Commonizer"
+
+publish()
 
 configurations {
     runtimeOnly.get().extendsFrom(compileOnly.get())
 }
 
-description = "Kotlin KLIB Library Commonizer"
-
 dependencies {
     compileOnly(project(":compiler:cli-common"))
     compileOnly(project(":compiler:ir.serialization.common"))
@@ -27,7 +20,7 @@ dependencies {
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
     // This dependency is necessary to keep the right dependency record inside of POM file:
-    mavenCompileScope(project(":kotlin-compiler"))
+    publishedCompile(project(":kotlin-compiler"))
 
     api(kotlinStdlib())
 
@@ -50,6 +43,4 @@ projectTest(parallel = true) {
     workingDir = rootDir
 }
 
-publish()
-
 standardPublicJars()
diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts
index f0ec0b7c825..6dc5892c406 100644
--- a/prepare/compiler-client-embeddable/build.gradle.kts
+++ b/prepare/compiler-client-embeddable/build.gradle.kts
@@ -1,7 +1,6 @@
 description = "Kotlin compiler client embeddable"
 
 plugins {
-    maven
     kotlin("jvm")
 }