Restructure static libraries attached to releases (#172)

Author: simolus3

.github/actions/android/action.yml

@@ -61,26 +61,18 @@ runs:
         path: android/build/distributions/powersync_android.zip
         if-no-files-found: error
 
-    - name: Copy static libraries
+    - name: Copy individual libraries
       shell: bash
       run: |
-        cp target/aarch64-linux-android/release/libpowersync.a libpowersync_aarch64.android.a
         cp target/aarch64-linux-android/release/libpowersync.so libpowersync_aarch64.android.so
-
-        cp target/armv7-linux-androideabi/release/libpowersync.a libpowersync_armv7.android.a
         cp target/armv7-linux-androideabi/release/libpowersync.so libpowersync_armv7.android.so
-
-        cp target/i686-linux-android/release/libpowersync.a libpowersync_x86.android.a
         cp target/i686-linux-android/release/libpowersync.so libpowersync_x86.android.so
-
-        cp target/x86_64-linux-android/release/libpowersync.a libpowersync_x64.android.a
         cp target/x86_64-linux-android/release/libpowersync.so libpowersync_x64.android.so
 
-    - name: Upload static libraries
+    - name: Upload individual libraries
       uses: actions/upload-artifact@v4
       with:
         name: android-static
         retention-days: 14
         path: |
-          *.a
           *.so

.github/workflows/release.yml

@@ -185,6 +185,9 @@ jobs:
         with:
           name: android-static
 
+      - name: Create archive of static libs for Kotlin
+        run: zip static_libs.zip *.lib *.a
+
       - name: List libraries
         run: ls -al
 
@@ -194,10 +197,9 @@ jobs:
           GH_REPO: ${{ github.repository }}
         run: |
           gh release upload "${{ needs.draft_release.outputs.tag }}" *.dll
-          gh release upload "${{ needs.draft_release.outputs.tag }}" *.lib
           gh release upload "${{ needs.draft_release.outputs.tag }}" *.dylib
           gh release upload "${{ needs.draft_release.outputs.tag }}" *.so
-          gh release upload "${{ needs.draft_release.outputs.tag }}" *.a
+          gh release upload "${{ needs.draft_release.outputs.tag }}" static_libs.zip
 
   publish_wasm:
     name: Publish WASM builds

android/build.gradle.kts

@@ -95,10 +95,6 @@ val buildRust = tasks.register<Exec>("buildRust") {
     rustCompilation("powersync_loadable", "./android/build/intermediates/jniLibs")
 }
 
-val buildRustStatic = tasks.register<Exec>("buildRustStatic") {
-    rustCompilation("powersync_static")
-}
-
 val prefabAar = tasks.register<Zip>("prefabAar") {
     dependsOn(buildRust)
 
@@ -218,5 +214,5 @@ val zipPublication by tasks.registering(Zip::class) {
 }
 
 tasks.named("build") {
-    dependsOn(prefabAar, buildRustStatic)
+    dependsOn(prefabAar)
 }

crates/static/Cargo.toml

@@ -22,4 +22,5 @@ features = []
 
 [features]
 nightly = []
-default = ["powersync_core/static"]
+# Whether to expect SQLite to be linked statically as well.
+static = ["powersync_core/static"]

crates/static/README.md

@@ -1 +1,7 @@
 Builds the core extension as a static library, exposing the `powersync_init_static` function to load it.
+
+We only use this crate to compile for watchOS, since the regular `loadable` build compiling to a dylib
+doesn't support that platform.
+
+Most users should probably compile the `loadable` crate instead, which also emits a static library. If
+SQLite is linked statically, compiling `loadable` with the `static` feature enabled works.

tool/build_linux.sh

@@ -6,7 +6,6 @@ function compile() {
   local suffix=$2
 
   cargo build -p powersync_loadable -Z build-std=panic_abort,core,alloc --features nightly --release --target $triple
-  cargo build -p powersync_static -Z build-std=panic_abort,core,alloc --features nightly --release --target $triple
 
   mv "target/$triple/release/libpowersync.so" "libpowersync_$suffix.linux.so"
   mv "target/$triple/release/libpowersync.a" "libpowersync_$suffix.linux.a"

tool/build_macos.sh

@@ -7,21 +7,37 @@ function compile() {
   local os=$3
 
   cargo build -p powersync_loadable -Z build-std=panic_abort,core,alloc --features nightly --release --target $triple
-  cargo build -p powersync_static -Z build-std=panic_abort,core,alloc --features nightly --release --target $triple
 
   mv "target/$triple/release/libpowersync.dylib" "libpowersync_$suffix.$os.dylib"
   mv "target/$triple/release/libpowersync.a" "libpowersync_$suffix.$os.a"
 }
 
+function compile_static() {
+  local triple=$1
+  local suffix=$2
+  local os=$3
+
+  cargo build -p powersync_static -Z build-std=panic_abort,core,alloc --features nightly --release --target $triple
+
+  mv "target/$triple/release/libpowersync.a" "libpowersync_$suffix.$os.a"
+}
+
 case "$1" in
   x64)
     compile x86_64-apple-darwin x64 macos
     compile x86_64-apple-ios x64 ios-sim
+    compile x86_64-apple-tvos x64 tvos-sim
+    compile_static x86_64-apple-watchos-sim x64 watchos-sim
     ;;
   aarch64)
     compile aarch64-apple-darwin aarch64 macos
     compile aarch64-apple-ios-sim aarch64 ios-sim
     compile aarch64-apple-ios aarch64 ios
+    compile aarch64-apple-tvos aarch64 tvos
+    compile aarch64-apple-tvos-sim aarch64 tvos-sim
+    compile_static aarch64-apple-watchos aarch64 watchos
+    compile_static aarch64-apple-watchos aarch64 watchos-sim
+    compile_static arm64_32-apple-watchos arm64_32 watchos
     ;;
   *)
     echo "Unknown architecture"

tool/build_windows.sh

@@ -6,7 +6,6 @@ function compile() {
   local suffix=$2
 
   cargo build -p powersync_loadable -Z build-std=panic_abort,core,alloc --features=nightly --release --target $triple
-  cargo build -p powersync_static -Z build-std=panic_abort,core,alloc --features=nightly --release --target $triple
 
   mv "target/$triple/release/powersync.dll" "powersync_$suffix.dll"
   mv "target/$triple/release/powersync.lib" "powersync_$suffix.lib"

tool/build_xcframework.sh

@@ -187,7 +187,7 @@ for TARGET in ${TARGETS[@]}; do
     cargo build \
       -p powersync_static \
       --profile release_apple \
-      --features nightly \
+      --features static,nightly \
       --target $TARGET \
       -Zbuild-std
   else