diff --git a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts index bbb607e..5d5142c 100644 --- a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts @@ -1,3 +1,4 @@ +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask @@ -15,25 +16,45 @@ kotlin { nodejs() } - linuxX64() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + binaries.executable() + nodejs() + } - mingwX64() + /* https://kotlinlang.org/docs/native-target-support.html#tier-1 */ - macosArm64() macosX64() - - iosArm64() + macosArm64() iosSimulatorArm64() iosX64() - tvosArm64() - tvosSimulatorArm64() - tvosX64() + /* https://kotlinlang.org/docs/native-target-support.html#tier-2 */ + + linuxX64() + linuxArm64() - watchosArm32() - watchosArm64() watchosSimulatorArm64() watchosX64() + watchosArm32() + watchosArm64() + + tvosSimulatorArm64() + tvosX64() + tvosArm64() + + iosArm64() + + /* https://kotlinlang.org/docs/native-target-support.html#tier-3 */ + + androidNativeArm32() + androidNativeArm64() + androidNativeX86() + androidNativeX64() + + mingwX64() + + watchosDeviceArm64() sourceSets { all { diff --git a/kotlin-result/build.gradle.kts b/kotlin-result/build.gradle.kts index 24c71b8..cc92fcf 100644 --- a/kotlin-result/build.gradle.kts +++ b/kotlin-result/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl - plugins { `maven-publish` id("kotlin-conventions") @@ -8,18 +6,4 @@ plugins { kotlin { explicitApi() - - // Additional targets not currently supported by coroutines - androidNativeArm32() - androidNativeArm64() - androidNativeX64() - androidNativeX86() - - linuxArm64() - - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - binaries.executable() - nodejs() - } }