Remove unecessary changes

Author: simolus3

.cargo/config.toml

@@ -88,15 +88,15 @@ rustflags = [
 
 [target.aarch64-apple-watchos]
 rustflags = [
-    "-C", "link-arg=-mwatchos-version-min=7.0",
+    "-C", "link-arg=-mwatchos-version-min=9.0",
 ]
 
 [target.aarch64-apple-watchos-sim]
 rustflags = [
-    "-C", "link-arg=-mwatchsimulator-version-min=7.0",
+    "-C", "link-arg=-mwatchsimulator-version-min=9.0",
 ]
 
 [target.x86_64-apple-watchos-sim]
 rustflags = [
-    "-C", "link-arg=-mwatchos-version-min=7.0",
+    "-C", "link-arg=-mwatchos-version-min=9.0",
 ]

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,22 +14,15 @@ fn main() {
     // Call core_init() in main.rs
     cfg.define("SQLITE_EXTRA_INIT", Some("core_init"));
 
-    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");
-    }
+    // Compile with readline support (also requires -lreadline / cargo:rustc-link-lib=readline below)
+    cfg.define("HAVE_READLINE", Some("1"));
 
     // 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,6 +28,7 @@ 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/build.rs

@@ -1,32 +1,24 @@
 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"));
 
-    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");
-    }
+    // Compile with readline support (also requires -lreadline / cargo:rustc-link-lib=readline below)
+    cfg.define("HAVE_READLINE", Some("1"));
 
     // 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");
 }

tool/build_xcframework.sh

@@ -137,6 +137,7 @@ function createXcframework() {
     -framework "${BUILD_DIR}/watchos-arm64_x86_64-simulator/powersync-sqlite-core.framework" \
     -output "${BUILD_DIR}/powersync-sqlite-core.xcframework"
 
+  cp -Rf "${BUILD_DIR}/powersync-sqlite-core.xcframework" "powersync-sqlite-core.xcframework"
   zip -r --symlinks powersync-sqlite-core.xcframework.zip powersync-sqlite-core.xcframework LICENSE README.md
   rm -rf ${BUILD_DIR}
 }
@@ -148,7 +149,7 @@ rm -rf powersync-sqlite-core.xcframework
 
 for TARGET in ${TARGETS[@]}; do
   echo "Building PowerSync loadable extension for $TARGET"
-  #cargo build -p powersync_loadable --profile release_apple --target $TARGET -Zbuild-std
+  cargo build -p powersync_loadable --profile release_apple --target $TARGET -Zbuild-std
 done
 
 createXcframework