From bc9bdf6f18e1b5113de0f23882d364454ece40b0 Mon Sep 17 00:00:00 2001 From: Borja Castellano Date: Mon, 22 Jun 2026 01:46:19 -0700 Subject: [PATCH] chore(swift-sdk): correctly refer to the swift sdk as swift in the build script and cargo profiles --- .claude/skills/simulator-control/SKILL.md | 2 +- .github/workflows/swift-example-app-ui-smoke.yml | 2 +- .github/workflows/swift-sdk-release.yml | 2 +- Cargo.toml | 14 +++++++------- .../IMPLEMENTATION_SUMMARY.md | 2 +- .../swift-sdk/{build_ios.sh => build_swift.sh} | 8 ++++---- packages/swift-sdk/run_tests.sh | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) rename packages/swift-sdk/{build_ios.sh => build_swift.sh} (97%) diff --git a/.claude/skills/simulator-control/SKILL.md b/.claude/skills/simulator-control/SKILL.md index 698696be3f1..85fd58d001f 100644 --- a/.claude/skills/simulator-control/SKILL.md +++ b/.claude/skills/simulator-control/SKILL.md @@ -275,7 +275,7 @@ If `idb connect` succeeds but `idb ui describe-all` returns a single root elemen ### Install the latest build before driving the UI -The skill assumes the binary on the simulator is current. It's not, if you've built but forgotten to install. After every `./build_ios.sh --target sim` (or any code change), push the fresh artifact: +The skill assumes the binary on the simulator is current. It's not, if you've built but forgotten to install. After every `./build_swift.sh --target sim` (or any code change), push the fresh artifact: ```bash BUNDLE=org.dashfoundation.SwiftExampleApp diff --git a/.github/workflows/swift-example-app-ui-smoke.yml b/.github/workflows/swift-example-app-ui-smoke.yml index 71b04b13749..164b3a4ef23 100644 --- a/.github/workflows/swift-example-app-ui-smoke.yml +++ b/.github/workflows/swift-example-app-ui-smoke.yml @@ -86,7 +86,7 @@ jobs: - name: Build simulator DashSDKFFI.xcframework run: | - bash packages/swift-sdk/build_ios.sh --target sim --profile dev + bash packages/swift-sdk/build_swift.sh --target sim --profile dev - name: Create disposable iOS simulator id: simulator diff --git a/.github/workflows/swift-sdk-release.yml b/.github/workflows/swift-sdk-release.yml index ebdd882a759..57d80d186f5 100644 --- a/.github/workflows/swift-sdk-release.yml +++ b/.github/workflows/swift-sdk-release.yml @@ -59,7 +59,7 @@ jobs: - name: Build DashSDKFFI.xcframework and install into Swift package run: | - bash packages/swift-sdk/build_ios.sh --target all --profile release + bash packages/swift-sdk/build_swift.sh --target all --profile release - name: Zip XCFramework and compute checksum id: zip diff --git a/Cargo.toml b/Cargo.toml index 5d5f2960f1d..88ebd7127a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,10 +61,10 @@ dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "5c0113 tokio-metrics = "0.5" -# Size-tuned profile for the iOS `rs-unified-sdk-ffi` staticlib, which -# otherwise ships huge. Inherits `release` and is ONLY used by the iOS -# build (`build_ios.sh --profile release`) -[profile.release-ios] +# Size-tuned profile for the iOS `rs-unified-sdk-ffi` staticlibs, which +# otherwise ships huge. Inherits `release` and is ONLY used by the Swift +# build (`build_swift.sh --profile release`) +[profile.release-swift] inherits = "release" panic = "abort" strip = "symbols" @@ -72,9 +72,9 @@ lto = "fat" codegen-units = 1 opt-level = 3 -# Debug counterpart for smaller iOS dev builds. Inherits the standard `dev` -# profile (and is ONLY used by the iOS build (`build_ios.sh --profile dev`) -[profile.dev-ios] +# Debug counterpart for smaller Swift dev builds. Inherits the standard `dev` +# profile (and is ONLY used by the Swift build (`build_swift.sh --profile dev`) +[profile.dev-swift] inherits = "dev" panic = "abort" lto = "thin" diff --git a/packages/rs-platform-wallet-ffi/IMPLEMENTATION_SUMMARY.md b/packages/rs-platform-wallet-ffi/IMPLEMENTATION_SUMMARY.md index e109e68b7e2..9e13f3de698 100644 --- a/packages/rs-platform-wallet-ffi/IMPLEMENTATION_SUMMARY.md +++ b/packages/rs-platform-wallet-ffi/IMPLEMENTATION_SUMMARY.md @@ -110,7 +110,7 @@ All Week 1-8 tasks have been completed without stubs. - Core types: Handle, IdentifierBytes, NetworkType, BlockTime, etc. **Build System:** -- Integrated into existing `swift-sdk/build_ios.sh` +- Integrated into existing `swift-sdk/build_swift.sh` - No standalone build script needed - Compiles cleanly with unified xcframework diff --git a/packages/swift-sdk/build_ios.sh b/packages/swift-sdk/build_swift.sh similarity index 97% rename from packages/swift-sdk/build_ios.sh rename to packages/swift-sdk/build_swift.sh index a41a432ced1..d45ff62a787 100755 --- a/packages/swift-sdk/build_ios.sh +++ b/packages/swift-sdk/build_swift.sh @@ -117,9 +117,9 @@ if ! $BUILD_IOS && ! $BUILD_SIM && ! $BUILD_MAC && ! $BUILD_INTEL_MAC; then show_help fi -# Map the requested base profile (dev|release) onto its iOS-tuned custom -# profile by appending "-ios" (dev-ios / release-ios) -PROFILE="${PROFILE}-ios" +# Map the requested base profile (dev|release) onto its swift-tuned custom +# profile by appending "-swift" (dev-swift / release-swift) +PROFILE="${PROFILE}-swift" OUTPUT_DIR="$PROFILE" log_info "Package: $PACKAGE" @@ -196,7 +196,7 @@ EOF # the bundled SDK exposes the platform-wallet shielded FFI. CARGO_FEATURES="shielded" -if [ "$PROFILE" = "dev-ios" ]; then +if [ "$PROFILE" = "dev-swift" ]; then CARGO_FEATURES="$CARGO_FEATURES tokio-metrics" log_info " → tokio-metrics enabled (dev profile)" fi diff --git a/packages/swift-sdk/run_tests.sh b/packages/swift-sdk/run_tests.sh index 681f7923e07..6cc7918f83d 100755 --- a/packages/swift-sdk/run_tests.sh +++ b/packages/swift-sdk/run_tests.sh @@ -20,7 +20,7 @@ if [ -z "$SIM_NAME" ]; then exit 1 fi -bash build_ios.sh --target all --profile dev +bash build_swift.sh --target all --profile dev swift package clean swift build