From c8c3565a248d64f3826764188fa666814964b04a Mon Sep 17 00:00:00 2001 From: "Aleksei.Cherepanov" Date: Wed, 9 Aug 2023 14:37:21 +0000 Subject: [PATCH] Fix JPS import Exclude kotlin-stdlib-js project for JPS build. Related to KT-56106 #KT-61059 Fixed Merge-request: KT-MR-11527 Merged-by: Aleksei Cherepanov --- libraries/stdlib/jps-build/build.gradle.kts | 2 -- .../buildsrc-compat/src/main/kotlin/jps.gradle.kts | 5 ----- 2 files changed, 7 deletions(-) diff --git a/libraries/stdlib/jps-build/build.gradle.kts b/libraries/stdlib/jps-build/build.gradle.kts index bdf54bca786..bebf4a3cb6f 100644 --- a/libraries/stdlib/jps-build/build.gradle.kts +++ b/libraries/stdlib/jps-build/build.gradle.kts @@ -1,7 +1,6 @@ description = "Stdlib configuration for JPS build (to be interpreted during IDEA project import)" val stdlibMinimal by configurations.creating -val stdlibJS by configurations.creating val stdlibSources by configurations.creating val compilerLib by configurations.creating @@ -12,7 +11,6 @@ val builtins by configurations.creating dependencies { stdlibMinimal("org.jetbrains.kotlin:kotlin-stdlib-jvm-minimal-for-test:$bootstrapKotlinVersion") - stdlibJS("org.jetbrains.kotlin:kotlin-stdlib-js:$bootstrapKotlinVersion") { isTransitive = false } stdlibSources("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion:sources") { isTransitive = false } builtins("org.jetbrains.kotlin:builtins:$bootstrapKotlinVersion") diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/jps.gradle.kts b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/jps.gradle.kts index da750b8f19e..ff5042f3edf 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/jps.gradle.kts +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/jps.gradle.kts @@ -355,7 +355,6 @@ fun NamedDomainObjectContainer.dist() { val stdlibMinimal by distLibrariesProject.configurations val commonStdlib by distLibrariesProject.configurations val commonStdlibSources by distLibrariesProject.configurations - val stdlibJS by distLibrariesProject.configurations val stdlibSources by distLibrariesProject.configurations create("dist") { @@ -384,10 +383,6 @@ fun NamedDomainObjectContainer.dist() { } } - directory("js") { - extractedDirectory(stdlibJS.singleFile) - } - directory("kotlinc") { artifact("kotlinc") }