From 167ddc556dea55603876c1ef91c3319e4dd36284 Mon Sep 17 00:00:00 2001
From: Timofey Solonin <timofey.solonin@jetbrains.com>
Date: Mon, 24 Jul 2023 20:53:01 +0200
Subject: [PATCH] [MPP] Don't publish PM20

^KT-60198
---
 .../gradle/testbase/projectSetupDefaults.kt   |  2 --
 .../build.gradle.kts                          | 12 +++++--
 .../testProject/kpm-simple/build.gradle.kts   | 14 ++++++--
 .../build.gradle.kts                          | 14 ++++++--
 .../kotlin-gradle-plugin/build.gradle.kts     |  6 ----
 .../unitTests/kpm/AbstractKpmExtensionTest.kt |  4 ++-
 ...otlin.multiplatform.pm20.gradle.plugin.pom | 36 -------------------
 7 files changed, 37 insertions(+), 51 deletions(-)
 delete mode 100644 repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/multiplatform/pm20/org.jetbrains.kotlin.multiplatform.pm20.gradle.plugin/org.jetbrains.kotlin.multiplatform.pm20.gradle.plugin.pom

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt
index 4da99ab166f..f6eb71f2a35 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt
@@ -25,7 +25,6 @@ internal val DEFAULT_GROOVY_SETTINGS_FILE =
             id "org.jetbrains.kotlin.js" version "${'$'}kotlin_version"
             id "org.jetbrains.kotlin.native.cocoapods" version "${'$'}kotlin_version"
             id "org.jetbrains.kotlin.multiplatform" version "${'$'}kotlin_version"
-            id "org.jetbrains.kotlin.multiplatform.pm20" version "${'$'}kotlin_version"
             id "org.jetbrains.kotlin.plugin.allopen" version "${'$'}kotlin_version"
             id "org.jetbrains.kotlin.plugin.spring" version "${'$'}kotlin_version"
             id "org.jetbrains.kotlin.plugin.jpa" version "${'$'}kotlin_version"
@@ -86,7 +85,6 @@ internal val DEFAULT_KOTLIN_SETTINGS_FILE =
             id("org.jetbrains.kotlin.js") version kotlin_version
             id("org.jetbrains.kotlin.native.cocoapods") version kotlin_version
             id("org.jetbrains.kotlin.multiplatform") version kotlin_version
-            id("org.jetbrains.kotlin.multiplatform.pm20") version kotlin_version
             id("org.jetbrains.kotlin.plugin.allopen") version kotlin_version
             id("org.jetbrains.kotlin.plugin.spring") version kotlin_version
             id("org.jetbrains.kotlin.plugin.jpa") version kotlin_version
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpm-multi-module-published/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpm-multi-module-published/build.gradle.kts
index ec3689092b6..2ce8223ba43 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpm-multi-module-published/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpm-multi-module-published/build.gradle.kts
@@ -1,10 +1,18 @@
+import org.jetbrains.kotlin.gradle.plugin.KotlinPm20PluginWrapper
 import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.*
 
 plugins {
-    kotlin("multiplatform.pm20").version("<pluginMarkerVersion>")
     `maven-publish`
 }
 
