Skip to content

Commit 1f2e09b

Browse files
committed
fix: update iOS build to use correct header/swift file names from uniffi.toml
The uniffi.toml configuration changed generated file names: - cooklang_importFFI.h -> CooklangImportFFI.h - cooklang_import.swift -> CooklangImport.swift Updated workflow and build script to use the new names.
1 parent c3e96cc commit 1f2e09b

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ jobs:
7474
7575
# Create headers
7676
mkdir -p target/ios/ios-device/Headers target/ios/ios-simulator/Headers
77-
cp target/ios/swift/cooklang_importFFI.h target/ios/ios-device/Headers/
78-
cp target/ios/swift/cooklang_importFFI.h target/ios/ios-simulator/Headers/
77+
cp target/ios/swift/CooklangImportFFI.h target/ios/ios-device/Headers/
78+
cp target/ios/swift/CooklangImportFFI.h target/ios/ios-simulator/Headers/
7979
8080
# Create module maps
8181
mkdir -p target/ios/ios-device/Modules target/ios/ios-simulator/Modules
82-
echo 'module CooklangImportFFI { header "cooklang_importFFI.h" export * }' > target/ios/ios-device/Modules/module.modulemap
83-
echo 'module CooklangImportFFI { header "cooklang_importFFI.h" export * }' > target/ios/ios-simulator/Modules/module.modulemap
82+
echo 'module CooklangImportFFI { header "CooklangImportFFI.h" export * }' > target/ios/ios-device/Modules/module.modulemap
83+
echo 'module CooklangImportFFI { header "CooklangImportFFI.h" export * }' > target/ios/ios-simulator/Modules/module.modulemap
8484
8585
# Create XCFramework
8686
xcodebuild -create-xcframework \
@@ -93,7 +93,7 @@ jobs:
9393
- name: Create Swift Package
9494
run: |
9595
mkdir -p target/ios/CooklangImport/Sources/CooklangImport
96-
cp target/ios/swift/cooklang_import.swift target/ios/CooklangImport/Sources/CooklangImport/
96+
cp target/ios/swift/CooklangImport.swift target/ios/CooklangImport/Sources/CooklangImport/
9797
cp -R target/ios/CooklangImportFFI.xcframework target/ios/CooklangImport/
9898
9999
cat > target/ios/CooklangImport/Package.swift << 'EOF'

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-import"
3-
version = "0.8.4"
3+
version = "0.8.5"
44
edition = "2021"
55
description = "A tool for importing recipes into Cooklang format"
66
license = "MIT"

scripts/build-ios.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,19 +129,19 @@ create_xcframework() {
129129

130130
# Create module.modulemap
131131
local modulemap_content="module ${FRAMEWORK_NAME} {
132-
header \"${PACKAGE_NAME}FFI.h\"
132+
header \"${FRAMEWORK_NAME}.h\"
133133
export *
134134
}"
135135

136136
# Create headers and modulemap for device
137137
mkdir -p "$ios_device_dir/Headers"
138-
cp "${SWIFT_OUTPUT_DIR}/${PACKAGE_NAME}FFI.h" "$ios_device_dir/Headers/"
138+
cp "${SWIFT_OUTPUT_DIR}/${FRAMEWORK_NAME}.h" "$ios_device_dir/Headers/"
139139
mkdir -p "$ios_device_dir/Modules"
140140
echo "$modulemap_content" > "$ios_device_dir/Modules/module.modulemap"
141141

142142
# Create headers and modulemap for simulator
143143
mkdir -p "$ios_sim_dir/Headers"
144-
cp "${SWIFT_OUTPUT_DIR}/${PACKAGE_NAME}FFI.h" "$ios_sim_dir/Headers/"
144+
cp "${SWIFT_OUTPUT_DIR}/${FRAMEWORK_NAME}.h" "$ios_sim_dir/Headers/"
145145
mkdir -p "$ios_sim_dir/Modules"
146146
echo "$modulemap_content" > "$ios_sim_dir/Modules/module.modulemap"
147147

@@ -153,8 +153,8 @@ create_xcframework() {
153153
-headers "$ios_sim_dir/Headers" \
154154
-output "$XCFRAMEWORK_OUTPUT"
155155

156-
# Copy Swift file alongside XCFramework
157-
cp "${SWIFT_OUTPUT_DIR}/${PACKAGE_NAME}.swift" "${OUTPUT_DIR}/"
156+
# Copy Swift file alongside XCFramework (uses module_name from uniffi.toml)
157+
cp "${SWIFT_OUTPUT_DIR}/CooklangImport.swift" "${OUTPUT_DIR}/"
158158

159159
# Cleanup temp directories
160160
rm -rf "$ios_device_dir" "$ios_sim_dir"
@@ -169,8 +169,8 @@ create_swift_package() {
169169
local swift_pkg_dir="${OUTPUT_DIR}/CooklangImport"
170170
mkdir -p "${swift_pkg_dir}/Sources/CooklangImport"
171171

172-
# Copy Swift bindings
173-
cp "${SWIFT_OUTPUT_DIR}/${PACKAGE_NAME}.swift" "${swift_pkg_dir}/Sources/CooklangImport/"
172+
# Copy Swift bindings (uses module_name from uniffi.toml)
173+
cp "${SWIFT_OUTPUT_DIR}/CooklangImport.swift" "${swift_pkg_dir}/Sources/CooklangImport/"
174174

175175
# Create Package.swift
176176
cat > "${swift_pkg_dir}/Package.swift" << 'EOF'
@@ -228,7 +228,7 @@ main() {
228228
echo ""
229229
echo "Output files:"
230230
echo " - XCFramework: ${XCFRAMEWORK_OUTPUT}"
231-
echo " - Swift bindings: ${OUTPUT_DIR}/${PACKAGE_NAME}.swift"
231+
echo " - Swift bindings: ${OUTPUT_DIR}/CooklangImport.swift"
232232
echo " - Swift Package: ${OUTPUT_DIR}/CooklangImport/"
233233
echo ""
234234
echo "To use in your iOS project:"

0 commit comments

Comments
 (0)