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

Author: Gioee

.github/workflows/main.yml

@@ -177,7 +177,7 @@ jobs:
           codesign --sign "${{ secrets.APPLE_TEAM_ID }}" --timestamp --options runtime dist/agent.xcframework
           ditto -c -k --keepParent dist/agent.xcframework dist/agent.xcframework.zip
           xcrun notarytool submit dist/agent.xcframework.zip --apple-id "${{ secrets.APPLE_ID }}" --password "${{ secrets.APPLE_PASSWORD }}" --team-id "${{ secrets.APPLE_TEAM_ID }}" --wait
-          rm dist/agent.xcframework.zip
+          rm -rf dist/agent.xcframework
 
       - name: cleanup keychain for codesign
         if: matrix.os == 'macos-15'
@@ -262,7 +262,11 @@ jobs:
               if [[ "$name" != "agent-apple-xcframework" && "$name" != "agent-android-aar" ]]; then
                 tar -czf "${name}-${VERSION}.tar.gz" -C "$folder" .
               fi
-              if [[ "$name" != "agent-android-aar" ]]; then
+              if [[ "$name" == "agent-apple-xcframework" ]]; then
+                # Use the ditto-created zip that preserves macOS symlinks and extract for other steps
+                cp "$folder/agent.xcframework.zip" "${name}-${VERSION}.zip"
+                unzip -q "$folder/agent.xcframework.zip" -d "$folder/"
+              elif [[ "$name" != "agent-android-aar" ]]; then
                 (cd "$folder" && zip -rq "../../${name}-${VERSION}.zip" .)
               else
                 cp "$folder"/*.aar "${name}-${VERSION}.aar"
@@ -356,6 +360,23 @@ jobs:
           echo "   Main: @sqliteai/sqlite-agent@${{ steps.tag.outputs.version }}"
           echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 
+      - name: update Package.swift checksum and version
+        if: steps.tag.outputs.version != ''
+        run: |
+          VERSION=${{ steps.tag.outputs.version }}
+          ZIP="agent-apple-xcframework-${VERSION}.zip"
+          if [ -f "$ZIP" ]; then
+            CHECKSUM=$(swift package compute-checksum "$ZIP")
+            URL="https://github.com/sqliteai/sqlite-agent/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

@@ -208,7 +208,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/agent.framework/Headers; \
@@ -219,6 +219,21 @@ $(DIST_DIR)/%.xcframework: $(LIB_NAMES)
 		mv $(DIST_DIR)/$$lib $(DIST_DIR)/$$fmwk/agent.framework/agent; \
 		install_name_tool -id "@rpath/agent.framework/agent" $(DIST_DIR)/$$fmwk/agent.framework/agent; \
 	)
+	@lib=$(word 3,$(LIB_NAMES)); \
+	fmwk=$(word 3,$(FMWK_NAMES)); \
+	mkdir -p $(DIST_DIR)/$$fmwk/agent.framework/Versions/A/Headers; \
+	mkdir -p $(DIST_DIR)/$$fmwk/agent.framework/Versions/A/Modules; \
+	mkdir -p $(DIST_DIR)/$$fmwk/agent.framework/Versions/A/Resources; \
+	cp $(SRC_DIR)/sqlite-agent.h $(DIST_DIR)/$$fmwk/agent.framework/Versions/A/Headers; \
+	printf "$(PLIST)" > $(DIST_DIR)/$$fmwk/agent.framework/Versions/A/Resources/Info.plist; \
+	printf "$(MODULEMAP)" > $(DIST_DIR)/$$fmwk/agent.framework/Versions/A/Modules/module.modulemap; \
+	mv $(DIST_DIR)/$$lib $(DIST_DIR)/$$fmwk/agent.framework/Versions/A/agent; \
+	install_name_tool -id "@rpath/agent.framework/agent" $(DIST_DIR)/$$fmwk/agent.framework/Versions/A/agent; \
+	ln -sf A $(DIST_DIR)/$$fmwk/agent.framework/Versions/Current; \
+	ln -sf Versions/Current/agent $(DIST_DIR)/$$fmwk/agent.framework/agent; \
+	ln -sf Versions/Current/Headers $(DIST_DIR)/$$fmwk/agent.framework/Headers; \
+	ln -sf Versions/Current/Modules $(DIST_DIR)/$$fmwk/agent.framework/Modules; \
+	ln -sf Versions/Current/Resources $(DIST_DIR)/$$fmwk/agent.framework/Resources;
 	xcodebuild -create-xcframework $(foreach fmwk,$(FMWK_NAMES),-framework $(DIST_DIR)/$(fmwk)/agent.framework) -output $@
 	rm -rf $(foreach fmwk,$(FMWK_NAMES),$(DIST_DIR)/$(fmwk))
 

Package.swift

@@ -1,10 +1,3 @@
-//
-//  Package.swift
-//  sqlite-agent
-//
-//  Created by Gioele Cantoni on 05/11/25.
-//
-
 // swift-tools-version: 6.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
@@ -14,27 +7,20 @@ let package = Package(
     name: "agent",
     platforms: [.macOS(.v11), .iOS(.v11)],
     products: [
-        // Products can be used to vend plugins, making them visible to other packages.
-        .plugin(
-            name: "agentPlugin",
-            targets: ["agentPlugin"]),
         .library(
             name: "agent",
             targets: ["agent"])
     ],
     targets: [
-        // Build tool plugin that invokes the Makefile
-        .plugin(
-            name: "agentPlugin",
-            capability: .buildTool(),
-            path: "packages/swift/plugin"
+        .binaryTarget(
+            name: "agentBinary",
+            url: "https://github.com/sqliteai/sqlite-agent/releases/download/0.1.8/agent-apple-xcframework-0.1.8.zip",
+            checksum: "0000000000000000000000000000000000000000000000000000000000000000"
         ),
-        // agent library target
         .target(
             name: "agent",
-            dependencies: [],
-            path: "packages/swift/extension",
-            plugins: ["agentPlugin"]
+            dependencies: ["agentBinary"],
+            path: "packages/swift"
         ),
     ]
 )

packages/swift/agent.swift

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

packages/swift/extension/agent.swift

@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-#define SQLITE_AGENT_VERSION "0.1.7"
+#define SQLITE_AGENT_VERSION "0.1.8"
 
 /**
  * SQLite extension entry point