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

[stdlib-mpp] Switch kotlin-stdlib project to multiplatform

Browse Source 
#KT-56106
This commit is contained in:
Ilya Gorbunov
2023-03-24 09:51:12 +01:00
committed by Space Team
parent fac620df0b
commit 34720f27d4
9 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
settings.gradle
+5 -4
View File
@@ -578,7 +578,7 @@ 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",
@@ -587,7 +587,6 @@ if (buildProperties.inJpsBuildIdeaSync) {
":kotlin-dom-api-compat",
":kotlin-stdlib-js-ir-minimal-for-test",
":kotlin-stdlib-wasm",
":kotlin-stdlib-mpp",
":kotlin-stdlib-jdk7",
":kotlin-stdlib-jdk8",
":kotlin-stdlib:samples",
@@ -605,8 +604,10 @@ if (buildProperties.inJpsBuildIdeaSync) {
":kotlin-test:kotlin-test-wasm",
":native:native.tests"
if (!stdlibMpp) include ":kotlin-stdlib-mpp"
project(':kotlin-stdlib-common').projectDir = "$rootDir/libraries/stdlib/common" as File
project(':kotlin-stdlib').projectDir = "$rootDir/libraries/stdlib/jvm" as File
project(':kotlin-stdlib').projectDir = "$rootDir/libraries/stdlib" + (stdlibMpp ? "" : "/jvm") as File
project(':kotlin-stdlib-js').projectDir = "$rootDir/libraries/stdlib/js-v1" as File
project(':kotlin-stdlib-js-ir').projectDir = "$rootDir/libraries/stdlib/js-ir" as File
project(':kotlin-dom-api-compat').projectDir = "$rootDir/libraries/kotlin-dom-api-compat" as File
@@ -614,7 +615,7 @@ 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
project(':kotlin-stdlib-mpp').projectDir = "$rootDir/libraries/stdlib" 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