Skip to content

Commit 80019e2

Browse files
authored
Merge pull request #39 from superwall/develop
1.0.7
2 parents e7796b6 + 29152f9 commit 80019e2

4 files changed

Lines changed: 7 additions & 16 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# CHANGELOG
22

3+
## 1.0.7
4+
5+
## Fixes
6+
- Fix iOS build script
7+
38
## 1.0.6
49

510
## Fixes

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cel-eval"
3-
version = "1.0.6"
3+
version = "1.0.7"
44
edition = "2021"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.htmlž

build_ios.sh

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,6 @@ xcodebuild -create-xcframework \
213213
-library ./target/xcframeworks/watchos-device/libcel.a -headers ./target/xcframeworks/headers/watchos-device \
214214
-output ./target/xcframeworks/libcel.xcframework
215215

216-
<<<<<<< Updated upstream
217-
=======
218-
<<<<<<< Updated upstream
219-
echo "XCFramework built at ./target/xcframeworks/libcel.xcframework"
220-
=======
221-
>>>>>>> Stashed changes
222216
echo "XCFramework built at ./target/xcframeworks/libcel.xcframework"
223217

224218
# Restructure module maps to avoid SPM conflicts
@@ -236,18 +230,10 @@ for slice_dir in "$XCFW_PATH"/*/; do
236230

237231
# Move module.modulemap from Headers to Modules
238232
mv "$slice_dir/Headers/module.modulemap" "$slice_dir/Modules/module.modulemap"
239-
<<<<<<< Updated upstream
240-
fi
241-
done
242-
243-
echo "Module map restructuring complete - SPM compatible"
244-
=======
245233

246234
# Update header paths in modulemap to point to ../Headers/
247235
sed -i '' 's|header "\([^"]*\)"|header "../Headers/\1"|g' "$slice_dir/Modules/module.modulemap"
248236
fi
249237
done
250238

251239
echo "Module map restructuring complete - SPM compatible"
252-
>>>>>>> Stashed changes
253-
>>>>>>> Stashed changes

wasm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "superscript"
3-
version = "0.2.4"
3+
version = "1.0.7"
44
edition = "2021"
55
publish = false
66

0 commit comments

Comments
 (0)