Update K/N targets in accordance with official recommendations (#3640)

More tier 3 targets added Fixes #3601 Fixes #812 Fixes #855
Kotlin · Feb 27, 2023 · 2b865e2 · 2b865e2
1 parent 4ce3536
commit 2b865e2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -187,8 +187,8 @@ Kotlin/JS version of `kotlinx.coroutines` is published as
 
 Kotlin/Native version of `kotlinx.coroutines` is published as 
 [`kotlinx-coroutines-core-$platform`](https://mvnrepository.com/search?q=kotlinx-coroutines-core-) where `$platform` is 
-the target Kotlin/Native platform. [List of currently supported targets](https://github.com/Kotlin/kotlinx.coroutines/blob/master/gradle/compile-native-multiplatform.gradle#L16).
-
+the target Kotlin/Native platform. 
+Targets are provided in accordance with [official K/N target support](https://kotlinlang.org/docs/native-target-support.html).
 ## Building and Contributing
 
 See [Contributing Guidelines](CONTRIBUTING.md).

diff --git a/gradle/compile-native-multiplatform.gradle b/gradle/compile-native-multiplatform.gradle
@@ -15,22 +15,36 @@ kotlin {
     }
 
     targets {
+        // According to https://kotlinlang.org/docs/native-target-support.html
+        // Tier 1
         addTarget(presets.linuxX64)
-        addTarget(presets.iosArm64)
-        addTarget(presets.iosArm32)
-        addTarget(presets.iosX64)
         addTarget(presets.macosX64)
-        addTarget(presets.mingwX64)
-        addTarget(presets.tvosArm64)
-        addTarget(presets.tvosX64)
-        addTarget(presets.watchosArm32)
-        addTarget(presets.watchosArm64)
-        addTarget(presets.watchosX86)
-        addTarget(presets.watchosX64)
+        addTarget(presets.macosArm64)
         addTarget(presets.iosSimulatorArm64)
+        addTarget(presets.iosX64)
+
+        // Tier 2
+        addTarget(presets.linuxArm64)
         addTarget(presets.watchosSimulatorArm64)
+        addTarget(presets.watchosX64)
+        addTarget(presets.watchosArm32)
+        addTarget(presets.watchosArm64)
         addTarget(presets.tvosSimulatorArm64)
-        addTarget(presets.macosArm64)
+        addTarget(presets.tvosX64)
+        addTarget(presets.tvosArm64)
+        addTarget(presets.iosArm64)
+
+        // Tier 3
+        addTarget(presets.androidNativeArm32)
+        addTarget(presets.androidNativeArm64)
+        addTarget(presets.androidNativeX86)
+        addTarget(presets.androidNativeX64)
+        addTarget(presets.mingwX64)
+        addTarget(presets.watchosDeviceArm64)
+
+        // Deprecated, but were provided by coroutine; can be removed only when K/N drops the target
+        addTarget(presets.iosArm32)
+        addTarget(presets.watchosX86)
     }
 
     sourceSets {

diff --git a/kotlinx-coroutines-core/build.gradle b/kotlinx-coroutines-core/build.gradle
@@ -84,7 +84,7 @@ void defineSourceSet(newName, dependsOn, includedInPred) {
 
 static boolean isNativeDarwin(String name) { return ["ios", "macos", "tvos", "watchos"].any { name.startsWith(it) } }
 
-static boolean isNativeOther(String name) { return ["linux", "mingw"].any { name.startsWith(it) } }
+static boolean isNativeOther(String name) { return ["linux", "mingw", "androidNative"].any { name.startsWith(it) } }
 
 defineSourceSet("concurrent", ["common"]) { it in ["jvm", "native"] }