From 83fe1b9d9150478f1cd340f2fb480fbc296bfb87 Mon Sep 17 00:00:00 2001 From: Ian Rumac Date: Sat, 15 Nov 2025 17:01:45 +0100 Subject: [PATCH] Ensure only namespaced modules exist --- CHANGELOG.md | 5 +++++ Cargo.toml | 2 +- build_ios.sh | 23 ++--------------------- wasm/Cargo.toml | 2 +- 4 files changed, 9 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06ee5c1..aeeb2a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +## 1.0.10 + +## Fixes +- Removes modulemap from outputs + ## 1.0.9 ## Fixes diff --git a/Cargo.toml b/Cargo.toml index 84dc1d0..0c4d0b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cel-eval" -version = "1.0.9" +version = "1.0.10" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.htmlž diff --git a/build_ios.sh b/build_ios.sh index 27fb3e9..ef93cec 100755 --- a/build_ios.sh +++ b/build_ios.sh @@ -215,24 +215,5 @@ xcodebuild -create-xcframework \ echo "XCFramework built at ./target/xcframeworks/libcel.xcframework" -# Create Modules directory for SPM compatibility -# SPM prefers Modules/module.modulemap and won't stage it to global include path -echo "Creating Modules directory for SPM compatibility" -XCFW_PATH="./target/xcframeworks/libcel.xcframework" - -for slice_dir in "$XCFW_PATH"/*/; do - if [ -f "$slice_dir/Headers/celFFI/module.modulemap" ]; then - slice_name=$(basename "$slice_dir") - echo " Processing $slice_name" - - # Create Modules directory - mkdir -p "$slice_dir/Modules" - - # Copy module.modulemap to Modules with adjusted header paths to point to celFFI subdirectory - sed 's|header "\([^"]*\)"|header "../Headers/celFFI/\1"|g' "$slice_dir/Headers/celFFI/module.modulemap" > "$slice_dir/Modules/module.modulemap" - fi -done - -echo "Module map structure created:" -echo " - Headers/celFFI/module.modulemap (for CocoaPods, isolated path prevents Xcode collisions)" -echo " - Modules/module.modulemap (for SPM - avoids staging conflicts)" +echo "XCFramework structure with namespaced headers:" +echo " - Headers/celFFI/module.modulemap (subdirectory prevents staging collisions)" diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml index eff3efd..c88b34a 100644 --- a/wasm/Cargo.toml +++ b/wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "superscript" -version = "1.0.7" +version = "1.0.10" edition = "2021" publish = false