From d16f246375bb678f998b0d6f516b97879e385956 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Fri, 17 Jul 2020 09:52:04 +0300 Subject: [PATCH] Wizard: do not add stdlib for gradle based projects #KT-40407 fixed --- .../android/expected/android/build.gradle | 1 - .../android/expected/android/build.gradle.kts | 1 - .../jsNodeAndBrowserTargets/build.gradle | 8 +--- .../jsNodeAndBrowserTargets/build.gradle.kts | 12 +----- .../jvmTarget/build.gradle | 4 +- .../jvmTarget/build.gradle.kts | 6 +-- .../jvmTargetWithJava/build.gradle | 4 +- .../jvmTargetWithJava/build.gradle.kts | 6 +-- .../expected/a/build.gradle | 1 - .../expected/a/build.gradle.kts | 1 - .../expected/b/build.gradle | 1 - .../expected/b/build.gradle.kts | 1 - .../expected/c/build.gradle | 1 - .../expected/c/build.gradle.kts | 1 - .../expected/d/build.gradle | 1 - .../expected/d/build.gradle.kts | 1 - .../expected/b/build.gradle | 1 - .../expected/b/build.gradle.kts | 1 - .../expected/b/c/build.gradle | 1 - .../expected/b/c/build.gradle.kts | 1 - .../expected/build.gradle | 1 - .../expected/build.gradle.kts | 1 - .../kotlinJvm/build.gradle | 1 - .../kotlinJvm/build.gradle.kts | 1 - .../simpleMultiplatform/build.gradle | 8 +--- .../simpleMultiplatform/build.gradle.kts | 12 +----- .../singleplatformJs/expected/build.gradle | 1 - .../expected/build.gradle.kts | 1 - .../backendApplication/build.gradle | 1 - .../backendApplication/build.gradle.kts | 1 - .../consoleApplication/build.gradle | 1 - .../consoleApplication/build.gradle.kts | 1 - .../frontendApplication/build.gradle | 1 - .../frontendApplication/build.gradle.kts | 1 - .../fullStackWebApplication/build.gradle | 6 +-- .../fullStackWebApplication/build.gradle.kts | 8 +--- .../multiplatformApplication/build.gradle | 4 +- .../multiplatformApplication/build.gradle.kts | 6 +-- .../multiplatformLibrary/build.gradle | 12 ++---- .../multiplatformLibrary/build.gradle.kts | 18 ++------ .../expected/androidApp/build.gradle | 1 - .../expected/androidApp/build.gradle.kts | 1 - .../expected/shared/build.gradle | 5 +-- .../expected/shared/build.gradle.kts | 7 +--- .../expected/build.gradle | 5 +-- .../expected/build.gradle.kts | 7 +--- .../plugins/kotlin/ModulesToIRsConverter.kt | 41 +++++++------------ 47 files changed, 41 insertions(+), 166 deletions(-) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle index e991dbe6cb1..ef61fb446ea 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle @@ -19,7 +19,6 @@ dependencies { implementation 'androidx.core:core-ktx:1.2.0' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7' } android { compileSdkVersion 29 diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts index 6ab7db91117..9fb200647db 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts @@ -19,7 +19,6 @@ dependencies { implementation("androidx.core:core-ktx:1.2.0") implementation("androidx.appcompat:appcompat:1.1.0") implementation("androidx.constraintlayout:constraintlayout:1.1.3") - implementation(kotlin("stdlib-jdk7")) } android { compileSdkVersion(29) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle index d9a268d0326..5d1c294cae1 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle @@ -35,17 +35,13 @@ kotlin { } sourceSets { nodeJsMain { - dependencies { - implementation kotlin('stdlib-js') - } + } nodeJsTest { } browserMain { - dependencies { - implementation kotlin('stdlib-js') - } + } browserTest { dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle.kts index 2e26636ab11..9d1def47fe1 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jsNodeAndBrowserTargets/build.gradle.kts @@ -34,17 +34,9 @@ kotlin { } } sourceSets { - val nodeJsMain by getting { - dependencies { - implementation(kotlin("stdlib-js")) - } - } + val nodeJsMain by getting val nodeJsTest by getting - val browserMain by getting { - dependencies { - implementation(kotlin("stdlib-js")) - } - } + val browserMain by getting val browserTest by getting { dependencies { implementation(kotlin("test-js")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle index a29574bc223..4d86813ea33 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle @@ -18,9 +18,7 @@ kotlin { } sourceSets { jvmMain { - dependencies { - implementation kotlin('stdlib-jdk8') - } + } jvmTest { dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle.kts index 8c64f65dc73..4034b26440c 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTarget/build.gradle.kts @@ -17,11 +17,7 @@ kotlin { } } sourceSets { - val jvmMain by getting { - dependencies { - implementation(kotlin("stdlib-jdk8")) - } - } + val jvmMain by getting val jvmTest by getting { dependencies { implementation(kotlin("test-junit")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle index d6f4677ad3b..33d5d4ed1ed 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle @@ -19,9 +19,7 @@ kotlin { } sourceSets { jvmMain { - dependencies { - implementation kotlin('stdlib-jdk8') - } + } jvmTest { dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle.kts index b70935d8e0a..74d0b84aa23 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmTargetWithJava/build.gradle.kts @@ -18,11 +18,7 @@ kotlin { withJava() } sourceSets { - val jvmMain by getting { - dependencies { - implementation(kotlin("stdlib-jdk8")) - } - } + val jvmMain by getting val jvmTest by getting { dependencies { implementation(kotlin("test-junit")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle index 4a3c78687b4..223a6063cd5 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle @@ -16,7 +16,6 @@ dependencies { implementation project(':b') implementation project(':c') testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' } tasks.withType(KotlinCompile) { kotlinOptions.jvmTarget = '1.8' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle.kts index 072e348b52b..940edf72a54 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/build.gradle.kts @@ -16,7 +16,6 @@ dependencies { implementation(project(":b")) implementation(project(":c")) testImplementation(kotlin("test-junit")) - implementation(kotlin("stdlib-jdk8")) } tasks.withType() { kotlinOptions.jvmTarget = "1.8" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle index 6cd161bad29..a654cc13b6b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle @@ -16,7 +16,6 @@ dependencies { implementation project(':c') implementation project(':d') testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' } tasks.withType(KotlinCompile) { kotlinOptions.jvmTarget = '1.8' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle.kts index b8f96ad63cb..892f14087f8 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/build.gradle.kts @@ -16,7 +16,6 @@ dependencies { implementation(project(":c")) implementation(project(":d")) testImplementation(kotlin("test-junit")) - implementation(kotlin("stdlib-jdk8")) } tasks.withType() { kotlinOptions.jvmTarget = "1.8" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle index 485e799760e..81fb41a2719 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle @@ -14,7 +14,6 @@ repositories { } dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' } tasks.withType(KotlinCompile) { kotlinOptions.jvmTarget = '1.8' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle.kts index 7c4bccc9cb4..8c22e352f22 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/build.gradle.kts @@ -14,7 +14,6 @@ repositories { } dependencies { testImplementation(kotlin("test-junit")) - implementation(kotlin("stdlib-jdk8")) } tasks.withType() { kotlinOptions.jvmTarget = "1.8" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle index 74b80611d5d..6246d7f1253 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle @@ -15,7 +15,6 @@ repositories { dependencies { implementation project(':a') testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' } tasks.withType(KotlinCompile) { kotlinOptions.jvmTarget = '1.8' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle.kts index 5112ba04fcb..91bbaf9f77c 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/build.gradle.kts @@ -15,7 +15,6 @@ repositories { dependencies { implementation(project(":a")) testImplementation(kotlin("test-junit")) - implementation(kotlin("stdlib-jdk8")) } tasks.withType() { kotlinOptions.jvmTarget = "1.8" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle index 1061b219efd..61186118f72 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle @@ -15,7 +15,6 @@ repositories { dependencies { rootProject testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' } tasks.withType(KotlinCompile) { kotlinOptions.jvmTarget = '1.8' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle.kts index ffa0d6cf3b2..5559e6c3225 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/build.gradle.kts @@ -15,7 +15,6 @@ repositories { dependencies { rootProject testImplementation(kotlin("test-junit")) - implementation(kotlin("stdlib-jdk8")) } tasks.withType() { kotlinOptions.jvmTarget = "1.8" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle index 18f687975f7..fc01c93e25a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle @@ -15,7 +15,6 @@ repositories { dependencies { implementation project(':b') testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' } tasks.withType(KotlinCompile) { kotlinOptions.jvmTarget = '1.8' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle.kts index 8abc17c5133..1cc910e9136 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/build.gradle.kts @@ -15,7 +15,6 @@ repositories { dependencies { implementation(project(":b")) testImplementation(kotlin("test-junit")) - implementation(kotlin("stdlib-jdk8")) } tasks.withType() { kotlinOptions.jvmTarget = "1.8" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle index 485e799760e..81fb41a2719 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle @@ -14,7 +14,6 @@ repositories { } dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' } tasks.withType(KotlinCompile) { kotlinOptions.jvmTarget = '1.8' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle.kts index 7c4bccc9cb4..8c22e352f22 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/build.gradle.kts @@ -14,7 +14,6 @@ repositories { } dependencies { testImplementation(kotlin("test-junit")) - implementation(kotlin("stdlib-jdk8")) } tasks.withType() { kotlinOptions.jvmTarget = "1.8" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle index d0a3d6ad616..3f1eb089cb8 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle @@ -14,7 +14,6 @@ repositories { } dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' } tasks.withType(KotlinCompile) { kotlinOptions.jvmTarget = '1.6' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle.kts index 9e108f45939..7fc188bc2e1 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/build.gradle.kts @@ -14,7 +14,6 @@ repositories { } dependencies { testImplementation(kotlin("test-junit")) - implementation(kotlin("stdlib-jdk8")) } tasks.withType() { kotlinOptions.jvmTarget = "1.6" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle index 300c8de93ac..8379c95b296 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle @@ -35,9 +35,7 @@ kotlin { } sourceSets { jvmMain { - dependencies { - implementation kotlin('stdlib-jdk8') - } + } jvmTest { dependencies { @@ -45,9 +43,7 @@ kotlin { } } aMain { - dependencies { - implementation kotlin('stdlib-js') - } + } aTest { dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle.kts index 59bb01256f1..7ea93a530df 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/simpleMultiplatform/build.gradle.kts @@ -34,21 +34,13 @@ kotlin { } } sourceSets { - val jvmMain by getting { - dependencies { - implementation(kotlin("stdlib-jdk8")) - } - } + val jvmMain by getting val jvmTest by getting { dependencies { implementation(kotlin("test-junit")) } } - val aMain by getting { - dependencies { - implementation(kotlin("stdlib-js")) - } - } + val aMain by getting val aTest by getting { dependencies { implementation(kotlin("test-js")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle index f95878422bc..325a0153ec6 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle @@ -12,7 +12,6 @@ repositories { } dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-js' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-js' } kotlin { js { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle.kts index 67c87377b8f..b11d1110556 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singleplatformJs/expected/build.gradle.kts @@ -12,7 +12,6 @@ repositories { } dependencies { testImplementation(kotlin("test-js")) - implementation(kotlin("stdlib-js")) } kotlin { js { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle index 35dbe30de50..28145d9fe3d 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle @@ -14,7 +14,6 @@ repositories { } dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' } tasks.withType(KotlinCompile) { kotlinOptions.jvmTarget = '1.8' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts index d7d5adfe77d..0a680471afb 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts @@ -14,7 +14,6 @@ repositories { } dependencies { testImplementation(kotlin("test-junit")) - implementation(kotlin("stdlib-jdk8")) } tasks.withType() { kotlinOptions.jvmTarget = "1.8" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle index 0618177ae0a..87fcaff55ff 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle @@ -15,7 +15,6 @@ repositories { } dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-junit' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' } tasks.withType(KotlinCompile) { kotlinOptions.jvmTarget = '1.8' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts index a745162b3ac..82c909f4843 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts @@ -15,7 +15,6 @@ repositories { } dependencies { testImplementation(kotlin("test-junit")) - implementation(kotlin("stdlib-jdk8")) } tasks.withType() { kotlinOptions.jvmTarget = "1.8" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle index 3befa228911..632f23b10ff 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle @@ -19,7 +19,6 @@ repositories { } dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-js' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-js' implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts index 2a833b7d3b5..de76caed775 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts @@ -19,7 +19,6 @@ repositories { } dependencies { testImplementation(kotlin("test-js")) - implementation(kotlin("stdlib-js")) implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION") diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle index 2d50115f037..8cf2c27e68a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle @@ -49,9 +49,7 @@ kotlin { } sourceSets { commonMain { - dependencies { - implementation kotlin('stdlib-common') - } + } commonTest { dependencies { @@ -61,7 +59,6 @@ kotlin { } jvmMain { dependencies { - implementation kotlin('stdlib-jdk8') implementation 'io.ktor:ktor-server-netty:1.3.2-KOTLIN_VERSION' implementation 'io.ktor:ktor-html-builder:1.3.2-KOTLIN_VERSION' implementation 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.1-KOTLIN_VERSION' @@ -74,7 +71,6 @@ kotlin { } jsMain { dependencies { - implementation kotlin('stdlib-js') implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts index 6bf514d12ee..16e6bde6df4 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts @@ -48,11 +48,7 @@ kotlin { } } sourceSets { - val commonMain by getting { - dependencies { - implementation(kotlin("stdlib-common")) - } - } + val commonMain by getting val commonTest by getting { dependencies { implementation(kotlin("test-common")) @@ -61,7 +57,6 @@ kotlin { } val jvmMain by getting { dependencies { - implementation(kotlin("stdlib-jdk8")) implementation("io.ktor:ktor-server-netty:1.3.2-KOTLIN_VERSION") implementation("io.ktor:ktor-html-builder:1.3.2-KOTLIN_VERSION") implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.1-KOTLIN_VERSION") @@ -74,7 +69,6 @@ kotlin { } val jsMain by getting { dependencies { - implementation(kotlin("stdlib-js")) implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION") diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle index 558f9361b2e..7ca68f3f7ba 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle @@ -14,9 +14,7 @@ kotlin { sourceSets { commonMain { - dependencies { - implementation kotlin('stdlib-common') - } + } commonTest { dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts index a8412d9b617..8d95ced8dd1 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts @@ -13,11 +13,7 @@ repositories { kotlin { sourceSets { - val commonMain by getting { - dependencies { - implementation(kotlin("stdlib-common")) - } - } + val commonMain by getting val commonTest by getting { dependencies { implementation(kotlin("test-common")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle index 8a389c53720..77f248a3a73 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle @@ -39,9 +39,7 @@ kotlin { sourceSets { commonMain { - dependencies { - implementation kotlin('stdlib-common') - } + } commonTest { dependencies { @@ -50,9 +48,7 @@ kotlin { } } jvmMain { - dependencies { - implementation kotlin('stdlib-jdk8') - } + } jvmTest { dependencies { @@ -60,9 +56,7 @@ kotlin { } } jsMain { - dependencies { - implementation kotlin('stdlib-js') - } + } jsTest { dependencies { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts index 1d7e25dfcf3..fcbc984028b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts @@ -37,32 +37,20 @@ kotlin { sourceSets { - val commonMain by getting { - dependencies { - implementation(kotlin("stdlib-common")) - } - } + val commonMain by getting val commonTest by getting { dependencies { implementation(kotlin("test-common")) implementation(kotlin("test-annotations-common")) } } - val jvmMain by getting { - dependencies { - implementation(kotlin("stdlib-jdk8")) - } - } + val jvmMain by getting val jvmTest by getting { dependencies { implementation(kotlin("test-junit")) } } - val jsMain by getting { - dependencies { - implementation(kotlin("stdlib-js")) - } - } + val jsMain by getting val jsTest by getting { dependencies { implementation(kotlin("test-js")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle index 7c84099ee5c..78f656810c3 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle @@ -20,7 +20,6 @@ dependencies { implementation 'androidx.core:core-ktx:1.2.0' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7' } android { compileSdkVersion 29 diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts index 87cc21c9fe6..d2638f53201 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts @@ -20,7 +20,6 @@ dependencies { implementation("androidx.core:core-ktx:1.2.0") implementation("androidx.appcompat:appcompat:1.1.0") implementation("androidx.constraintlayout:constraintlayout:1.1.3") - implementation(kotlin("stdlib-jdk7")) } android { compileSdkVersion(29) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle index 616ab2fb265..55fd4e6e720 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle @@ -28,9 +28,7 @@ kotlin { } sourceSets { commonMain { - dependencies { - implementation kotlin('stdlib-common') - } + } commonTest { dependencies { @@ -40,7 +38,6 @@ kotlin { } androidMain { dependencies { - implementation kotlin('stdlib-jdk7') implementation 'androidx.core:core-ktx:1.2.0' } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts index 4d9b88a8c4d..d9b1a038a7a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts @@ -27,11 +27,7 @@ kotlin { } } sourceSets { - val commonMain by getting { - dependencies { - implementation(kotlin("stdlib-common")) - } - } + val commonMain by getting val commonTest by getting { dependencies { implementation(kotlin("test-common")) @@ -40,7 +36,6 @@ kotlin { } val androidMain by getting { dependencies { - implementation(kotlin("stdlib-jdk7")) implementation("androidx.core:core-ktx:1.2.0") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle index 1bb2c1ea691..1674d352bee 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle @@ -26,9 +26,7 @@ kotlin { } sourceSets { commonMain { - dependencies { - implementation kotlin('stdlib-common') - } + } commonTest { dependencies { @@ -38,7 +36,6 @@ kotlin { } androidMain { dependencies { - implementation kotlin('stdlib-jdk7') implementation 'androidx.core:core-ktx:1.2.0' } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts index ba6c9b1c810..2433f0e2669 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts @@ -25,11 +25,7 @@ kotlin { } } sourceSets { - val commonMain by getting { - dependencies { - implementation(kotlin("stdlib-common")) - } - } + val commonMain by getting val commonTest by getting { dependencies { implementation(kotlin("test-common")) @@ -38,7 +34,6 @@ kotlin { } val androidMain by getting { dependencies { - implementation(kotlin("stdlib-jdk7")) implementation("androidx.core:core-ktx:1.2.0") } } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt index a3614b75495..a4893d2af47 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/ModulesToIRsConverter.kt @@ -9,11 +9,11 @@ import org.jetbrains.kotlin.tools.projectWizard.core.service.WizardKotlinVersion import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.* import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.* import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemType +import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.buildSystemType import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.gradle.GradlePlugin import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.isGradle import org.jetbrains.kotlin.tools.projectWizard.plugins.templates.TemplatesPlugin import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.* -import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version import java.nio.file.Path data class ModulesToIrConversionData( @@ -143,16 +143,7 @@ class ModulesToIRsConverter( val dependenciesIRs = buildPersistenceList { +moduleDependencies with(configurator) { +createModuleIRs(this@createSinglePlatformModule, data, module) } - addIfNotNull( - configurator.createStdlibType(data, module)?.let { stdlibType -> - KotlinStdlibDependencyIR( - type = stdlibType, - isInMppModule = false, - kotlinVersion = data.kotlinVersion, - dependencyType = DependencyType.MAIN - ) - } - ) + addIfNotNull(addSdtLibForNonGradleSignleplatformModule(module)) } val moduleIr = SingleplatformModuleIR( @@ -237,25 +228,11 @@ class ModulesToIRsConverter( mutateProjectStructureByModuleConfigurator(target, modulePath) val sourcesetss = target.sourcesets.map { sourceset -> val sourcesetName = target.name + sourceset.sourcesetType.name.capitalize() - val sourcesetIrs = buildList { - if (sourceset.sourcesetType == SourcesetType.main) { - addIfNotNull( - target.configurator.createStdlibType(data, target)?.let { stdlibType -> - KotlinStdlibDependencyIR( - type = stdlibType, - isInMppModule = true, - kotlinVersion = data.kotlinVersion, - dependencyType = DependencyType.MAIN - ) - } - ) - } - } MultiplatformSourcesetIR( sourceset.sourcesetType, modulePath / Defaults.SRC_DIR / sourcesetName, target.name, - sourcesetIrs.toPersistentList(), + persistentListOf(), sourceset ) } @@ -283,6 +260,18 @@ class ModulesToIRsConverter( } } + private fun Reader.addSdtLibForNonGradleSignleplatformModule(module: Module): KotlinStdlibDependencyIR? { + // for gradle stdlib is added by default KT-38221 + if (buildSystemType.isGradle) return null + val stdlibType = module.configurator.createStdlibType(data, module) ?: return null + return KotlinStdlibDependencyIR( + type = stdlibType, + isInMppModule = false, + kotlinVersion = data.kotlinVersion, + dependencyType = DependencyType.MAIN + ) + } + private fun Reader.createBuildFileIRs( module: Module, state: ModulesToIrsState