[Gradle] Remove old platform plugins ids

We want to remove Gradle ids for old deprecated multiplatform platform
plugins and eventually clean up the code.

Exception for now is common platform plugin as it is still used
in compiler tests. Will be removed separately.

^KT-65187 Verification Pending

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt

@@ -9,6 +9,7 @@ import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.gradle.testbase.*
 import org.junit.jupiter.api.DisplayName
 import kotlin.io.path.appendText
+import kotlin.io.path.exists
 
 @DisplayName("Tasks configuration avoidance")
 class ConfigurationAvoidanceIT : KGPBaseTest() {
@@ -128,7 +129,7 @@ class ConfigurationAvoidanceIT : KGPBaseTest() {
     @DisplayName("JS unrelated tasks are not configured")
     @GradleTest
     fun jsNoTasksConfigured(gradleVersion: GradleVersion) {
-        project("kotlin2JsNoOutputFileProject", gradleVersion) {
+        project("kotlin-js-plugin-project", gradleVersion) {
             createTaskWithExpensiveConfiguration()
 
             build("help")
@@ -150,15 +151,27 @@ class ConfigurationAvoidanceIT : KGPBaseTest() {
         expensivelyConfiguredTaskName: String = "expensivelyConfiguredTask"
     ): String {
         @Suppress("GroovyAssignabilityCheck")
-        buildGradle.append(
-            //language=Groovy
-            """
+        if (buildGradle.exists()) {
+            buildGradle.appendText(
+                //language=Groovy
+                """
                     
                 tasks.register("$expensivelyConfiguredTaskName") {
                     throw new GradleException("Should not configure expensive task!")
                 }
                 """.trimIndent()
-        )
+            )
+        } else {
+            buildGradleKts.appendText(
+                //language=kotlin
+                """
+                |
+                |tasks.register("$expensivelyConfiguredTaskName") {
+                |   throw GradleException("Should not configure expensive task!")
+                |}
+                """.trimMargin()
+            )
+        }
 
         return expensivelyConfiguredTaskName
     }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KaptModelIT.kt

@@ -62,7 +62,7 @@ class KaptModelIT : KGPBaseTest() {
     @DisplayName("Model is not available when plugin is not applied")
     @GradleTest
     fun testNonJvmProjects(gradleVersion: GradleVersion) {
-        project("kotlin2JsProject", gradleVersion) {
+        project("kotlin-js-plugin-project", gradleVersion) {
             getModels<Kapt> {
                 assertNull(getModel(":"))
                 assertNull(getModel(":libraryProject"))

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeDownloadAndPlatformLibsIT.kt

@@ -271,7 +271,7 @@ class NativeDownloadAndPlatformLibsIT : KGPBaseTest() {
     @DisplayName("The plugin shouldn't download the K/N compiler if there are no corresponding targets in the project.")
     @GradleTest
     fun shouldNotDownloadKonanWithoutCorrespondingTargets(gradleVersion: GradleVersion) {
-        nativeProject("new-mpp-lib-and-app/sample-old-style-app", gradleVersion) {
+        nativeProject("jvm-and-js-hmpp", gradleVersion) {
             build("tasks") {
                 assertOutputDoesNotContain("Kotlin/Native distribution: ")
             }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle

@@ -1,24 +0,0 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
-    }
-}
-
-apply plugin: "org.jetbrains.kotlin.platform.js"
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
-}
-
-compileKotlin2Js.kotlinOptions.freeCompilerArgs += ["-Xir-produce-klib-dir", "-Xir-only"]
-compileTestKotlin2Js.kotlinOptions.freeCompilerArgs += ["-Xir-produce-js"]

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/gradle.properties

@@ -1 +0,0 @@
-kotlin.internal.mpp12x.deprecation.suppress=true

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/src/main/kotlin/example/Dummy.kt

@@ -1,8 +0,0 @@
-package example
-
-class Dummy {
-    fun f(): Int {
-        return 23
-    }
-}
-

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/src/test/kotlin/example/DummyTest.kt

@@ -1,8 +0,0 @@
-package example
-
-class DummyTest {
-    fun test() {
-        Dummy().f()
-    }
-}
-

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/gradle.properties

@@ -1 +0,0 @@
-kotlin.internal.mpp12x.deprecation.suppress=true

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle

@@ -1,52 +0,0 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-apply plugin: 'org.jetbrains.kotlin.platform.js'
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
-}
-
-tasks.register("jarSources", Jar) {
-    from sourceSets.main.allSource
-    archiveClassifier = 'source'
-}
-artifacts {
-    implementation jarSources
-}
-
-def outDir = "${buildDir}/kotlin2js/main/"
-
-compileKotlin2Js.destinationDirectory = new File(outDir)
-compileKotlin2Js.kotlinOptions.moduleName = "test-library"
-
-compileKotlin2Js.kotlinOptions.freeCompilerArgs += ["-Xir-produce-klib-dir"]
-
-jar {
-    from sourceSets.main.allSource
-    include "**/*.kt"
-
-    from outDir
-    include ("**/*")
-
-    manifest {
-        attributes(
-                "Specification-Title": "Kotlin JavaScript Lib",
-                "Kotlin-JS-Module-Name": "test-library"
-        )
-    }
-}
-
-jar.dependsOn(compileKotlin2Js)

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/src/main/kotlin/example/library/Adder.kt

@@ -1,6 +0,0 @@
-package example
-
-class Adder {
-    public fun add(x: Int, y: Int): Int = x + y
-}
-

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/src/main/kotlin/example/library/Counter.kt

@@ -1,15 +0,0 @@
-package example.library
-
-import org.w3c.dom.Text
-import kotlinx.browser.*
-
-public class Counter(val el: Text) {
-    fun step(n: Int) {
-        document.title = "Counter: ${n}"
-        window.setTimeout({step(n+1)}, 1000)
-    }
-
-    fun start() {
-        step(0)
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle

@@ -1,44 +0,0 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-apply plugin: 'org.jetbrains.kotlin.platform.js'
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
-dependencies {
-    implementation project(":libraryProject")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
-}
-
-compileKotlin2Js.kotlinOptions.sourceMap = true
-compileKotlin2Js.destinationDirectory = new File(projectDir, "web/js")
-compileKotlin2Js.kotlinOptions.moduleName = "app"
-compileKotlin2Js.kotlinOptions.suppressWarnings = true
-compileKotlin2Js.kotlinOptions.verbose = true
-
-compileKotlin2Js.kotlinOptions.freeCompilerArgs += ["-Xir-produce-js"]
-
-build.doLast {
-    configurations.compile.each { File file ->
-        copy {
-            includeEmptyDirs = false
-
-            from zipTree(file.absolutePath)
-            into "${projectDir}/web/js/lib"
-            include { fileTreeElement ->
-                def path = fileTreeElement.path
-                path.endsWith(".js") && (path.startsWith("META-INF/resources/") || !path.startsWith("META-INF/"))
-            }
-        }
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/src/main/kotlin/example/main.kt

@@ -1,19 +0,0 @@
-package example
-
-import kotlinx.browser.document
-import example.library.Counter
-
-
-fun main(args: Array<String>) {
-    val el = document.createElement("div")
-    el.appendChild(document.createTextNode("Hello!"))
-    document.body!!.appendChild(el)
-
-    val counterDiv = document.createElement("div")
-    val counterText = document.createTextNode("Counter!")
-    counterDiv.appendChild(counterText)
-    document.body!!.appendChild(counterDiv)
-
-    val counter = Counter(counterText)
-    counter.start()
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/settings.gradle

@@ -1 +0,0 @@
-include 'mainProject', 'libraryProject'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/web/index.html

@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head lang="en">
-    <meta charset="UTF-8">
-    <title></title>
-    <script src="js/lib/kotlin.js"></script>
-</head>
-<body>
-<script src="js/app.js"></script>
-</body>
-</html>

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/build.gradle

@@ -1,17 +0,0 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-allprojects {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/gradle.properties

@@ -1 +0,0 @@
-kotlin.internal.mpp12x.deprecation.suppress=true

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libA/build.gradle

@@ -1 +0,0 @@
-apply plugin: 'kotlin-platform-common'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libA/src/main/kotlin/PlatformClassA.kt

@@ -1,7 +0,0 @@
-package foo
-
-expect class PlatformClassA {
-    val valueA: String
-}
-
-class CommonClassA

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libA/src/test/kotlin/PlatformTestA.kt

@@ -1,7 +0,0 @@
-package foo
-
-expect class PlatformTestA {
-    val valueA: PlatformClassA
-}
-
-class CommonTestA(val commonClassA: CommonClassA)

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libB/build.gradle

@@ -1 +0,0 @@
-apply plugin: 'kotlin-platform-common'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libB/src/main/kotlin/PlatformClassB.kt

@@ -1,7 +0,0 @@
-package foo
-
-expect class PlatformClassB {
-    val valueB: String
-}
-
-class CommonClassB

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libB/src/test/kotlin/PlatformTestB.kt

@@ -1,7 +0,0 @@
-package foo
-
-expect class PlatformTestB {
-    val valueB: PlatformClassB
-}
-
-class CommonTestB(val commonClassB: CommonClassB)

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/build.gradle

@@ -1,8 +0,0 @@
-apply plugin: 'kotlin-platform-jvm'
-
-dependencies {
-    expectedBy project(":libA")
-    expectedBy project(":libB")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'com.google.guava:guava:20.0'
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/src/main/kotlin/PlatformClass.kt

@@ -1,9 +0,0 @@
-package foo
-
-actual class PlatformClassA {
-    actual val valueA: String = "JVM"
-}
-
-actual class PlatformClassB {
-    actual val valueB: String = "JVM"
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/src/main/kotlin/javaLibUse.kt

@@ -1,7 +0,0 @@
-package foo
-
-import com.google.common.collect.ImmutableSet
-
-fun main(args: Array<String>) {
-    val colors = ImmutableSet.of("red", "orange", "yellow")
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/src/test/kotlin/PlatformTest.kt

@@ -1,9 +0,0 @@
-package foo
-
-actual class PlatformTestA {
-    actual val valueA: PlatformClassA = PlatformClassA()
-}
-
-actual class PlatformTestB {
-    actual val valueB: PlatformClassB = PlatformClassB()
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/settings.gradle

@@ -1 +0,0 @@
-include ':libA', ':libB', ':libJvm', ':libJs'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-common/build.gradle

@@ -1,5 +0,0 @@
-apply plugin: 'kotlin-platform-common'
-
-dependencies {
-	implementation 'com.example:sample-lib:1.0'
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-common/src/main/kotlin/commonApp.kt

@@ -1,10 +0,0 @@
-package com.example.app
-
-import com.example.lib.id
-import com.example.lib.expectedFun
-
-fun idUsage(x: Int): Int = id(x)
-
-fun main(args: Array<String>) {
-	expectedFun()
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-jvm/build.gradle

@@ -1,10 +0,0 @@
-apply plugin: 'kotlin'
-apply plugin: 'application'
-
-dependencies {
-	implementation 'com.example:sample-lib:1.0'
-}
-
-application {
-	mainClass = 'com.example.app.JvmAppKt'
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-jvm/src/main/kotlin/jvmApp.kt

@@ -1,10 +0,0 @@
-package com.example.app
-
-import com.example.lib.id
-import com.example.lib.expectedFun
-
-fun idUsage(x: Int): Int = id(x)
-
-fun main(args: Array<String>) {
-	expectedFun()
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/build.gradle

@@ -1,18 +0,0 @@
-buildscript {
-	repositories {
-		mavenLocal()
-		mavenCentral()
-	}
-	dependencies {
-		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-	}
-}
-
-allprojects {
-	repositories {
-	    mavenLocal()
-	    mavenCentral()
-	    // NB: Build of this module depends on 'sample-lib' publication. You need to add the local
-	    // repository where 'sample-lib' artifacts are published.
-	}
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/gradle.properties

@@ -1 +0,0 @@
-kotlin.internal.mpp12x.deprecation.suppress=true

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/settings.gradle

@@ -1 +0,0 @@
-include 'app-common', 'app-jvm'

libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin-platform-android.properties

@@ -1 +0,0 @@
-implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinPlatformAndroidPlugin

libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin-platform-js.properties

@@ -1 +0,0 @@
-implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJsPlugin

libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin-platform-jvm.properties

@@ -1 +0,0 @@
-implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin

libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.platform.android.properties

@@ -1 +0,0 @@
-implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinPlatformAndroidPlugin

libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.platform.js.properties

@@ -1 +0,0 @@
-implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJsPlugin

libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.platform.jvm.properties

@@ -1 +0,0 @@
-implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin