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

[stdlib] Minor cleanup of JS stdlib build

Browse Source 
- Remove unused jsIrTarget variable
- Rename the directory with copied builtin sources
This commit is contained in:
Ilya Gorbunov
2023-10-24 21:08:48 +02:00
committed by Space Team
parent 5e61cb5098
commit 27ed611e70
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/build.gradle.kts
+6 -10
View File
@@ -4,7 +4,6 @@ import org.gradle.api.internal.component.UsageContext
import org.gradle.jvm.tasks.Jar import org.gradle.jvm.tasks.Jar
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl
import org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin import org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinTargetWithNodeJsDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinTargetWithNodeJsDsl
@@ -50,10 +49,7 @@ val builtinsDir = "${rootDir}/core/builtins"
val builtinsSrcDir = "${buildDir}/src/builtin-sources" val builtinsSrcDir = "${buildDir}/src/builtin-sources"
val jsDir = "${projectDir}/js" val jsDir = "${projectDir}/js"
val jsBuiltinsSrcDir = "${buildDir}/src/js-builtin-sources"
// for js-ir
val jsIrMainSources = "${buildDir}/src/jsMainSources"
lateinit var jsIrTarget: KotlinJsTargetDsl
val commonOptIns = listOf( val commonOptIns = listOf(
"kotlin.ExperimentalMultiplatform", "kotlin.ExperimentalMultiplatform",
@@ -188,7 +184,7 @@ kotlin {
} }
} }
} }
jsIrTarget = js(IR) { js(IR) {
if (!kotlinBuildProperties.isTeamcityBuild) { if (!kotlinBuildProperties.isTeamcityBuild) {
browser {} browser {}
} }
@@ -388,7 +384,7 @@ kotlin {
} }
} }
into(jsIrMainSources) into(jsBuiltinsSrcDir)
// Required to compile native builtins with the rest of runtime // Required to compile native builtins with the rest of runtime
val builtInsHeader = """@file:Suppress( val builtInsHeader = """@file:Suppress(
@@ -658,11 +654,11 @@ tasks {
include("Comparable.kt") include("Comparable.kt")
include("Enum.kt") include("Enum.kt")
} }
from("$jsIrMainSources/core/builtins/native") { from("$jsBuiltinsSrcDir/core/builtins/native") {
exclude("kotlin/Comparable.kt") exclude("kotlin/Comparable.kt")
} }
from("$jsIrMainSources/core/builtins/src") from("$jsBuiltinsSrcDir/core/builtins/src")
from("$jsIrMainSources/libraries/stdlib/js/src") from("$jsBuiltinsSrcDir/libraries/stdlib/js/src")
from("$jsDir/builtins") { from("$jsDir/builtins") {
into("kotlin") into("kotlin")
exclude("Enum.kt") exclude("Enum.kt")