Native-driver: add support for linuxArm64 (#4792)

Co-authored-by: hfhbd <hfhbd@users.noreply.github.com>
cashapp · Apr 2, 2024 · 840144a · 840144a
1 parent 1d8e17f
commit 840144a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 42 deletions.
diff --git a/drivers/native-driver/build.gradle b/drivers/native-driver/build.gradle
@@ -8,33 +8,40 @@ plugins {
 }
 
 kotlin {
-  iosX64()
-  iosArm64()
-  tvosX64()
-  tvosArm64()
-  watchosX64()
-  watchosArm32()
-  watchosArm64()
-  macosX64()
-  mingwX64()
+  // tier 1
   linuxX64()
+  macosX64()
   macosArm64()
   iosSimulatorArm64()
+  iosX64()
+
+  // tier 2
+  linuxArm64()
   watchosSimulatorArm64()
+  watchosX64()
+  watchosArm32()
+  watchosArm64()
   tvosSimulatorArm64()
+  tvosX64()
+  tvosArm64()
+  iosArm64()
+
+  // tier 3
+  // https://github.com/touchlab/SQLiter/issues/117
+  // androidNativeArm32()
+  // androidNativeArm64()
+  // androidNativeX86()
+  // androidNativeX64()
+  mingwX64()
+  watchosDeviceArm64()
 
   targetHierarchy.default { target ->
     target.group("native") {
       it.group("nativeLinuxLike") {
         it.withLinux()
-        // no withApple: https://github.com/cashapp/sqldelight/issues/4257
-        it.withIos()
-        it.withTvos()
-        it.withMacos()
-        it.withWatchosArm32()
-        it.withWatchosArm64()
-        it.withWatchosX64()
-        it.withWatchosSimulatorArm64()
+        it.withApple()
+        // https://github.com/touchlab/SQLiter/issues/117
+        // it.withAndroidNative()
       }
     }
   }

diff --git a/extensions/coroutines-extensions/build.gradle b/extensions/coroutines-extensions/build.gradle
@@ -13,17 +13,11 @@ archivesBaseName = 'sqldelight-coroutines-extensions'
 kotlin {
   targetHierarchy.default {
     it.group("testableNative") {
-      // no withApple: https://github.com/cashapp/sqldelight/issues/4257
-      it.withIos()
-      it.withTvos()
-      it.withMacos()
-      it.withWatchosArm32()
-      it.withWatchosArm64()
-      it.withWatchosX64()
-      it.withWatchosSimulatorArm64()
-
-      it.withLinuxX64()
+      it.withApple()
+      it.withLinux()
       it.withMingw()
+      // https://github.com/touchlab/SQLiter/issues/117
+      // it.withAndroidNative()
     }
   }
 

diff --git a/runtime/build.gradle b/runtime/build.gradle
@@ -16,21 +16,6 @@ apiValidation {
 }
 
 kotlin {
-  targetHierarchy.default {
-    it.group("testableNative") {
-      // no withApple: https://github.com/cashapp/sqldelight/issues/4257
-      it.withIos()
-      it.withTvos()
-      it.withMacos()
-      it.withWatchosArm32()
-      it.withWatchosArm64()
-      it.withWatchosX64()
-      it.withWatchosSimulatorArm64()
-      it.withLinuxX64()
-      it.withMingw()
-    }
-  }
-
   sourceSets {
     commonMain {
     }