From 222f996d4550a96a0f8a8bd146d0fa24632d35cb Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 4 Aug 2023 15:04:26 +0200 Subject: [PATCH] [stdlib-mpp] Cleanup kotlin.stdlib.mpp build flag (always true) --- build.gradle.kts | 7 ++----- gradle.properties | 1 - libraries/kotlin.test/annotations-common/build.gradle | 2 +- libraries/kotlin.test/common/build.gradle | 2 +- libraries/kotlin.test/js-ir/build.gradle.kts | 2 +- libraries/kotlin.test/js/build.gradle | 2 +- libraries/kotlin.test/jvm/build.gradle | 2 +- .../src/main/kotlin/BuildPropertiesExt.kt | 3 --- .../buildsrc-compat/src/main/kotlin/repoDependencies.kt | 4 ++-- settings.gradle | 9 +-------- 10 files changed, 10 insertions(+), 24 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8e790a3d606..aec6b1be1b0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -345,7 +345,6 @@ val coreLibProjects by extra { listOfNotNull( ":kotlin-stdlib", ":kotlin-stdlib-common", - ":kotlin-stdlib-js".takeIf { !kotlinBuildProperties.kotlinStdlibMpp }, ":kotlin-stdlib-jdk7", ":kotlin-stdlib-jdk8", ":kotlin-test", @@ -360,9 +359,8 @@ val coreLibProjects by extra { ) } val mppProjects by extra { - listOfNotNull( - ":kotlin-stdlib-mpp".takeUnless { kotlinBuildProperties.kotlinStdlibMpp }, - ":kotlin-stdlib".takeIf { kotlinBuildProperties.kotlinStdlibMpp }, + listOf( + ":kotlin-stdlib", ) } @@ -609,7 +607,6 @@ tasks { register("coreLibsTest") { (coreLibProjects + listOfNotNull( ":kotlin-stdlib:samples", - ":kotlin-stdlib-js-ir".takeIf { !kotlinBuildProperties.kotlinStdlibMpp }, ":kotlin-test:kotlin-test-js-ir".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync }, ":kotlin-test:kotlin-test-js:kotlin-test-js-it".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync }, ":kotlin-test:kotlin-test-js-ir:kotlin-test-js-ir-it".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync }, diff --git a/gradle.properties b/gradle.properties index 5cd40c00a9a..3c0114f6a5d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -56,7 +56,6 @@ kotlin.options.suppressFreeCompilerArgsModificationWarning=true # TODO: add this flag in a granular way to the modules that don't need stdlib? kotlin.stdlib.default.dependency=false kotlin.js.stdlib.dom.api.included=false -kotlin.stdlib.mpp=true # Suppress warnings about using deprecated and unstable plugins in kotlin-stdlib kotlin.internal.mpp12x.deprecation.suppress=true diff --git a/libraries/kotlin.test/annotations-common/build.gradle b/libraries/kotlin.test/annotations-common/build.gradle index 26521cc1445..77b7e84cb3f 100644 --- a/libraries/kotlin.test/annotations-common/build.gradle +++ b/libraries/kotlin.test/annotations-common/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'kotlin-platform-common' JvmToolchain.updateJvmTarget(project, "1.8") dependencies { - api RepoDependencies.kotlinStdlib(project, "mpp") + api RepoDependencies.kotlinStdlib(project) testApi project(":kotlin-test:kotlin-test-common") } diff --git a/libraries/kotlin.test/common/build.gradle b/libraries/kotlin.test/common/build.gradle index e58d8991b77..62f4d5e59cc 100644 --- a/libraries/kotlin.test/common/build.gradle +++ b/libraries/kotlin.test/common/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'kotlin-platform-common' JvmToolchain.updateJvmTarget(project, "1.8") dependencies { - api RepoDependencies.kotlinStdlib(project, "mpp") + api RepoDependencies.kotlinStdlib(project) testApi project(":kotlin-test:kotlin-test-annotations-common") } diff --git a/libraries/kotlin.test/js-ir/build.gradle.kts b/libraries/kotlin.test/js-ir/build.gradle.kts index 7f81b09c2d8..008f2c80c89 100644 --- a/libraries/kotlin.test/js-ir/build.gradle.kts +++ b/libraries/kotlin.test/js-ir/build.gradle.kts @@ -30,7 +30,7 @@ kotlin { sourceSets { named("commonMain") { dependencies { - api(kotlinStdlib("mpp")) + api(kotlinStdlib()) } kotlin.srcDir(commonMainSources) } diff --git a/libraries/kotlin.test/js/build.gradle b/libraries/kotlin.test/js/build.gradle index 835a1056274..1e991beacf8 100644 --- a/libraries/kotlin.test/js/build.gradle +++ b/libraries/kotlin.test/js/build.gradle @@ -15,7 +15,7 @@ configurations { dependencies { expectedBy project(':kotlin-test:kotlin-test-common') expectedBy project(':kotlin-test:kotlin-test-annotations-common') - api RepoDependencies.kotlinStdlib(project, "mpp") + api RepoDependencies.kotlinStdlib(project) } compileKotlin2Js { diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle index 618f0a480d9..5775d0caa55 100644 --- a/libraries/kotlin.test/jvm/build.gradle +++ b/libraries/kotlin.test/jvm/build.gradle @@ -16,7 +16,7 @@ sourceSets { dependencies { expectedBy project(':kotlin-test:kotlin-test-common') - api(RepoDependencies.kotlinStdlib(project, "mpp")) + api(RepoDependencies.kotlinStdlib(project)) testApi(project(":kotlin-test:kotlin-test-junit")) testApi('junit:junit:4.13.2') } diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/BuildPropertiesExt.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/BuildPropertiesExt.kt index 55bc6e97372..4ce9308dd05 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/BuildPropertiesExt.kt +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/BuildPropertiesExt.kt @@ -59,6 +59,3 @@ val KotlinBuildProperties.useFirWithLightTree: Boolean val KotlinBuildProperties.useFirTightIC: Boolean get() = getBoolean("kotlin.build.useFirIC") - -val KotlinBuildProperties.kotlinStdlibMpp: Boolean - get() = getBoolean("kotlin.stdlib.mpp") \ No newline at end of file diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt index 4d3fad877a4..5989559ad21 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt @@ -56,9 +56,9 @@ fun kotlinDep(artifactBaseName: String, version: String, classifier: String? = n @JvmOverloads fun Project.kotlinStdlib(suffix: String? = null, classifier: String? = null): Any { return if (kotlinBuildProperties.useBootstrapStdlib) - kotlinDep(listOfNotNull("stdlib", suffix.takeUnless { kotlinBuildProperties.kotlinStdlibMpp && it == "mpp" }).joinToString("-"), bootstrapKotlinVersion, classifier) + kotlinDep(listOfNotNull("stdlib", suffix).joinToString("-"), bootstrapKotlinVersion, classifier) else - dependencies.project(listOfNotNull(":kotlin-stdlib", suffix.takeUnless { kotlinBuildProperties.kotlinStdlibMpp && it == "mpp" }).joinToString("-"), classifier) + dependencies.project(listOfNotNull(":kotlin-stdlib", suffix).joinToString("-"), classifier) } fun Project.kotlinBuiltins(): Any = kotlinBuiltins(forJvm = false) diff --git a/settings.gradle b/settings.gradle index 96cb58026fa..75cdb10ef20 100644 --- a/settings.gradle +++ b/settings.gradle @@ -581,7 +581,6 @@ if (buildProperties.inJpsBuildIdeaSync) { project(":kotlin-stdlib:jps-build").projectDir = "$rootDir/libraries/stdlib/jps-build" as File } else { // modules that we are currently cannot compile with jps - def stdlibMpp = buildProperties.getBoolean("kotlin.stdlib.mpp", false) include ":core:builtins", ":kotlin-stdlib-common", ":kotlin-stdlib", @@ -607,13 +606,8 @@ if (buildProperties.inJpsBuildIdeaSync) { ":kotlin-test:kotlin-test-wasm-wasi", ":native:native.tests" - if (!stdlibMpp) include ":kotlin-stdlib-js", ":kotlin-stdlib-js-ir" - if (!stdlibMpp) include ":kotlin-stdlib-mpp" - project(':kotlin-stdlib-common').projectDir = "$rootDir/libraries/stdlib/common" as File - project(':kotlin-stdlib').projectDir = "$rootDir/libraries/stdlib" + (stdlibMpp ? "" : "/jvm") as File - if (!stdlibMpp) project(':kotlin-stdlib-js').projectDir = "$rootDir/libraries/stdlib/js-v1" as File - if (!stdlibMpp) project(':kotlin-stdlib-js-ir').projectDir = "$rootDir/libraries/stdlib/js-ir" as File + project(':kotlin-stdlib').projectDir = "$rootDir/libraries/stdlib" as File project(':kotlin-dom-api-compat').projectDir = "$rootDir/libraries/kotlin-dom-api-compat" as File project(':kotlin-stdlib-wasm').projectDir = "$rootDir/libraries/stdlib/wasm" as File project(':kotlin-stdlib-wasm-js').projectDir = "$rootDir/libraries/stdlib/wasm/js" as File @@ -621,7 +615,6 @@ if (buildProperties.inJpsBuildIdeaSync) { project(':kotlin-stdlib-js-ir-minimal-for-test').projectDir = "$rootDir/libraries/stdlib/js-ir-minimal-for-test" as File project(':kotlin-stdlib-jdk7').projectDir = "$rootDir/libraries/stdlib/jdk7" as File project(':kotlin-stdlib-jdk8').projectDir = "$rootDir/libraries/stdlib/jdk8" as File - if (!stdlibMpp) project(':kotlin-stdlib-mpp').projectDir = "$rootDir/libraries/stdlib" as File project(':kotlin-stdlib:samples').projectDir = "$rootDir/libraries/stdlib/samples" as File project(":kotlin-stdlib-jvm-minimal-for-test").projectDir = "$rootDir/libraries/stdlib/jvm-minimal-for-test" as File