diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 9cb503b..3877afc 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,8 +1,8 @@ PODS: - - rapidsnark (0.0.1-alpha.3): - - rapidsnark/rapidsnark (= 0.0.1-alpha.3) - - rapidsnark/C (0.0.1-alpha.3) - - rapidsnark/rapidsnark (0.0.1-alpha.3): + - rapidsnark (0.0.1-alpha.5): + - rapidsnark/rapidsnark (= 0.0.1-alpha.5) + - rapidsnark/C (0.0.1-alpha.5) + - rapidsnark/rapidsnark (0.0.1-alpha.5): - rapidsnark/C DEPENDENCIES: @@ -13,7 +13,7 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - rapidsnark: d7ec571676bc69b2dd27b00e8a20d3d3fb9b023f + rapidsnark: 4e70fa2f70e3b0846a0c1bf94a635113f261ada9 PODFILE CHECKSUM: 96331fd92ed9651d0ec43feadad116a15c20e7c7 diff --git a/Example/Pods/Local Podspecs/rapidsnark.podspec.json b/Example/Pods/Local Podspecs/rapidsnark.podspec.json index 7d9433c..1e29a38 100644 --- a/Example/Pods/Local Podspecs/rapidsnark.podspec.json +++ b/Example/Pods/Local Podspecs/rapidsnark.podspec.json @@ -1,6 +1,6 @@ { "name": "rapidsnark", - "version": "0.0.1-alpha.3", + "version": "0.0.1-alpha.5", "summary": "Swift wrapper for the rapidsnark proof generation library.", "description": "This library is Swift wrapper for the [Rapidsnark](https://github.com/iden3/rapidsnark). It enables the\ngeneration of proofs for specified circuits within an iOS environment.", "homepage": "https://github.com/iden3/ios-rapidsnark", @@ -13,7 +13,7 @@ }, "source": { "git": "https://github.com/iden3/ios-rapidsnark.git", - "tag": "0.0.1-alpha.3" + "tag": "0.0.1-alpha.5" }, "platforms": { "ios": "12.0" diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index 9cb503b..3877afc 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -1,8 +1,8 @@ PODS: - - rapidsnark (0.0.1-alpha.3): - - rapidsnark/rapidsnark (= 0.0.1-alpha.3) - - rapidsnark/C (0.0.1-alpha.3) - - rapidsnark/rapidsnark (0.0.1-alpha.3): + - rapidsnark (0.0.1-alpha.5): + - rapidsnark/rapidsnark (= 0.0.1-alpha.5) + - rapidsnark/C (0.0.1-alpha.5) + - rapidsnark/rapidsnark (0.0.1-alpha.5): - rapidsnark/C DEPENDENCIES: @@ -13,7 +13,7 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - rapidsnark: d7ec571676bc69b2dd27b00e8a20d3d3fb9b023f + rapidsnark: 4e70fa2f70e3b0846a0c1bf94a635113f261ada9 PODFILE CHECKSUM: 96331fd92ed9651d0ec43feadad116a15c20e7c7 diff --git a/Example/Pods/Target Support Files/rapidsnark/rapidsnark-xcframeworks.sh b/Example/Pods/Target Support Files/rapidsnark/rapidsnark-xcframeworks.sh new file mode 100755 index 0000000..b65d44c --- /dev/null +++ b/Example/Pods/Target Support Files/rapidsnark/rapidsnark-xcframeworks.sh @@ -0,0 +1,121 @@ +#!/bin/sh +set -e +set -u +set -o pipefail + +function on_error { + echo "$(realpath -mq "${0}"):$1: error: Unexpected failure" +} +trap 'on_error $LINENO' ERR + + +# This protects against multiple targets copying the same framework dependency at the same time. The solution +# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html +RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") + + +variant_for_slice() +{ + case "$1" in + "Rapidsnark.xcframework/ios-arm64") + echo "" + ;; + "Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator") + echo "simulator" + ;; + esac +} + +archs_for_slice() +{ + case "$1" in + "Rapidsnark.xcframework/ios-arm64") + echo "arm64" + ;; + "Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator") + echo "arm64 arm64e x86_64" + ;; + esac +} + +copy_dir() +{ + local source="$1" + local destination="$2" + + # Use filter instead of exclude so missing patterns don't throw errors. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" \"${source}*\" \"${destination}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}"/* "${destination}" +} + +SELECT_SLICE_RETVAL="" + +select_slice() { + local xcframework_name="$1" + xcframework_name="${xcframework_name##*/}" + local paths=("${@:2}") + # Locate the correct slice of the .xcframework for the current architectures + local target_path="" + + # Split archs on space so we can find a slice that has all the needed archs + local target_archs=$(echo $ARCHS | tr " " "\n") + + local target_variant="" + if [[ "$PLATFORM_NAME" == *"simulator" ]]; then + target_variant="simulator" + fi + if [[ ! -z ${EFFECTIVE_PLATFORM_NAME+x} && "$EFFECTIVE_PLATFORM_NAME" == *"maccatalyst" ]]; then + target_variant="maccatalyst" + fi + for i in ${!paths[@]}; do + local matched_all_archs="1" + local slice_archs="$(archs_for_slice "${xcframework_name}/${paths[$i]}")" + local slice_variant="$(variant_for_slice "${xcframework_name}/${paths[$i]}")" + for target_arch in $target_archs; do + if ! [[ "${slice_variant}" == "$target_variant" ]]; then + matched_all_archs="0" + break + fi + + if ! echo "${slice_archs}" | tr " " "\n" | grep -F -q -x "$target_arch"; then + matched_all_archs="0" + break + fi + done + + if [[ "$matched_all_archs" == "1" ]]; then + # Found a matching slice + echo "Selected xcframework slice ${paths[$i]}" + SELECT_SLICE_RETVAL=${paths[$i]} + break + fi + done +} + +install_xcframework() { + local basepath="$1" + local name="$2" + local package_type="$3" + local paths=("${@:4}") + + # Locate the correct slice of the .xcframework for the current architectures + select_slice "${basepath}" "${paths[@]}" + local target_path="$SELECT_SLICE_RETVAL" + if [[ -z "$target_path" ]]; then + echo "warning: [CP] $(basename ${basepath}): Unable to find matching slice in '${paths[@]}' for the current build architectures ($ARCHS) and platform (${EFFECTIVE_PLATFORM_NAME-${PLATFORM_NAME}})." + return + fi + local source="$basepath/$target_path" + + local destination="${PODS_XCFRAMEWORKS_BUILD_DIR}/${name}" + + if [ ! -d "$destination" ]; then + mkdir -p "$destination" + fi + + copy_dir "$source/" "$destination" + echo "Copied $source to $destination" +} + +install_xcframework "${PODS_ROOT}/../../Libs/Rapidsnark.xcframework" "rapidsnark/C" "library" "ios-arm64" "ios-arm64_arm64e_x86_64-simulator" + diff --git a/Example/rapidsnark.xcodeproj/project.pbxproj b/Example/rapidsnark.xcodeproj/project.pbxproj index a588fcc..5507e27 100644 --- a/Example/rapidsnark.xcodeproj/project.pbxproj +++ b/Example/rapidsnark.xcodeproj/project.pbxproj @@ -30,10 +30,22 @@ }; /* End PBXContainerItemProxy section */ +/* Begin PBXCopyFilesBuildPhase section */ + 8DEDA6C22C57BEC600862F04 /* Embed Libraries */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Libraries"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 0F2164B4B8EA20B1620A220C /* Pods-rapidsnark_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-rapidsnark_Example.release.xcconfig"; path = "Target Support Files/Pods-rapidsnark_Example/Pods-rapidsnark_Example.release.xcconfig"; sourceTree = ""; }; 0F39D437746DADFB4102250B /* Pods_rapidsnark_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_rapidsnark_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4603F60D9C64E5A2CA629060 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; 5ED00401D06EC536FD44EE01 /* Pods-rapidsnark_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-rapidsnark_Tests.release.xcconfig"; path = "Target Support Files/Pods-rapidsnark_Tests/Pods-rapidsnark_Tests.release.xcconfig"; sourceTree = ""; }; 607FACD01AFB9204008FA782 /* rapidsnark_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = rapidsnark_Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; 607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -154,7 +166,6 @@ children = ( 927BBA4BCDCC94C20BA8C102 /* rapidsnark.podspec */, F827A23EC7488C84CBB2C386 /* README.md */, - 4603F60D9C64E5A2CA629060 /* LICENSE */, ); name = "Podspec Metadata"; sourceTree = ""; @@ -179,7 +190,8 @@ 607FACCC1AFB9204008FA782 /* Sources */, 607FACCD1AFB9204008FA782 /* Frameworks */, 607FACCE1AFB9204008FA782 /* Resources */, - A08CA7223C3D3EE5B9E81202 /* [CP] Embed Pods Frameworks */, + 8DEDA6C22C57BEC600862F04 /* Embed Libraries */, + 603447A157FC52233E45C654 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -222,7 +234,7 @@ 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; DevelopmentTeam = 2U6UZ9UZP9; - LastSwiftMigration = 0900; + LastSwiftMigration = 1540; }; 607FACE41AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; @@ -298,7 +310,7 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - A08CA7223C3D3EE5B9E81202 /* [CP] Embed Pods Frameworks */ = { + 603447A157FC52233E45C654 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -492,13 +504,27 @@ baseConfigurationReference = EAF9F874EEF0E33738A95C3D /* Pods-rapidsnark_Example.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; DEVELOPMENT_TEAM = 2U6UZ9UZP9; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "\"${PODS_CONFIGURATION_BUILD_DIR}/rapidsnark/rapidsnark.framework/Headers\"", + "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/rapidsnark/C/Headers\"", + "/Users/moria/development/projects/rapidsnark-ios/Example/rapidsnark", + ); INFOPLIST_FILE = rapidsnark/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)", + "/Users/moria/development/projects/rapidsnark-ios/Example", + ); MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "rapidsnark/rapidsnark_Example-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; }; @@ -509,13 +535,26 @@ baseConfigurationReference = 0F2164B4B8EA20B1620A220C /* Pods-rapidsnark_Example.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; DEVELOPMENT_TEAM = 2U6UZ9UZP9; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "\"${PODS_CONFIGURATION_BUILD_DIR}/rapidsnark/rapidsnark.framework/Headers\"", + "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/rapidsnark/C/Headers\"", + "/Users/moria/development/projects/rapidsnark-ios/Example/rapidsnark", + ); INFOPLIST_FILE = rapidsnark/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)", + "/Users/moria/development/projects/rapidsnark-ios/Example", + ); MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "rapidsnark/rapidsnark_Example-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; }; diff --git a/Example/rapidsnark/Base.lproj/Main.storyboard b/Example/rapidsnark/Base.lproj/Main.storyboard index 0eb0c92..b6e3ca3 100644 --- a/Example/rapidsnark/Base.lproj/Main.storyboard +++ b/Example/rapidsnark/Base.lproj/Main.storyboard @@ -3,7 +3,7 @@ - + @@ -102,6 +102,15 @@ + diff --git a/Example/rapidsnark/rapidsnark_Example-Bridging-Header.h b/Example/rapidsnark/rapidsnark_Example-Bridging-Header.h new file mode 100644 index 0000000..1b2cb5d --- /dev/null +++ b/Example/rapidsnark/rapidsnark_Example-Bridging-Header.h @@ -0,0 +1,4 @@ +// +// Use this file to import your target's public headers that you would like to expose to Swift. +// + diff --git a/Libs/Rapidsnark.xcframework/Info.plist b/Libs/Rapidsnark.xcframework/Info.plist index 327aaa7..c1fd302 100644 --- a/Libs/Rapidsnark.xcframework/Info.plist +++ b/Libs/Rapidsnark.xcframework/Info.plist @@ -10,7 +10,7 @@ HeadersPath Headers LibraryIdentifier - ios-arm64-simulator + ios-arm64 LibraryPath librapidsnarkmerged.a SupportedArchitectures @@ -19,8 +19,6 @@ SupportedPlatform ios - SupportedPlatformVariant - simulator BinaryPath @@ -28,16 +26,19 @@ HeadersPath Headers LibraryIdentifier - ios-arm64_arm64e + ios-arm64_arm64e_x86_64-simulator LibraryPath librapidsnarkmerged.a SupportedArchitectures arm64 arm64e + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator CFBundlePackageType diff --git a/Libs/Rapidsnark.xcframework/ios-arm64-simulator/librapidsnarkmerged.a b/Libs/Rapidsnark.xcframework/ios-arm64-simulator/librapidsnarkmerged.a deleted file mode 100644 index b2fb1a2..0000000 Binary files a/Libs/Rapidsnark.xcframework/ios-arm64-simulator/librapidsnarkmerged.a and /dev/null differ diff --git a/Libs/Rapidsnark.xcframework/ios-arm64-simulator/Headers/RapidsnarkFramework.h b/Libs/Rapidsnark.xcframework/ios-arm64/Headers/RapidsnarkFramework.h similarity index 100% rename from Libs/Rapidsnark.xcframework/ios-arm64-simulator/Headers/RapidsnarkFramework.h rename to Libs/Rapidsnark.xcframework/ios-arm64/Headers/RapidsnarkFramework.h diff --git a/Libs/Rapidsnark.xcframework/ios-arm64-simulator/Headers/prover.h b/Libs/Rapidsnark.xcframework/ios-arm64/Headers/prover.h similarity index 100% rename from Libs/Rapidsnark.xcframework/ios-arm64-simulator/Headers/prover.h rename to Libs/Rapidsnark.xcframework/ios-arm64/Headers/prover.h diff --git a/Libs/Rapidsnark.xcframework/ios-arm64-simulator/Headers/verifier.h b/Libs/Rapidsnark.xcframework/ios-arm64/Headers/verifier.h similarity index 100% rename from Libs/Rapidsnark.xcframework/ios-arm64-simulator/Headers/verifier.h rename to Libs/Rapidsnark.xcframework/ios-arm64/Headers/verifier.h diff --git a/Libs/Rapidsnark.xcframework/ios-arm64/librapidsnarkmerged.a b/Libs/Rapidsnark.xcframework/ios-arm64/librapidsnarkmerged.a new file mode 100644 index 0000000..ac4e511 Binary files /dev/null and b/Libs/Rapidsnark.xcframework/ios-arm64/librapidsnarkmerged.a differ diff --git a/Libs/Rapidsnark.xcframework/ios-arm64_arm64e/librapidsnarkmerged.a b/Libs/Rapidsnark.xcframework/ios-arm64_arm64e/librapidsnarkmerged.a deleted file mode 100644 index a77a247..0000000 Binary files a/Libs/Rapidsnark.xcframework/ios-arm64_arm64e/librapidsnarkmerged.a and /dev/null differ diff --git a/Libs/Rapidsnark.xcframework/ios-arm64_arm64e/Headers/RapidsnarkFramework.h b/Libs/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/Headers/RapidsnarkFramework.h similarity index 100% rename from Libs/Rapidsnark.xcframework/ios-arm64_arm64e/Headers/RapidsnarkFramework.h rename to Libs/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/Headers/RapidsnarkFramework.h diff --git a/Libs/Rapidsnark.xcframework/ios-arm64_arm64e/Headers/prover.h b/Libs/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/Headers/prover.h similarity index 100% rename from Libs/Rapidsnark.xcframework/ios-arm64_arm64e/Headers/prover.h rename to Libs/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/Headers/prover.h diff --git a/Libs/Rapidsnark.xcframework/ios-arm64_arm64e/Headers/verifier.h b/Libs/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/Headers/verifier.h similarity index 100% rename from Libs/Rapidsnark.xcframework/ios-arm64_arm64e/Headers/verifier.h rename to Libs/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/Headers/verifier.h diff --git a/Libs/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/librapidsnarkmerged.a b/Libs/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/librapidsnarkmerged.a new file mode 100644 index 0000000..f0cf083 Binary files /dev/null and b/Libs/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/librapidsnarkmerged.a differ diff --git a/rapidsnark.podspec b/rapidsnark.podspec index 22dc7ac..fd43dcb 100644 --- a/rapidsnark.podspec +++ b/rapidsnark.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'rapidsnark' - s.version = '0.0.1-alpha.4' + s.version = '0.0.1-alpha.5' s.summary = 'Swift wrapper for the rapidsnark proof generation library.' # This description is used to generate tags and improve search results. diff --git a/xcframework/Rapidsnark.xcframework/Info.plist b/xcframework/Rapidsnark.xcframework/Info.plist index 327aaa7..c1fd302 100644 --- a/xcframework/Rapidsnark.xcframework/Info.plist +++ b/xcframework/Rapidsnark.xcframework/Info.plist @@ -10,7 +10,7 @@ HeadersPath Headers LibraryIdentifier - ios-arm64-simulator + ios-arm64 LibraryPath librapidsnarkmerged.a SupportedArchitectures @@ -19,8 +19,6 @@ SupportedPlatform ios - SupportedPlatformVariant - simulator BinaryPath @@ -28,16 +26,19 @@ HeadersPath Headers LibraryIdentifier - ios-arm64_arm64e + ios-arm64_arm64e_x86_64-simulator LibraryPath librapidsnarkmerged.a SupportedArchitectures arm64 arm64e + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator CFBundlePackageType diff --git a/xcframework/Rapidsnark.xcframework/ios-arm64-simulator/librapidsnarkmerged.a b/xcframework/Rapidsnark.xcframework/ios-arm64-simulator/librapidsnarkmerged.a deleted file mode 100644 index b2fb1a2..0000000 Binary files a/xcframework/Rapidsnark.xcframework/ios-arm64-simulator/librapidsnarkmerged.a and /dev/null differ diff --git a/xcframework/Rapidsnark.xcframework/ios-arm64-simulator/Headers/RapidsnarkFramework.h b/xcframework/Rapidsnark.xcframework/ios-arm64/Headers/RapidsnarkFramework.h similarity index 100% rename from xcframework/Rapidsnark.xcframework/ios-arm64-simulator/Headers/RapidsnarkFramework.h rename to xcframework/Rapidsnark.xcframework/ios-arm64/Headers/RapidsnarkFramework.h diff --git a/xcframework/Rapidsnark.xcframework/ios-arm64-simulator/Headers/prover.h b/xcframework/Rapidsnark.xcframework/ios-arm64/Headers/prover.h similarity index 100% rename from xcframework/Rapidsnark.xcframework/ios-arm64-simulator/Headers/prover.h rename to xcframework/Rapidsnark.xcframework/ios-arm64/Headers/prover.h diff --git a/xcframework/Rapidsnark.xcframework/ios-arm64-simulator/Headers/verifier.h b/xcframework/Rapidsnark.xcframework/ios-arm64/Headers/verifier.h similarity index 100% rename from xcframework/Rapidsnark.xcframework/ios-arm64-simulator/Headers/verifier.h rename to xcframework/Rapidsnark.xcframework/ios-arm64/Headers/verifier.h diff --git a/xcframework/Rapidsnark.xcframework/ios-arm64/librapidsnarkmerged.a b/xcframework/Rapidsnark.xcframework/ios-arm64/librapidsnarkmerged.a new file mode 100644 index 0000000..ac4e511 Binary files /dev/null and b/xcframework/Rapidsnark.xcframework/ios-arm64/librapidsnarkmerged.a differ diff --git a/xcframework/Rapidsnark.xcframework/ios-arm64_arm64e/librapidsnarkmerged.a b/xcframework/Rapidsnark.xcframework/ios-arm64_arm64e/librapidsnarkmerged.a deleted file mode 100644 index a77a247..0000000 Binary files a/xcframework/Rapidsnark.xcframework/ios-arm64_arm64e/librapidsnarkmerged.a and /dev/null differ diff --git a/xcframework/Rapidsnark.xcframework/ios-arm64_arm64e/Headers/RapidsnarkFramework.h b/xcframework/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/Headers/RapidsnarkFramework.h similarity index 100% rename from xcframework/Rapidsnark.xcframework/ios-arm64_arm64e/Headers/RapidsnarkFramework.h rename to xcframework/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/Headers/RapidsnarkFramework.h diff --git a/xcframework/Rapidsnark.xcframework/ios-arm64_arm64e/Headers/prover.h b/xcframework/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/Headers/prover.h similarity index 100% rename from xcframework/Rapidsnark.xcframework/ios-arm64_arm64e/Headers/prover.h rename to xcframework/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/Headers/prover.h diff --git a/xcframework/Rapidsnark.xcframework/ios-arm64_arm64e/Headers/verifier.h b/xcframework/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/Headers/verifier.h similarity index 100% rename from xcframework/Rapidsnark.xcframework/ios-arm64_arm64e/Headers/verifier.h rename to xcframework/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/Headers/verifier.h diff --git a/xcframework/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/librapidsnarkmerged.a b/xcframework/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/librapidsnarkmerged.a new file mode 100644 index 0000000..f0cf083 Binary files /dev/null and b/xcframework/Rapidsnark.xcframework/ios-arm64_arm64e_x86_64-simulator/librapidsnarkmerged.a differ diff --git a/xcframework/libs_ios/libfq.a b/xcframework/libs_ios/libfq.a index 61b91cc..3b8c293 100644 Binary files a/xcframework/libs_ios/libfq.a and b/xcframework/libs_ios/libfq.a differ diff --git a/xcframework/libs_ios/libfr.a b/xcframework/libs_ios/libfr.a index 8ad16c4..4a18b10 100644 Binary files a/xcframework/libs_ios/libfr.a and b/xcframework/libs_ios/libfr.a differ diff --git a/xcframework/libs_ios/libgmp.a b/xcframework/libs_ios/libgmp.a index 53e0792..18df374 100644 Binary files a/xcframework/libs_ios/libgmp.a and b/xcframework/libs_ios/libgmp.a differ diff --git a/xcframework/libs_ios/librapidsnark.a b/xcframework/libs_ios/librapidsnark.a index 63c9099..4893881 100644 Binary files a/xcframework/libs_ios/librapidsnark.a and b/xcframework/libs_ios/librapidsnark.a differ diff --git a/xcframework/libs_ios/librapidsnarkmerged.a b/xcframework/libs_ios/librapidsnarkmerged.a index b2fb1a2..ac4e511 100644 Binary files a/xcframework/libs_ios/librapidsnarkmerged.a and b/xcframework/libs_ios/librapidsnarkmerged.a differ diff --git a/xcframework/libs_sim/libfq.a b/xcframework/libs_sim/libfq.a index dac9237..80f3594 100644 Binary files a/xcframework/libs_sim/libfq.a and b/xcframework/libs_sim/libfq.a differ diff --git a/xcframework/libs_sim/libfr.a b/xcframework/libs_sim/libfr.a index a98b7dd..299e24e 100644 Binary files a/xcframework/libs_sim/libfr.a and b/xcframework/libs_sim/libfr.a differ diff --git a/xcframework/libs_sim/libgmp.a b/xcframework/libs_sim/libgmp.a index aa2ea5f..bc69771 100644 Binary files a/xcframework/libs_sim/libgmp.a and b/xcframework/libs_sim/libgmp.a differ diff --git a/xcframework/libs_sim/librapidsnark.a b/xcframework/libs_sim/librapidsnark.a index 7095c77..0bbbd70 100644 Binary files a/xcframework/libs_sim/librapidsnark.a and b/xcframework/libs_sim/librapidsnark.a differ diff --git a/xcframework/libs_sim/librapidsnarkmerged.a b/xcframework/libs_sim/librapidsnarkmerged.a index a77a247..f0cf083 100644 Binary files a/xcframework/libs_sim/librapidsnarkmerged.a and b/xcframework/libs_sim/librapidsnarkmerged.a differ