Support more K/N targets

rsocket · Nov 30, 2024 · 4f066f5 · 4f066f5
1 parent 9fb16df
commit 4f066f5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/build-logic/src/main/kotlin/rsocketbuild/targets.kt b/build-logic/src/main/kotlin/rsocketbuild/targets.kt
@@ -32,29 +32,25 @@ fun KotlinMultiplatformExtension.appleTargets() {
     watchosArm32()
     watchosArm64()
     watchosSimulatorArm64()
-    // https://youtrack.jetbrains.com/issue/KTOR-6368, supported by kotlinx-io
-    // watchosDeviceArm64()
+    watchosDeviceArm64()
 
     tvosX64()
     tvosArm64()
     tvosSimulatorArm64()
 }
 
-fun KotlinMultiplatformExtension.nixTargets() {
+fun KotlinMultiplatformExtension.nativeTargets() {
     appleTargets()
+
     linuxX64()
     linuxArm64()
-}
-
-fun KotlinMultiplatformExtension.nativeTargets() {
-    nixTargets()
     mingwX64()
 
-    // not supported by ktor, supported by kotlinx-io
-    // androidNativeX64()
-    // androidNativeX86()
-    // androidNativeArm64()
-    // androidNativeArm32()
+// TODO: there are some issues with androidNative targets with Kotlin 2.1.0
+//    androidNativeX64()
+//    androidNativeX86()
+//    androidNativeArm64()
+//    androidNativeArm32()
 }
 
 fun KotlinMultiplatformExtension.jsTarget(

diff --git a/ktor-plugins/ktor-server-rsocket/build.gradle.kts b/ktor-plugins/ktor-server-rsocket/build.gradle.kts
@@ -24,7 +24,7 @@ description = "rsocket-kotlin ktor server plugin"
 
 kotlin {
     jvmTarget()
-    nixTargets()
+    nativeTargets()
 
     sourceSets {
         commonMain.dependencies {

diff --git a/ktor-plugins/rsocket-ktor-server/build.gradle.kts b/ktor-plugins/rsocket-ktor-server/build.gradle.kts
@@ -24,7 +24,7 @@ description = "OLD ARTIFACT - migrate to ktor-server-rsocket"
 
 kotlin {
     jvmTarget()
-    nixTargets()
+    nativeTargets()
 
     sourceSets {
         commonMain.dependencies {

diff --git a/rsocket-transports/ktor-tcp/build.gradle.kts b/rsocket-transports/ktor-tcp/build.gradle.kts
@@ -24,7 +24,7 @@ description = "rsocket-kotlin ktor TCP client/server transport implementation"
 
 kotlin {
     jvmTarget()
-    nixTargets()
+    nativeTargets()
 
     sourceSets {
         commonMain.dependencies {

diff --git a/rsocket-transports/ktor-websocket-server/build.gradle.kts b/rsocket-transports/ktor-websocket-server/build.gradle.kts
@@ -24,7 +24,7 @@ description = "rsocket-kotlin ktor WebSocket server transport implementation"
 
 kotlin {
     jvmTarget()
-    nixTargets()
+    nativeTargets()
 
     sourceSets {
         commonMain.dependencies {