Add macos support to pod.

Author: rkistner

.cargo/config

@@ -33,3 +33,15 @@ rustflags = [
 rustflags = [
     "-C", "link-arg=-miphonesimulator-version-min=14.0",
 ]
+
+
+[target.x86_64-apple-darwin]
+rustflags = [
+    "-C", "link-arg=-mmacosx-version-min=10.13",
+]
+
+[target.aarch64-apple-darwin]
+rustflags = [
+    "-C", "link-arg=-mmacosx-version-min=10.13",
+]
+

.github/workflows/ios.yml

@@ -20,10 +20,21 @@ jobs:
           rustup toolchain install nightly-2023-08-28-x86_64-apple-darwin
           rustup component add rust-src --toolchain nightly-2023-08-28-x86_64-apple-darwin
           rustup target add \
+            x86_64-apple-darwin \
+            aarch64-apple-darwin \
             aarch64-apple-ios \
             aarch64-apple-ios-sim \
             x86_64-apple-ios
 
-      - name: Build iOS Pod
+      - name: setup-cocoapods
+        uses: maxim-lobanov/setup-cocoapods@v1
+        with:
+          version: 1.12.1
+
+      - name: Build iOS & macOS xcframework
         run: |
           ./build-pod.sh
+
+      - name: Lint pod
+        run: |
+          pod lib lint

build-pod.sh

@@ -29,21 +29,32 @@ function createXcframework() {
 </plist>
 EOF
 )
-  printf "\n\n\t\t===================== create ios device framework =====================\n\n"
+  echo "===================== create ios device framework ====================="
   mkdir -p "${BUILD_DIR}/ios-arm64/powersync-sqlite-core.framework"
   echo "${plist}" > "${BUILD_DIR}/ios-arm64/powersync-sqlite-core.framework/Info.plist"
   cp -f "./target/aarch64-apple-ios/release/libpowersync.dylib" "${BUILD_DIR}/ios-arm64/powersync-sqlite-core.framework/powersync-sqlite-core"
   install_name_tool -id "@rpath/powersync-sqlite-core.framework/powersync-sqlite-core" "${BUILD_DIR}/ios-arm64/powersync-sqlite-core.framework/powersync-sqlite-core"
 
-  printf "\n\n\t\t===================== create ios simulator framework =====================\n\n"
+
+  echo "===================== create ios simulator framework ====================="
   mkdir -p "${BUILD_DIR}/ios-arm64_x86_64-simulator/powersync-sqlite-core.framework"
   echo "${plist}" > "${BUILD_DIR}/ios-arm64_x86_64-simulator/powersync-sqlite-core.framework/Info.plist"
-  cp -p "./target/powersync-universal-ios-sim.dylib" "${BUILD_DIR}/ios-arm64_x86_64-simulator/powersync-sqlite-core.framework/powersync-sqlite-core"
+  lipo ./target/aarch64-apple-ios-sim/release/libpowersync.dylib ./target/x86_64-apple-ios/release/libpowersync.dylib -create -output "${BUILD_DIR}/ios-arm64_x86_64-simulator/powersync-sqlite-core.framework/powersync-sqlite-core"
   install_name_tool -id "@rpath/powersync-sqlite-core.framework/powersync-sqlite-core" "${BUILD_DIR}/ios-arm64_x86_64-simulator/powersync-sqlite-core.framework/powersync-sqlite-core"
 
-  printf "\n\n\t\t===================== create ios xcframework =====================\n\n"
+  echo "===================== create macos framework ====================="
+  mkdir -p "${BUILD_DIR}/macos-arm64_x86_64/powersync-sqlite-core.framework"
+  echo "${plist}" > "${BUILD_DIR}/macos-arm64_x86_64/powersync-sqlite-core.framework/Info.plist"
+  lipo ./target/x86_64-apple-darwin/release/libpowersync.dylib ./target/aarch64-apple-darwin/release/libpowersync.dylib -create -output "${BUILD_DIR}/macos-arm64_x86_64/powersync-sqlite-core.framework/powersync-sqlite-core"
+  install_name_tool -id "@rpath/powersync-sqlite-core.framework/powersync-sqlite-core" "${BUILD_DIR}/macos-arm64_x86_64/powersync-sqlite-core.framework/powersync-sqlite-core"
+
+  echo "===================== create xcframework ====================="
   rm -rf "${BUILD_DIR}/powersync-sqlite-core.xcframework"
-  xcodebuild -create-xcframework -framework "${BUILD_DIR}/ios-arm64/powersync-sqlite-core.framework" -framework "${BUILD_DIR}/ios-arm64_x86_64-simulator/powersync-sqlite-core.framework" -output "${BUILD_DIR}/powersync-sqlite-core.xcframework"
+  xcodebuild -create-xcframework \
+    -framework "${BUILD_DIR}/ios-arm64/powersync-sqlite-core.framework" \
+    -framework "${BUILD_DIR}/ios-arm64_x86_64-simulator/powersync-sqlite-core.framework" \
+    -framework "${BUILD_DIR}/macos-arm64_x86_64/powersync-sqlite-core.framework" \
+    -output "${BUILD_DIR}/powersync-sqlite-core.xcframework"
 
   cp -Rf "${BUILD_DIR}/powersync-sqlite-core.xcframework" "powersync-sqlite-core.xcframework"
   tar -cJvf powersync-sqlite-core.xcframework.tar.xz powersync-sqlite-core.xcframework LICENSE README.md
@@ -55,10 +66,13 @@ EOF
 
 rm -rf powersync-sqlite-core.xcframework
 
+# iOS
 cargo build -p powersync_loadable --release --target aarch64-apple-ios -Zbuild-std
+# Simulator
 cargo build -p powersync_loadable --release --target aarch64-apple-ios-sim -Zbuild-std
 cargo build -p powersync_loadable --release --target x86_64-apple-ios -Zbuild-std
-
-lipo ./target/aarch64-apple-ios-sim/release/libpowersync.dylib ./target/x86_64-apple-ios/release/libpowersync.dylib -create -output ./target/powersync-universal-ios-sim.dylib
+# macOS
+cargo build -p powersync_loadable --release --target aarch64-apple-darwin -Zbuild-std
+cargo build -p powersync_loadable --release --target x86_64-apple-darwin -Zbuild-std
 
 createXcframework

powersync-sqlite-core.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'powersync-sqlite-core'
-  s.version          = '0.1.2'
+  s.version          = '0.1.3'
   s.summary          = 'PowerSync SQLite Extension'
   s.description      = <<-DESC
 PowerSync extension for SQLite.
@@ -16,5 +16,5 @@ PowerSync extension for SQLite.
 
   s.ios.deployment_target = '14.0'
   # osx not supported yet
-  # s.osx.deployment_target = '10.13'
+  s.osx.deployment_target = '10.13'
 end