+buildscript {
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:<pluginMarkerVersion>")
+    }
+}
+
+apply<KotlinPm20PluginWrapper>()
+
 repositories {
     mavenLocal()
     mavenCentral()
@@ -13,7 +21,7 @@ repositories {
 group = "com.example.bar"
 version = "1.0"
 
-kotlin {
+configure<KotlinPm20ProjectExtension> {
     // feel free to add more modules, variants and fragments
     mainAndTest {
         jvm
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpm-simple/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpm-simple/build.gradle.kts
index 81ee44cdd72..114ec2898ab 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpm-simple/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpm-simple/build.gradle.kts
@@ -1,11 +1,21 @@
 import org.gradle.api.Project
+import org.jetbrains.kotlin.gradle.plugin.KotlinPm20PluginWrapper
 import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.*
 import org.jetbrains.kotlin.project.model.*
 
-plugins {
-    kotlin("multiplatform.pm20")
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${property("kotlin_version")}")
+    }
 }
 
+apply<KotlinPm20PluginWrapper>()
+
 repositories {
     mavenLocal()
     mavenCentral()
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpmTransientPluginOptions/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpmTransientPluginOptions/build.gradle.kts
index ac6d1f7719b..d80a243db95 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpmTransientPluginOptions/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpmTransientPluginOptions/build.gradle.kts
@@ -1,11 +1,21 @@
 import org.gradle.api.Project
+import org.jetbrains.kotlin.gradle.plugin.KotlinPm20PluginWrapper
 import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.*
 import org.jetbrains.kotlin.project.model.*
 
-plugins {
-    kotlin("multiplatform.pm20")
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:<pluginMarkerVersion>")
+    }
 }
 
+apply<KotlinPm20PluginWrapper>()
+
 repositories {
     mavenLocal()
     mavenCentral()
diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
index 1361aa0b99c..12e89fdc034 100644
--- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
@@ -248,12 +248,6 @@ gradlePlugin {
             displayName = description
             implementationClass = "org.jetbrains.kotlin.gradle.plugin.cocoapods.KotlinCocoapodsPlugin"
         }
-        create("kotlinMultiplatformPluginPm20") {
-            id = "org.jetbrains.kotlin.multiplatform.pm20"
-            description = "Kotlin Multiplatform plugin with PM2.0"
-            displayName = description
-            implementationClass = "org.jetbrains.kotlin.gradle.plugin.KotlinPm20PluginWrapper"
-        }
     }
 }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/AbstractKpmExtensionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/AbstractKpmExtensionTest.kt
index d2fcdb23dce..0e70993dc24 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/AbstractKpmExtensionTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/AbstractKpmExtensionTest.kt
@@ -8,8 +8,10 @@ package org.jetbrains.kotlin.gradle.unitTests.kpm
 import org.gradle.api.Project
 import org.gradle.api.artifacts.verification.DependencyVerificationMode
 import org.gradle.api.internal.project.ProjectInternal
+import org.gradle.kotlin.dsl.apply
 import org.gradle.testfixtures.ProjectBuilder
 import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject
+import org.jetbrains.kotlin.gradle.plugin.KotlinPm20PluginWrapper
 import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension
 import org.jetbrains.kotlin.gradle.util.addBuildEventsListenerRegistryMock
 
@@ -23,7 +25,7 @@ abstract class AbstractKpmExtensionTest {
 
 fun Project.applyKpmPlugin(configure: KotlinPm20ProjectExtension.() -> Unit = {}): KotlinPm20ProjectExtension {
     addBuildEventsListenerRegistryMock(project)
-    plugins.apply("org.jetbrains.kotlin.multiplatform.pm20")
+    apply<KotlinPm20PluginWrapper>()
     return (extensions.getByName("kotlin") as KotlinPm20ProjectExtension).also(configure)
 }
 
diff --git a/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/multiplatform/pm20/org.jetbrains.kotlin.multiplatform.pm20.gradle.plugin/org.jetbrains.kotlin.multiplatform.pm20.gradle.plugin.pom b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/multiplatform/pm20/org.jetbrains.kotlin.multiplatform.pm20.gradle.plugin/org.jetbrains.kotlin.multiplatform.pm20.gradle.plugin.pom
deleted file mode 100644
index e470e5f567a..00000000000
--- a/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/multiplatform/pm20/org.jetbrains.kotlin.multiplatform.pm20.gradle.plugin/org.jetbrains.kotlin.multiplatform.pm20.gradle.plugin.pom
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.jetbrains.kotlin.multiplatform.pm20</groupId>
-  <artifactId>org.jetbrains.kotlin.multiplatform.pm20.gradle.plugin</artifactId>
-  <version>ArtifactsTest.version</version>
-  <packaging>pom</packaging>
-  <name>Kotlin Multiplatform plugin with PM2.0</name>
-  <description>Kotlin Multiplatform plugin with PM2.0</description>
-  <url>https://kotlinlang.org/</url>
-  <licenses>
-    <license>
-      <name>The Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>Kotlin Team</name>
-      <organization>JetBrains</organization>
-      <organizationUrl>https://www.jetbrains.com</organizationUrl>
-    </developer>
-  </developers>
-  <scm>
-    <connection>scm:git:https://github.com/JetBrains/kotlin.git</connection>
-    <developerConnection>scm:git:https://github.com/JetBrains/kotlin.git</developerConnection>
-    <url>https://github.com/JetBrains/kotlin</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-gradle-plugin</artifactId>
-      <version>ArtifactsTest.version</version>
-    </dependency>
-  </dependencies>
-</project>