Add linuxArm64, androidNative and watchosDeviceArm targets to runtime

buildLogic/multiplatform-convention/src/main/kotlin/app/cash/sqldelight/multiplatform/MultiplatformConventions.kt

@@ -38,7 +38,7 @@ class MultiplatformConventions : Plugin<Project> {
       iosX64()
 
       // tier 2
-      // linuxArm64()
+      linuxArm64()
       watchosSimulatorArm64()
       watchosX64()
       watchosArm32()
@@ -49,12 +49,12 @@ class MultiplatformConventions : Plugin<Project> {
       iosArm64()
 
       // tier 3
-      // androidNativeArm32()
-      // androidNativeArm64()
-      // androidNativeX86()
-      // androidNativeX64()
+      androidNativeArm32()
+      androidNativeArm64()
+      androidNativeX86()
+      androidNativeX64()
       mingwX64()
-      // watchosDeviceArm64()
+      watchosDeviceArm64()
 
       // linking fails for the linux test build if not built on a linux host
       // ensure the tests and linking for them is only done on linux hosts

drivers/driver-test/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-  id("app.cash.sqldelight.multiplatform")
+  alias(libs.plugins.kotlin.multiplatform)
   id("app.cash.sqldelight.toolchain.runtime")
 }
 
@@ -9,6 +9,28 @@ sourceSets {
 }
 
 kotlin {
+  jvm()
+
+  js {
+    browser()
+  }
+
+  // same targets as in `native-driver`
+  iosX64()
+  iosArm64()
+  tvosX64()
+  tvosArm64()
+  watchosX64()
+  watchosArm32()
+  watchosArm64()
+  macosX64()
+  mingwX64()
+  linuxX64()
+  macosArm64()
+  iosSimulatorArm64()
+  watchosSimulatorArm64()
+  tvosSimulatorArm64()
+
   sourceSets {
     commonMain {
       dependencies {

drivers/native-driver/build.gradle

@@ -26,7 +26,14 @@ kotlin {
     target.group("native") {
       it.group("nativeLinuxLike") {
         it.withLinux()
-        it.withApple()
+        // no withApple: https://github.com/cashapp/sqldelight/issues/4257
+        it.withIos()
+        it.withTvos()
+        it.withMacos()
+        it.withWatchosArm32()
+        it.withWatchosArm64()
+        it.withWatchosX64()
+        it.withWatchosSimulatorArm64()
       }
     }
   }

extensions/coroutines-extensions/build.gradle

@@ -8,6 +8,22 @@ plugins {
 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.withMingw()
+    }
+  }
+
   sourceSets {
     commonMain {
       dependencies {
@@ -21,13 +37,13 @@ kotlin {
         implementation libs.kotlin.coroutines.test
         implementation libs.kotlin.test
         implementation libs.turbine
-        implementation libs.stately.concurrency
       }
     }
     jvmTest {
       dependencies {
         implementation libs.kotlin.test.junit
         implementation projects.drivers.sqliteDriver
+        implementation libs.stately.concurrency
       }
       languageSettings {
         optIn('kotlinx.coroutines.ExperimentalCoroutinesApi')
@@ -36,11 +52,13 @@ kotlin {
     jsTest {
       dependencies {
         implementation projects.drivers.sqljsDriver
+        implementation libs.stately.concurrency
       }
     }
-    nativeTest {
+    testableNativeTest {
       dependencies {
         implementation projects.drivers.nativeDriver
+        implementation libs.stately.concurrency
       }
     }
   }

runtime/build.gradle

@@ -16,6 +16,22 @@ 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 {
     }
@@ -30,7 +46,7 @@ kotlin {
         implementation libs.stately.collections
       }
     }
-    nativeTest {
+    testableNativeTest {
       dependencies {
         implementation libs.stately.concurrency
         implementation libs.stately.collections

runtime/src/watchosDeviceArm64Test/kotlin/com/squareup/sqldelight/internal/CopyOnWriteList.kt

@@ -0,0 +1,5 @@
+package com.squareup.sqldelight.internal
+
+// https://github.com/cashapp/sqldelight/issues/4257
+// this code isn't used but need for compiling
+actual fun <T> copyOnWriteList(): MutableList<T> = mutableListOf()

runtime/src/watchosDeviceArm64Test/kotlin/com/squareup/sqldelight/logs/LinkedList.kt

@@ -0,0 +1,15 @@
+package com.squareup.sqldelight.logs
+
+// https://github.com/cashapp/sqldelight/issues/4257
+// this code isn't used but need for compiling
+actual class LinkedList<T>
+actual constructor(objectPoolSize: Int) {
+  private val list = mutableListOf<T>()
+  actual fun add(element: T) = list.add(element)
+
+  actual fun clear() {
+    list.clear()
+  }
+
+  actual operator fun get(index: Int) = list[index]
+}