Skip to content

Commit 57350d0

Browse files
committed
chore: remove macOS support from Swift package, bump to 0.17.6
- Remove macOS targets from build script (aarch64-apple-darwin, x86_64-apple-darwin) - Remove macOS platform from Package.swift - XCFramework now iOS-only (device + simulator)
1 parent cbe4f04 commit 57350d0

5 files changed

Lines changed: 7 additions & 46 deletions

File tree

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cooklang"
3-
version = "0.17.5"
3+
version = "0.17.6"
44
edition = "2021"
55
authors = ["Zheoni <zheoni@outlook.es>"]
66
description = "Cooklang parser with opt-in extensions"

Package.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import class Foundation.ProcessInfo
55
var package = Package(
66
name: "cooklang-rs",
77
platforms: [
8-
.macOS(.v10_15),
98
.iOS(.v15),
109
],
1110
products: [

bindings/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cooklang-bindings"
3-
version = "0.17.5"
3+
version = "0.17.6"
44
edition = "2021"
55
authors = ["dubadub <dubovskoy.a@gmail.com>"]
66
description = "Cooklang Uniffi bindings"

bindings/build-swift.sh

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ WRAPPER_PATH="../swift/Sources/CooklangParser"
1919

2020
AARCH64_APPLE_IOS_PATH="../target/aarch64-apple-ios/release"
2121
AARCH64_APPLE_IOS_SIM_PATH="../target/aarch64-apple-ios-sim/release"
22-
AARCH64_APPLE_DARWIN_PATH="../target/aarch64-apple-darwin/release"
23-
X86_64_APPLE_DARWIN_PATH="../target/x86_64-apple-darwin/release"
2422

25-
targets=("aarch64-apple-ios" "aarch64-apple-ios-sim" "aarch64-apple-darwin" "x86_64-apple-darwin")
23+
targets=("aarch64-apple-ios" "aarch64-apple-ios-sim")
2624

2725
# Build for all targets
2826
for target in "${targets[@]}"; do
@@ -44,13 +42,6 @@ cargo run --features="uniffi/cli" \
4442
--language swift \
4543
--out-dir $OUT_PATH
4644

47-
# Merge libraries with lipo
48-
echo "Merging libraries with lipo..."
49-
cp $AARCH64_APPLE_IOS_SIM_PATH/$LIBRARY_NAME $OUT_PATH/sim-$LIBRARY_NAME
50-
lipo -create $AARCH64_APPLE_DARWIN_PATH/$LIBRARY_NAME \
51-
$X86_64_APPLE_DARWIN_PATH/$LIBRARY_NAME \
52-
-output $OUT_PATH/macos-$LIBRARY_NAME
53-
5445
# Create framework template
5546
rm -rf $OUT_PATH/$FRAMEWORK_NAME
5647
mkdir -p $OUT_PATH/$FRAMEWORK_NAME/Headers
@@ -98,50 +89,21 @@ EOT
9889
rm -rf $OUT_PATH/frameworks
9990
mkdir -p $OUT_PATH/frameworks/sim
10091
mkdir -p $OUT_PATH/frameworks/ios
101-
mkdir -p $OUT_PATH/frameworks/macos
10292
cp -r $OUT_PATH/$FRAMEWORK_NAME $OUT_PATH/frameworks/sim/
10393
cp -r $OUT_PATH/$FRAMEWORK_NAME $OUT_PATH/frameworks/ios/
104-
cp -r $OUT_PATH/$FRAMEWORK_NAME $OUT_PATH/frameworks/macos/
105-
mv $OUT_PATH/sim-$LIBRARY_NAME $OUT_PATH/frameworks/sim/$FRAMEWORK_NAME/$FRAMEWORK_LIBRARY_NAME
106-
mv $OUT_PATH/macos-$LIBRARY_NAME $OUT_PATH/frameworks/macos/$FRAMEWORK_NAME/$FRAMEWORK_LIBRARY_NAME
94+
cp $AARCH64_APPLE_IOS_SIM_PATH/$LIBRARY_NAME $OUT_PATH/frameworks/sim/$FRAMEWORK_NAME/$FRAMEWORK_LIBRARY_NAME
10795
cp $AARCH64_APPLE_IOS_PATH/$LIBRARY_NAME $OUT_PATH/frameworks/ios/$FRAMEWORK_NAME/$FRAMEWORK_LIBRARY_NAME
10896

109-
# Convert macOS framework to versioned bundle structure
110-
echo "Converting macOS framework to versioned bundle structure..."
111-
MACOS_FRAMEWORK_PATH="$OUT_PATH/frameworks/macos/$FRAMEWORK_NAME"
112-
mkdir -p "$MACOS_FRAMEWORK_PATH/Versions/A/Headers"
113-
mkdir -p "$MACOS_FRAMEWORK_PATH/Versions/A/Modules"
114-
mkdir -p "$MACOS_FRAMEWORK_PATH/Versions/A/Resources"
115-
mv "$MACOS_FRAMEWORK_PATH/$FRAMEWORK_LIBRARY_NAME" "$MACOS_FRAMEWORK_PATH/Versions/A/$FRAMEWORK_LIBRARY_NAME"
116-
mv "$MACOS_FRAMEWORK_PATH/Headers/$HEADER_NAME" "$MACOS_FRAMEWORK_PATH/Versions/A/Headers/$HEADER_NAME"
117-
mv "$MACOS_FRAMEWORK_PATH/Modules/module.modulemap" "$MACOS_FRAMEWORK_PATH/Versions/A/Modules/module.modulemap"
118-
mv "$MACOS_FRAMEWORK_PATH/Info.plist" "$MACOS_FRAMEWORK_PATH/Versions/A/Resources/Info.plist"
119-
rmdir "$MACOS_FRAMEWORK_PATH/Headers"
120-
rmdir "$MACOS_FRAMEWORK_PATH/Modules"
121-
ln -s A "$MACOS_FRAMEWORK_PATH/Versions/Current"
122-
ln -s Versions/Current/$FRAMEWORK_LIBRARY_NAME "$MACOS_FRAMEWORK_PATH/$FRAMEWORK_LIBRARY_NAME"
123-
ln -s Versions/Current/Headers "$MACOS_FRAMEWORK_PATH/Headers"
124-
ln -s Versions/Current/Modules "$MACOS_FRAMEWORK_PATH/Modules"
125-
ln -s Versions/Current/Resources "$MACOS_FRAMEWORK_PATH/Resources"
126-
12797
# Create xcframework
12898
echo "Creating xcframework..."
12999
rm -rf $OUT_PATH/$XC_FRAMEWORK_NAME
130100
xcodebuild -create-xcframework \
131101
-framework $OUT_PATH/frameworks/sim/$FRAMEWORK_NAME \
132102
-framework $OUT_PATH/frameworks/ios/$FRAMEWORK_NAME \
133-
-framework $OUT_PATH/frameworks/macos/$FRAMEWORK_NAME \
134103
-output $OUT_PATH/$XC_FRAMEWORK_NAME
135104

136105
# Copy swift wrapper
137-
# Need some temporary workarounds to compile swift wrapper
138-
# https://github.com/rust-lang/cargo/issues/11953
139-
cat <<EOT > $OUT_PATH/import.txt
140-
#if os(macOS)
141-
import SystemConfiguration
142-
#endif
143-
EOT
144-
cat $OUT_PATH/import.txt $OUT_PATH/$NAME.swift > $WRAPPER_PATH/$NAME.swift
106+
cp $OUT_PATH/$NAME.swift $WRAPPER_PATH/$NAME.swift
145107

146108
# Create zip archive
147109
echo "Creating zip archive..."

0 commit comments

Comments
 (0)