diff --git a/Package.swift b/Package.swift index 485d25e..21e9347 100644 --- a/Package.swift +++ b/Package.swift @@ -25,7 +25,8 @@ let package = Package( .binaryTarget( name: "bdkFFI", url: "https://github.com/notmandatory/bdk-swift/releases/download/0.1.0/bdkFFI.xcframework.zip", - checksum: "b34dc1dea2e53bc894f1ad61269e45de6c77dd6391bbb1318cfb0be17435c4db"), + checksum: "496423e55dd5db14cb2b692f59ae6bf527431c59f79ab51d89c83f68e23d4722"), +// .binaryTarget(name: "bdkFFI", path: "./bdkFFI.xcframework"), .target( name: "BitcoinDevKit", dependencies: ["bdkFFI"]), diff --git a/build.sh b/build.sh index 7c4ee81..2e12ca5 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -eo pipefail +set -euo pipefail BUILD_PROFILE=release BDKFFI_DIR=bdk-ffi @@ -22,11 +22,13 @@ swiftc -module-name bdk -emit-library -o libbdkffi.dylib -emit-module -emit-modu ## build bdk-ffi rust libs into xcframework echo "Build bdk-ffi libs into swift xcframework" -APPLE_TRIPLES=("x86_64-apple-darwin" "x86_64-apple-ios" "aarch64-apple-ios") -for TARGET in $APPLE_TRIPLES; do +TARGET_TRIPLES=("x86_64-apple-darwin" "x86_64-apple-ios" "aarch64-apple-ios") +for TARGET in ${TARGET_TRIPLES[@]}; do echo "Build bdk-ffi lib for target $TARGET" cargo build --release --target $TARGET + echo $? done + popd ## Manually construct xcframework @@ -37,7 +39,7 @@ rm -f $XCFRAMEWORK_ROOT.zip # Common files mkdir -p "$XCFRAMEWORK_COMMON/Modules" -cp "$SWIFT_DIR/$XCFRAMEWORK_NAME.modulemap" "$XCFRAMEWORK_COMMON/Modules/" +cp "$SWIFT_DIR/module.modulemap" "$XCFRAMEWORK_COMMON/Modules/" mkdir -p "$XCFRAMEWORK_COMMON/Headers" cp "$SWIFT_DIR/$XCFRAMEWORK_NAME-umbrella.h" "$XCFRAMEWORK_COMMON/Headers" cp "$SWIFT_DIR/$XCFRAMEWORK_NAME.h" "$XCFRAMEWORK_COMMON/Headers"