azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix JPS import

Browse Source 
Exclude kotlin-stdlib-js project for JPS build. Related to KT-56106

#KT-61059 Fixed


Merge-request: KT-MR-11527
Merged-by: Aleksei Cherepanov <aleksei.cherepanov@jetbrains.com>
This commit is contained in:
Aleksei.Cherepanov
2023-08-09 14:37:21 +00:00
committed by Space Team
parent affe0754bf
commit c8c3565a24
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/jps-build/build.gradle.kts
-2
View File
@@ -1,7 +1,6 @@
description = "Stdlib configuration for JPS build (to be interpreted during IDEA project import)" description = "Stdlib configuration for JPS build (to be interpreted during IDEA project import)"
val stdlibMinimal by configurations.creating val stdlibMinimal by configurations.creating
val stdlibJS by configurations.creating
val stdlibSources by configurations.creating val stdlibSources by configurations.creating
val compilerLib by configurations.creating val compilerLib by configurations.creating
@@ -12,7 +11,6 @@ val builtins by configurations.creating
dependencies { dependencies {
stdlibMinimal("org.jetbrains.kotlin:kotlin-stdlib-jvm-minimal-for-test:$bootstrapKotlinVersion") 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 } stdlibSources("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion:sources") { isTransitive = false }
builtins("org.jetbrains.kotlin:builtins:$bootstrapKotlinVersion") builtins("org.jetbrains.kotlin:builtins:$bootstrapKotlinVersion")
repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/jps.gradle.kts
-5
View File
@@ -355,7 +355,6 @@ fun NamedDomainObjectContainer<TopLevelArtifact>.dist() {
val stdlibMinimal by distLibrariesProject.configurations val stdlibMinimal by distLibrariesProject.configurations
val commonStdlib by distLibrariesProject.configurations val commonStdlib by distLibrariesProject.configurations
val commonStdlibSources by distLibrariesProject.configurations val commonStdlibSources by distLibrariesProject.configurations
val stdlibJS by distLibrariesProject.configurations
val stdlibSources by distLibrariesProject.configurations val stdlibSources by distLibrariesProject.configurations
create("dist") { create("dist") {
@@ -384,10 +383,6 @@ fun NamedDomainObjectContainer<TopLevelArtifact>.dist() {
} }
} }
directory("js") {
extractedDirectory(stdlibJS.singleFile)
}
directory("kotlinc") { directory("kotlinc") {
artifact("kotlinc") artifact("kotlinc")
} }