feat: add watchos support

Author: zifeo

.cargo/config.toml

@@ -1,4 +1,3 @@
-
 # Previously we added this to rustflags for all linux builds:
 #   "-C", "link-arg=-lgcc_eh"
 # It was to fix this error when loading the loadable extension:
@@ -86,3 +85,18 @@ rustflags = [
 rustflags = [
     "-C", "link-arg=-Wl,-soname,libpowersync.so",
 ]
+
+[target.aarch64-apple-watchos]
+rustflags = [
+    "-C", "link-arg=-mwatchos-version-min=7.0",
+]
+
+[target.aarch64-apple-watchos-sim]
+rustflags = [
+    "-C", "link-arg=-mwatchsimulator-version-min=7.0",
+]
+
+[target.x86_64-apple-watchos]
+rustflags = [
+    "-C", "link-arg=-mwatchos-version-min=7.0",
+]

.github/workflows/ios.yml

@@ -21,8 +21,10 @@ jobs:
             aarch64-apple-darwin \
             aarch64-apple-ios \
             aarch64-apple-ios-sim \
-            x86_64-apple-ios
-
+            x86_64-apple-ios \
+            aarch64-apple-watchos \
+            aarch64-apple-watchos-sim \
+            x86_64-apple-watchos
       - name: setup-cocoapods
         uses: maxim-lobanov/setup-cocoapods@v1
         with:

.github/workflows/release.yml

@@ -91,8 +91,10 @@ jobs:
             aarch64-apple-darwin \
             aarch64-apple-ios \
             aarch64-apple-ios-sim \
-            x86_64-apple-ios
-
+            x86_64-apple-ios \
+            aarch64-apple-watchos \
+            aarch64-apple-watchos-sim \
+            x86_64-apple-watchos
       - name: setup-cocoapods
         uses: maxim-lobanov/setup-cocoapods@v1
         with:

Cargo.toml

@@ -39,3 +39,4 @@ repository = "https://github.com/powersync-ja/powersync-sqlite-core"
 
 [workspace.dependencies]
 sqlite_nostd = { path="./sqlite-rs-embedded/sqlite_nostd" }
+

crates/shell/Cargo.toml

@@ -8,12 +8,23 @@ license.workspace = true
 authors.workspace = true
 keywords.workspace = true
 
+[lib]
+name = "powersync_sqlite"
+path = "src/main.rs"
+crate-type = ["staticlib"]
+
+[[bin]]
+name = "powersync_sqlite"
+path = "src/main.rs"
+required-features = ["shell"]
+
 [dependencies]
-powersync_core = { path="../core" }
-sqlite_nostd = { workspace=true }
+powersync_core = { path="../core", default-features = false, features = ["static", "omit_load_extension"] }
+sqlite_nostd = { workspace=true, features = ["static", "omit_load_extension"] }
 
 [features]
-default = ["powersync_core/static", "powersync_core/omit_load_extension", "sqlite_nostd/static", "sqlite_nostd/omit_load_extension"]
+default = []
+shell = []
 
 [build-dependencies]
 cc = "1.0.46"

crates/shell/build.rs

@@ -1,10 +1,10 @@
-
 fn main() {
     let mut cfg = cc::Build::new();
+    let target = std::env::var("TARGET").unwrap();
+    let is_watchos = target.contains("watchos") || target.contains("watchsimulator");
 
     // Compile the SQLite source
     cfg.file("../sqlite/sqlite/sqlite3.c");
-    cfg.file("../sqlite/sqlite/shell.c");
     cfg.include("../sqlite/sqlite");
 
     // General SQLite options
@@ -14,15 +14,22 @@ fn main() {
     // Call core_init() in main.rs
     cfg.define("SQLITE_EXTRA_INIT", Some("core_init"));
 
-    // Compile with readline support (also requires -lreadline / cargo:rustc-link-lib=readline below)
-    cfg.define("HAVE_READLINE", Some("1"));
+    if is_watchos {
+        // For watchOS, don't build the shell and disable readline
+        cfg.define("HAVE_READLINE", Some("0"));
+        cfg.define("HAVE_EDITLINE", Some("0"));
+        cfg.define("SQLITE_OMIT_SYSTEM", Some("1"));
+    } else {
+        // For other platforms, build the shell with readline
+        cfg.file("../sqlite/sqlite/shell.c");
+        cfg.define("HAVE_READLINE", Some("1"));
+        println!("cargo:rustc-link-lib=readline");
+    }
 
     // Silence warnings generated for SQLite
     cfg.flag("-Wno-implicit-fallthrough");
     cfg.flag("-Wno-unused-parameter");
     cfg.flag("-Wno-null-pointer-subtraction");
 
     cfg.compile("sqlite-ps");
-
-    println!("cargo:rustc-link-lib=readline");
 }

crates/shell/src/main.rs

@@ -28,7 +28,6 @@ fn panic(_info: &core::panic::PanicInfo) -> ! {
 #[lang = "eh_personality"]
 extern "C" fn eh_personality() {}
 
-
 #[no_mangle]
 pub extern "C" fn core_init(_dummy: *mut c_char) -> c_int {
     powersync_init_static()

crates/sqlite/Cargo.toml

@@ -8,9 +8,21 @@ license.workspace = true
 authors.workspace = true
 keywords.workspace = true
 
+[lib]
+name = "sqlite3"
+path = "src/main.rs"
+crate-type = ["staticlib"]
+
+[[bin]]
+name = "sqlite3"
+path = "src/main.rs"
+required-features = ["shell"]
+
 [dependencies]
 
 [features]
+default = []
+shell = []
 
 [build-dependencies]
 cc = "1.0.46"

crates/sqlite/build.rs

@@ -1,24 +1,32 @@
 fn main() {
     let mut cfg = cc::Build::new();
+    let target = std::env::var("TARGET").unwrap();
+    let is_watchos = target.contains("watchos") || target.contains("watchsimulator");
 
     // Compile the SQLite source
     cfg.file("./sqlite/sqlite3.c");
-    cfg.file("./sqlite/shell.c");
     cfg.include("./sqlite");
 
     // General SQLite options
     cfg.define("SQLITE_THREADSAFE", Some("0"));
     cfg.define("SQLITE_ENABLE_BYTECODE_VTAB", Some("1"));
 
-    // Compile with readline support (also requires -lreadline / cargo:rustc-link-lib=readline below)
-    cfg.define("HAVE_READLINE", Some("1"));
+    if is_watchos {
+        // For watchOS, don't build the shell and disable readline
+        cfg.define("HAVE_READLINE", Some("0"));
+        cfg.define("HAVE_EDITLINE", Some("0"));
+        cfg.define("SQLITE_OMIT_SYSTEM", Some("1"));
+    } else {
+        // For other platforms, build the shell with readline
+        cfg.file("./sqlite/shell.c");
+        cfg.define("HAVE_READLINE", Some("1"));
+        println!("cargo:rustc-link-lib=readline");
+    }
 
     // Silence warnings generated for SQLite
     cfg.flag("-Wno-implicit-fallthrough");
     cfg.flag("-Wno-unused-parameter");
     cfg.flag("-Wno-null-pointer-subtraction");
 
     cfg.compile("sqlite");
-
-    println!("cargo:rustc-link-lib=readline");
 }

powersync-sqlite-core.podspec

@@ -13,7 +13,11 @@ PowerSync extension for SQLite.
   s.source   = { :http => "https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v#{s.version}/powersync-sqlite-core.xcframework.zip" }
   s.vendored_frameworks  = 'powersync-sqlite-core.xcframework'
 
-
   s.ios.deployment_target = '11.0'
   s.osx.deployment_target = '10.13'
+  s.watchos.deployment_target = '7.0'
+
+  # Ensure no asset catalogs are included for watchOS
+  s.watchos.resource_bundles = {}
+  s.watchos.resources = []
 end