diff --git a/CHANGELOG.md b/CHANGELOG.md index 451a225..904bbc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 1.0.6 + +## Fixes +- Ensure new module headers point to right places ## 1.0.5 diff --git a/Cargo.toml b/Cargo.toml index 084d78b..0ed4a2f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cel-eval" -version = "1.0.5" +version = "1.0.6" 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 67188e2..c7adf00 100755 --- a/build_ios.sh +++ b/build_ios.sh @@ -213,6 +213,12 @@ xcodebuild -create-xcframework \ -library ./target/xcframeworks/watchos-device/libcel.a -headers ./target/xcframeworks/headers/watchos-device \ -output ./target/xcframeworks/libcel.xcframework +<<<<<<< Updated upstream +======= +<<<<<<< Updated upstream +echo "XCFramework built at ./target/xcframeworks/libcel.xcframework" +======= +>>>>>>> Stashed changes echo "XCFramework built at ./target/xcframeworks/libcel.xcframework" # Restructure module maps to avoid SPM conflicts @@ -230,7 +236,18 @@ for slice_dir in "$XCFW_PATH"/*/; do # Move module.modulemap from Headers to Modules mv "$slice_dir/Headers/module.modulemap" "$slice_dir/Modules/module.modulemap" +<<<<<<< Updated upstream + fi +done + +echo "Module map restructuring complete - SPM compatible" +======= + + # Update header paths in modulemap to point to ../Headers/ + sed -i '' 's|header "\([^"]*\)"|header "../Headers/\1"|g' "$slice_dir/Modules/module.modulemap" fi done -echo "Module map restructuring complete - SPM compatible" \ No newline at end of file +echo "Module map restructuring complete - SPM compatible" +>>>>>>> Stashed changes +>>>>>>> Stashed changes