From 1bae743524b40154048307b59564b1081f6ffa96 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Mon, 22 Jan 2024 16:26:49 +0100 Subject: [PATCH] [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 --- .../kotlin/gradle/ConfigurationAvoidanceIT.kt | 23 ++++++-- .../kotlin/gradle/model/KaptModelIT.kt | 2 +- .../native/NativeDownloadAndPlatformLibsIT.kt | 2 +- .../kotlin2JsNoOutputFileProject/build.gradle | 24 --------- .../gradle.properties | 1 - .../src/main/kotlin/example/Dummy.kt | 8 --- .../src/test/kotlin/example/DummyTest.kt | 8 --- .../kotlin2JsProject/gradle.properties | 1 - .../libraryProject/build.gradle | 52 ------------------- .../src/main/kotlin/example/library/Adder.kt | 6 --- .../main/kotlin/example/library/Counter.kt | 15 ------ .../kotlin2JsProject/mainProject/build.gradle | 44 ---------------- .../src/main/kotlin/example/main.kt | 19 ------- .../kotlin2JsProject/settings.gradle | 1 - .../kotlin2JsProject/web/index.html | 11 ---- .../build.gradle | 17 ------ .../gradle.properties | 1 - .../libA/build.gradle | 1 - .../libA/src/main/kotlin/PlatformClassA.kt | 7 --- .../libA/src/test/kotlin/PlatformTestA.kt | 7 --- .../libB/build.gradle | 1 - .../libB/src/main/kotlin/PlatformClassB.kt | 7 --- .../libB/src/test/kotlin/PlatformTestB.kt | 7 --- .../libJvm/build.gradle | 8 --- .../libJvm/src/main/kotlin/PlatformClass.kt | 9 ---- .../libJvm/src/main/kotlin/javaLibUse.kt | 7 --- .../libJvm/src/test/kotlin/PlatformTest.kt | 9 ---- .../settings.gradle | 1 - .../app-common/build.gradle | 5 -- .../app-common/src/main/kotlin/commonApp.kt | 10 ---- .../sample-old-style-app/app-jvm/build.gradle | 10 ---- .../app-jvm/src/main/kotlin/jvmApp.kt | 10 ---- .../sample-old-style-app/build.gradle | 18 ------- .../sample-old-style-app/gradle.properties | 1 - .../sample-old-style-app/settings.gradle | 1 - .../kotlin-platform-android.properties | 1 - .../kotlin-platform-js.properties | 1 - .../kotlin-platform-jvm.properties | 1 - ...tbrains.kotlin.platform.android.properties | 1 - ...rg.jetbrains.kotlin.platform.js.properties | 1 - ...g.jetbrains.kotlin.platform.jvm.properties | 1 - 41 files changed, 20 insertions(+), 340 deletions(-) delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/gradle.properties delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/src/main/kotlin/example/Dummy.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/src/test/kotlin/example/DummyTest.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/gradle.properties delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/src/main/kotlin/example/library/Adder.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/src/main/kotlin/example/library/Counter.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/src/main/kotlin/example/main.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/settings.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/web/index.html delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/build.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/gradle.properties delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libA/build.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libA/src/main/kotlin/PlatformClassA.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libA/src/test/kotlin/PlatformTestA.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libB/build.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libB/src/main/kotlin/PlatformClassB.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libB/src/test/kotlin/PlatformTestB.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/build.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/src/main/kotlin/PlatformClass.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/src/main/kotlin/javaLibUse.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/src/test/kotlin/PlatformTest.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/settings.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-common/build.gradle delete mode 100644 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 delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-jvm/build.gradle delete mode 100644 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 delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/build.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/gradle.properties delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/settings.gradle delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin-platform-android.properties delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin-platform-js.properties delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin-platform-jvm.properties delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.platform.android.properties delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.platform.js.properties delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.platform.jvm.properties diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt index 714fc7f50dc..bfb9f09b2af 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt +++ b/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 } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KaptModelIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KaptModelIT.kt index 335c8f6acd9..c12fc11c189 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KaptModelIT.kt +++ b/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 { assertNull(getModel(":")) assertNull(getModel(":libraryProject")) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeDownloadAndPlatformLibsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeDownloadAndPlatformLibsIT.kt index 133da03fb7c..bf4b2999703 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeDownloadAndPlatformLibsIT.kt +++ b/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: ") } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle deleted file mode 100644 index 1e2ee75bb9c..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle +++ /dev/null @@ -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"] \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/gradle.properties deleted file mode 100644 index 777bcc3bbe1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.internal.mpp12x.deprecation.suppress=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/src/main/kotlin/example/Dummy.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/src/main/kotlin/example/Dummy.kt deleted file mode 100644 index cf5772ad7ee..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/src/main/kotlin/example/Dummy.kt +++ /dev/null @@ -1,8 +0,0 @@ -package example - -class Dummy { - fun f(): Int { - return 23 - } -} - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/src/test/kotlin/example/DummyTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/src/test/kotlin/example/DummyTest.kt deleted file mode 100644 index 4da1441f8d4..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/src/test/kotlin/example/DummyTest.kt +++ /dev/null @@ -1,8 +0,0 @@ -package example - -class DummyTest { - fun test() { - Dummy().f() - } -} - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/gradle.properties deleted file mode 100644 index 777bcc3bbe1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.internal.mpp12x.deprecation.suppress=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle deleted file mode 100644 index 055643ee0a2..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle +++ /dev/null @@ -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) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/src/main/kotlin/example/library/Adder.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/src/main/kotlin/example/library/Adder.kt deleted file mode 100644 index 904c1cc1ded..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/src/main/kotlin/example/library/Adder.kt +++ /dev/null @@ -1,6 +0,0 @@ -package example - -class Adder { - public fun add(x: Int, y: Int): Int = x + y -} - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/src/main/kotlin/example/library/Counter.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/src/main/kotlin/example/library/Counter.kt deleted file mode 100644 index b2886b3b7c9..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/src/main/kotlin/example/library/Counter.kt +++ /dev/null @@ -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) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle deleted file mode 100644 index 3abc31fb8c8..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle +++ /dev/null @@ -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/")) - } - } - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/src/main/kotlin/example/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/src/main/kotlin/example/main.kt deleted file mode 100644 index 63470ec6320..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/src/main/kotlin/example/main.kt +++ /dev/null @@ -1,19 +0,0 @@ -package example - -import kotlinx.browser.document -import example.library.Counter - - -fun main(args: Array) { - 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() -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/settings.gradle deleted file mode 100644 index 9eeb29d9776..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include 'mainProject', 'libraryProject' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/web/index.html b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/web/index.html deleted file mode 100644 index b9b734bfbd3..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/web/index.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/build.gradle deleted file mode 100644 index e505e9779cb..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -buildscript { - repositories { - mavenLocal() - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -allprojects { - repositories { - mavenLocal() - mavenCentral() - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/gradle.properties deleted file mode 100644 index 777bcc3bbe1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.internal.mpp12x.deprecation.suppress=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libA/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libA/build.gradle deleted file mode 100644 index 48e89733657..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libA/build.gradle +++ /dev/null @@ -1 +0,0 @@ -apply plugin: 'kotlin-platform-common' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libA/src/main/kotlin/PlatformClassA.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libA/src/main/kotlin/PlatformClassA.kt deleted file mode 100644 index 42dd3008c2d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libA/src/main/kotlin/PlatformClassA.kt +++ /dev/null @@ -1,7 +0,0 @@ -package foo - -expect class PlatformClassA { - val valueA: String -} - -class CommonClassA \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libA/src/test/kotlin/PlatformTestA.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libA/src/test/kotlin/PlatformTestA.kt deleted file mode 100644 index 1b9fe7acf49..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libA/src/test/kotlin/PlatformTestA.kt +++ /dev/null @@ -1,7 +0,0 @@ -package foo - -expect class PlatformTestA { - val valueA: PlatformClassA -} - -class CommonTestA(val commonClassA: CommonClassA) \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libB/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libB/build.gradle deleted file mode 100644 index 48e89733657..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libB/build.gradle +++ /dev/null @@ -1 +0,0 @@ -apply plugin: 'kotlin-platform-common' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libB/src/main/kotlin/PlatformClassB.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libB/src/main/kotlin/PlatformClassB.kt deleted file mode 100644 index 31dbe19acad..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libB/src/main/kotlin/PlatformClassB.kt +++ /dev/null @@ -1,7 +0,0 @@ -package foo - -expect class PlatformClassB { - val valueB: String -} - -class CommonClassB \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libB/src/test/kotlin/PlatformTestB.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libB/src/test/kotlin/PlatformTestB.kt deleted file mode 100644 index b2e869787dd..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libB/src/test/kotlin/PlatformTestB.kt +++ /dev/null @@ -1,7 +0,0 @@ -package foo - -expect class PlatformTestB { - val valueB: PlatformClassB -} - -class CommonTestB(val commonClassB: CommonClassB) \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/build.gradle deleted file mode 100644 index 1646db865b0..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/build.gradle +++ /dev/null @@ -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' -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/src/main/kotlin/PlatformClass.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/src/main/kotlin/PlatformClass.kt deleted file mode 100644 index 5576db46dd7..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/src/main/kotlin/PlatformClass.kt +++ /dev/null @@ -1,9 +0,0 @@ -package foo - -actual class PlatformClassA { - actual val valueA: String = "JVM" -} - -actual class PlatformClassB { - actual val valueB: String = "JVM" -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/src/main/kotlin/javaLibUse.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/src/main/kotlin/javaLibUse.kt deleted file mode 100644 index c48348ed34e..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/src/main/kotlin/javaLibUse.kt +++ /dev/null @@ -1,7 +0,0 @@ -package foo - -import com.google.common.collect.ImmutableSet - -fun main(args: Array) { - val colors = ImmutableSet.of("red", "orange", "yellow") -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/src/test/kotlin/PlatformTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/src/test/kotlin/PlatformTest.kt deleted file mode 100644 index 9c8b3f09c61..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/libJvm/src/test/kotlin/PlatformTest.kt +++ /dev/null @@ -1,9 +0,0 @@ -package foo - -actual class PlatformTestA { - actual val valueA: PlatformClassA = PlatformClassA() -} - -actual class PlatformTestB { - actual val valueB: PlatformClassB = PlatformClassB() -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/settings.gradle deleted file mode 100644 index a62b2180eef..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformMultipleCommonModules/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':libA', ':libB', ':libJvm', ':libJs' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-common/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-common/build.gradle deleted file mode 100644 index 6f0d0f42837..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-common/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -apply plugin: 'kotlin-platform-common' - -dependencies { - implementation 'com.example:sample-lib:1.0' -} \ No newline at end of file diff --git a/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 b/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 deleted file mode 100644 index 47ef85a09bf..00000000000 --- a/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 +++ /dev/null @@ -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) { - expectedFun() -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-jvm/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-jvm/build.gradle deleted file mode 100644 index 82b23da4c1b..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-jvm/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -apply plugin: 'kotlin' -apply plugin: 'application' - -dependencies { - implementation 'com.example:sample-lib:1.0' -} - -application { - mainClass = 'com.example.app.JvmAppKt' -} \ No newline at end of file diff --git a/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 b/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 deleted file mode 100644 index 47ef85a09bf..00000000000 --- a/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 +++ /dev/null @@ -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) { - expectedFun() -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/build.gradle deleted file mode 100644 index f7089d756c9..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/build.gradle +++ /dev/null @@ -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. - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/gradle.properties deleted file mode 100644 index 777bcc3bbe1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.internal.mpp12x.deprecation.suppress=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/settings.gradle deleted file mode 100644 index 3d1b9833643..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include 'app-common', 'app-jvm' \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin-platform-android.properties b/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin-platform-android.properties deleted file mode 100644 index 48b0616717e..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin-platform-android.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinPlatformAndroidPlugin \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin-platform-js.properties b/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin-platform-js.properties deleted file mode 100644 index a8b3400c856..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin-platform-js.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJsPlugin \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin-platform-jvm.properties b/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin-platform-jvm.properties deleted file mode 100644 index 8107ccd3f55..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin-platform-jvm.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.platform.android.properties b/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.platform.android.properties deleted file mode 100644 index 48b0616717e..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.platform.android.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinPlatformAndroidPlugin \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.platform.js.properties b/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.platform.js.properties deleted file mode 100644 index a8b3400c856..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.platform.js.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJsPlugin \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.platform.jvm.properties b/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.platform.jvm.properties deleted file mode 100644 index 8107ccd3f55..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.platform.jvm.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin \ No newline at end of file