Wizard: do not add stdlib for gradle based projects

#KT-40407 fixed

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

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)

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 {

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 {
+        val nodeJsMain by getting
-            dependencies {
-                implementation(kotlin("stdlib-js"))
-            }
-        }
         val nodeJsTest by getting
-        val browserMain by getting {
+        val browserMain by getting
-            dependencies {
-                implementation(kotlin("stdlib-js"))
-            }
-        }
         val browserTest by getting {
             dependencies {
                 implementation(kotlin("test-js"))

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 {

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 {
+        val jvmMain by getting
-            dependencies {
-                implementation(kotlin("stdlib-jdk8"))
-            }
-        }
         val jvmTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))

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 {

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 {
+        val jvmMain by getting
-            dependencies {
-                implementation(kotlin("stdlib-jdk8"))
-            }
-        }
         val jvmTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))

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'

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<KotlinCompile>() {
     kotlinOptions.jvmTarget = "1.8"

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'

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<KotlinCompile>() {
     kotlinOptions.jvmTarget = "1.8"

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'

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<KotlinCompile>() {
     kotlinOptions.jvmTarget = "1.8"

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'

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<KotlinCompile>() {
     kotlinOptions.jvmTarget = "1.8"

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'

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<KotlinCompile>() {
     kotlinOptions.jvmTarget = "1.8"

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'

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<KotlinCompile>() {
     kotlinOptions.jvmTarget = "1.8"

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'

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<KotlinCompile>() {
     kotlinOptions.jvmTarget = "1.8"

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'

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<KotlinCompile>() {
     kotlinOptions.jvmTarget = "1.6"

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 {

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 {
+        val jvmMain by getting
-            dependencies {
-                implementation(kotlin("stdlib-jdk8"))
-            }
-        }
         val jvmTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
             }
         }
-        val aMain by getting {
+        val aMain by getting
-            dependencies {
-                implementation(kotlin("stdlib-js"))
-            }
-        }
         val aTest by getting {
             dependencies {
                 implementation(kotlin("test-js"))

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 {

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 {

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'

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<KotlinCompile>() {
     kotlinOptions.jvmTarget = "1.8"

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'

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<KotlinCompile>() {
     kotlinOptions.jvmTarget = "1.8"

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'

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")

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'

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 {
+        val commonMain by getting
-            dependencies {
-                implementation(kotlin("stdlib-common"))
-            }
-        }
         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")

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 {

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 {
+        val commonMain by getting
-            dependencies {
-                implementation(kotlin("stdlib-common"))
-            }
-        }
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test-common"))

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 {

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 {
+        val commonMain by getting
-            dependencies {
-                implementation(kotlin("stdlib-common"))
-            }
-        }
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test-common"))
                 implementation(kotlin("test-annotations-common"))
             }
         }
-        val jvmMain by getting {
+        val jvmMain by getting
-            dependencies {
-                implementation(kotlin("stdlib-jdk8"))
-            }
-        }
         val jvmTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
             }
         }
-        val jsMain by getting {
+        val jsMain by getting
-            dependencies {
-                implementation(kotlin("stdlib-js"))
-            }
-        }
         val jsTest by getting {
             dependencies {
                 implementation(kotlin("test-js"))

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

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)

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'
             }
         }

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 {
+        val commonMain by getting
-            dependencies {
-                implementation(kotlin("stdlib-common"))
-            }
-        }
         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")
             }
         }

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'
             }
         }

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 {
+        val commonMain by getting
-            dependencies {
-                implementation(kotlin("stdlib-common"))
-            }
-        }
         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")
             }
         }

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<BuildSystemIR> {
                 +moduleDependencies
                 with(configurator) { +createModuleIRs(this@createSinglePlatformModule, data, module) }
-                addIfNotNull(
+                addIfNotNull(addSdtLibForNonGradleSignleplatformModule(module))
-                    configurator.createStdlibType(data, module)?.let { stdlibType ->
-                        KotlinStdlibDependencyIR(
-                            type = stdlibType,
-                            isInMppModule = false,
-                            kotlinVersion = data.kotlinVersion,
-                            dependencyType = DependencyType.MAIN
-                        )
-                    }
-                )
             }
 
             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<BuildSystemIR> {
-                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