Skip to content

Commit 2f9072b

Browse files
committed
Build. Update targets configuration
1 parent c7aca9b commit 2f9072b

File tree

8 files changed

+33
-17
lines changed

8 files changed

+33
-17
lines changed

buildSrc/src/main/kotlin/JsTarget.kt

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import org.gradle.api.Project
2+
3+
internal enum class JsTarget(
4+
val js: Boolean = false,
5+
val wasm: Boolean = false,
6+
) {
7+
COMMON(js = true, wasm = true),
8+
JS(js = true),
9+
WASM(wasm = true),
10+
11+
;
12+
}
13+
14+
internal val Project.jsTarget: JsTarget
15+
get() {
16+
val target = findProperty("js.target") as String?
17+
18+
return if (target != null) {
19+
JsTarget.valueOf(target.uppercase())
20+
} else JsTarget.JS
21+
}

buildSrc/src/main/kotlin/WasmSupport.kt

-9
This file was deleted.

buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts

+7-3
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,15 @@ kotlin {
3737
optIn.addAll(COMMON_OPT_INS)
3838
}
3939

40-
js {
41-
configureJsTarget(moduleName = project.name)
40+
val jsTarget = project.jsTarget
41+
42+
if (jsTarget.js) {
43+
js {
44+
configureJsTarget(moduleName = project.name)
45+
}
4246
}
4347

44-
if (project.wasmSupported) {
48+
if (jsTarget.wasm) {
4549
wasmJs {
4650
configureJsTarget(moduleName = project.name + "-wasm")
4751
}

kotlin-browser/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
description=Kotlin wrapper for browser API
2-
wasm.supported=true
2+
js.target=common

kotlin-cssom-core/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
description=Kotlin wrapper for CSS core types
2-
wasm.supported=true
2+
js.target=common

kotlin-js-core/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
description=Helper for `kotlin-js`
2+
js.target=common
23
js.platform=web
3-
wasm.supported=true

kotlin-js/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
description=Kotlin wrappers for standard JS objects
2+
js.target=common
23
js.platform=web
3-
wasm.supported=true

kotlin-web/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
description=Kotlin wrapper for common web API
2+
js.target=common
23
js.platform=web
3-
wasm.supported=true

0 commit comments

Comments
 (0)