fix(swift): use binary target and versioned macOS framework for Xcode 26 compatibility

Author: Gioee

.github/workflows/main.yml

@@ -135,7 +135,7 @@ jobs:
           codesign --sign "${{ secrets.APPLE_TEAM_ID }}" --timestamp --options runtime dist/js.xcframework # Then sign the xcframework wrapper
           ditto -c -k --keepParent dist/js.xcframework dist/js.xcframework.zip
           xcrun notarytool submit dist/js.xcframework.zip --apple-id "${{ secrets.APPLE_ID }}" --password "${{ secrets.APPLE_PASSWORD }}" --team-id "${{ secrets.APPLE_TEAM_ID }}" --wait
-          rm dist/js.xcframework.zip
+          rm -rf dist/js.xcframework
 
       - name: cleanup keychain for codesign
         if: matrix.os == 'macos-15'
@@ -220,7 +220,11 @@ jobs:
               if [[ "$name" != "js-apple-xcframework" && "$name" != "js-android-aar" ]]; then
                 tar -czf "${name}-${VERSION}.tar.gz" -C "$folder" .
               fi
-              if [[ "$name" != "js-android-aar" ]]; then
+              if [[ "$name" == "js-apple-xcframework" ]]; then
+                # Use the ditto-created zip that preserves macOS symlinks and extract for other steps
+                cp "$folder/js.xcframework.zip" "${name}-${VERSION}.zip"
+                unzip -q "$folder/js.xcframework.zip" -d "$folder/"
+              elif [[ "$name" != "js-android-aar" ]]; then
                 (cd "$folder" && zip -rq "../../${name}-${VERSION}.zip" .)
               else
                 cp "$folder"/*.aar "${name}-${VERSION}.aar"
@@ -315,6 +319,23 @@ jobs:
           echo "   Platform packages: 7"
           echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 
+      - name: update Package.swift checksum and version
+        if: steps.tag.outputs.version != ''
+        run: |
+          VERSION=${{ steps.tag.outputs.version }}
+          ZIP="js-apple-xcframework-${VERSION}.zip"
+          if [ -f "$ZIP" ]; then
+            CHECKSUM=$(swift package compute-checksum "$ZIP")
+            URL="https://github.com/sqliteai/sqlite-js/releases/download/${VERSION}/${ZIP}"
+            sed -i "s|url: \".*apple-xcframework.*\"|url: \"${URL}\"|" Package.swift
+            sed -i "s|checksum: \".*\"|checksum: \"${CHECKSUM}\"|" Package.swift
+            git config --global user.email "$GITHUB_ACTOR@users.noreply.github.com"
+            git config --global user.name "$GITHUB_ACTOR"
+            git add Package.swift
+            git commit -m "Update Package.swift checksum for ${VERSION} [skip ci]" || true
+            git push origin main || true
+          fi
+
       - uses: softprops/action-gh-release@v2.2.1
         if: steps.tag.outputs.version != ''
         with:

Makefile

@@ -205,7 +205,7 @@ endef
 LIB_NAMES = ios.dylib ios-sim.dylib macos.dylib
 FMWK_NAMES = ios-arm64 ios-arm64_x86_64-simulator macos-arm64_x86_64
 $(DIST_DIR)/%.xcframework: $(LIB_NAMES)
-	@$(foreach i,1 2 3,\
+	@$(foreach i,1 2,\
 		lib=$(word $(i),$(LIB_NAMES)); \
 		fmwk=$(word $(i),$(FMWK_NAMES)); \
 		mkdir -p $(DIST_DIR)/$$fmwk/js.framework/Headers; \
@@ -216,6 +216,21 @@ $(DIST_DIR)/%.xcframework: $(LIB_NAMES)
 		mv $(DIST_DIR)/$$lib $(DIST_DIR)/$$fmwk/js.framework/js; \
 		install_name_tool -id "@rpath/js.framework/js" $(DIST_DIR)/$$fmwk/js.framework/js; \
 	)
+	@lib=$(word 3,$(LIB_NAMES)); \
+	fmwk=$(word 3,$(FMWK_NAMES)); \
+	mkdir -p $(DIST_DIR)/$$fmwk/js.framework/Versions/A/Headers; \
+	mkdir -p $(DIST_DIR)/$$fmwk/js.framework/Versions/A/Modules; \
+	mkdir -p $(DIST_DIR)/$$fmwk/js.framework/Versions/A/Resources; \
+	cp src/sqlitejs.h $(DIST_DIR)/$$fmwk/js.framework/Versions/A/Headers; \
+	printf "$(PLIST)" > $(DIST_DIR)/$$fmwk/js.framework/Versions/A/Resources/Info.plist; \
+	printf "$(MODULEMAP)" > $(DIST_DIR)/$$fmwk/js.framework/Versions/A/Modules/module.modulemap; \
+	mv $(DIST_DIR)/$$lib $(DIST_DIR)/$$fmwk/js.framework/Versions/A/js; \
+	install_name_tool -id "@rpath/js.framework/js" $(DIST_DIR)/$$fmwk/js.framework/Versions/A/js; \
+	ln -sf A $(DIST_DIR)/$$fmwk/js.framework/Versions/Current; \
+	ln -sf Versions/Current/js $(DIST_DIR)/$$fmwk/js.framework/js; \
+	ln -sf Versions/Current/Headers $(DIST_DIR)/$$fmwk/js.framework/Headers; \
+	ln -sf Versions/Current/Modules $(DIST_DIR)/$$fmwk/js.framework/Modules; \
+	ln -sf Versions/Current/Resources $(DIST_DIR)/$$fmwk/js.framework/Resources;
 	xcodebuild -create-xcframework $(foreach fmwk,$(FMWK_NAMES),-framework $(DIST_DIR)/$(fmwk)/js.framework) -output $@
 	rm -rf $(foreach fmwk,$(FMWK_NAMES),$(DIST_DIR)/$(fmwk))
 

Package.swift

@@ -7,27 +7,20 @@ let package = Package(
     name: "js",
     platforms: [.macOS(.v11), .iOS(.v11)],
     products: [
-        // Products can be used to vend plugins, making them visible to other packages.
-        .plugin(
-            name: "jsPlugin",
-            targets: ["jsPlugin"]),
         .library(
             name: "js",
             targets: ["js"])
     ],
     targets: [
-        // Build tool plugin that invokes the Makefile
-        .plugin(
-            name: "jsPlugin",
-            capability: .buildTool(),
-            path: "packages/swift/plugin"
+        .binaryTarget(
+            name: "jsBinary",
+            url: "https://github.com/sqliteai/sqlite-js/releases/download/1.3.2/js-apple-xcframework-1.3.2.zip",
+            checksum: "0000000000000000000000000000000000000000000000000000000000000000"
         ),
-        // js library target
         .target(
             name: "js",
-            dependencies: [],
-            path: "packages/swift/extension",
-            plugins: ["jsPlugin"]
+            dependencies: ["jsBinary"],
+            path: "packages/swift"
         ),
     ]
-)
+)

packages/swift/extension/js.swift

@@ -0,0 +1,15 @@
+// js.swift
+// Provides the path to the js SQLite extension for use with sqlite3_load_extension.
+
+import Foundation
+
+public struct js {
+    /// Returns the absolute path to the js dylib for use with sqlite3_load_extension.
+    public static var path: String {
+        #if os(macOS)
+        return Bundle.main.bundlePath + "/Contents/Frameworks/js.framework/js"
+        #else
+        return Bundle.main.bundlePath + "/Frameworks/js.framework/js"
+        #endif
+    }
+}

packages/swift/js.swift

@@ -16,7 +16,7 @@
 #include "sqlite3.h"
 #endif
 
-#define SQLITE_JS_VERSION   "1.3.1"
+#define SQLITE_JS_VERSION   "1.3.2"
 
 int sqlite3_js_init (sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi);
 const char *sqlitejs_version (void);