Skip to content

Commit daf20e3

Browse files
authored
Merge pull request #294 from tnull/2024-05-fix-swift-builds
Fix Swift builds
2 parents b7c4862 + 6dec002 commit daf20e3

File tree

5 files changed

+66
-2
lines changed

5 files changed

+66
-2
lines changed

bindings/swift/LDKNodeFFI.xcframework/Info.plist

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
</array>
1717
<key>SupportedPlatform</key>
1818
<string>macos</string>
19+
<key>LSMinimumSystemVersion</key>
20+
<string>12.0</string>
1921
</dict>
2022
<dict>
2123
<key>LibraryIdentifier</key>
@@ -31,6 +33,8 @@
3133
<string>ios</string>
3234
<key>SupportedPlatformVariant</key>
3335
<string>simulator</string>
36+
<key>MinimumOSVersion</key>
37+
<string>15.0</string>
3438
</dict>
3539
<dict>
3640
<key>LibraryIdentifier</key>
@@ -43,6 +47,8 @@
4347
</array>
4448
<key>SupportedPlatform</key>
4549
<string>ios</string>
50+
<key>MinimumOSVersion</key>
51+
<string>15.0</string>
4652
</dict>
4753
</array>
4854
<key>CFBundlePackageType</key>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleIdentifier</key>
6+
<string>org.lightningdevkit.LDKNodeFFI</string>
7+
<key>CFBundleName</key>
8+
<string>LDKNodeFFI</string>
9+
<key>CFBundleVersion</key>
10+
<string>0.3.0</string>
11+
<key>CFBundleShortVersionString</key>
12+
<string>0.3.0</string>
13+
<key>CFBundleExecutable</key>
14+
<string>LDKNodeFFI</string>
15+
<key>MinimumOSVersion</key>
16+
<string>100.0</string>
17+
</dict>
18+
</plist>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleIdentifier</key>
6+
<string>org.lightningdevkit.LDKNodeFFI</string>
7+
<key>CFBundleName</key>
8+
<string>LDKNodeFFI</string>
9+
<key>CFBundleVersion</key>
10+
<string>0.3.0</string>
11+
<key>CFBundleShortVersionString</key>
12+
<string>0.3.0</string>
13+
<key>CFBundleExecutable</key>
14+
<string>LDKNodeFFI</string>
15+
<key>MinimumOSVersion</key>
16+
<string>15.0</string>
17+
</dict>
18+
</plist>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleIdentifier</key>
6+
<string>org.lightningdevkit.LDKNodeFFI</string>
7+
<key>CFBundleName</key>
8+
<string>LDKNodeFFI</string>
9+
<key>CFBundleVersion</key>
10+
<string>0.3.0</string>
11+
<key>CFBundleShortVersionString</key>
12+
<string>0.3.0</string>
13+
<key>CFBundleExecutable</key>
14+
<string>LDKNodeFFI</string>
15+
<key>LSMinimumSystemVersion</key>
16+
<string>12.0</string>
17+
</dict>
18+
</plist>

scripts/uniffi_bindgen_generate_swift.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,17 @@ swiftc -module-name LDKNode -emit-library -o "$BINDINGS_DIR"/libldk_node.dylib -
3434

3535
# Create xcframework from bindings Swift file and libs
3636
mkdir -p "$BINDINGS_DIR"/Sources/LDKNode || exit 1
37+
38+
# Patch LDKNode.swift with `SystemConfiguration` import.
39+
sed -i '' '4s/^/import SystemConfiguration\n/' "$BINDINGS_DIR"/LDKNode.swift
40+
3741
mv "$BINDINGS_DIR"/LDKNode.swift "$BINDINGS_DIR"/Sources/LDKNode/LDKNode.swift || exit 1
3842
cp "$BINDINGS_DIR"/LDKNodeFFI.h "$BINDINGS_DIR"/LDKNodeFFI.xcframework/ios-arm64/LDKNodeFFI.framework/Headers || exit 1
3943
cp "$BINDINGS_DIR"/LDKNodeFFI.h "$BINDINGS_DIR"/LDKNodeFFI.xcframework/ios-arm64_x86_64-simulator/LDKNodeFFI.framework/Headers || exit 1
4044
cp "$BINDINGS_DIR"/LDKNodeFFI.h "$BINDINGS_DIR"/LDKNodeFFI.xcframework/macos-arm64_x86_64/LDKNodeFFI.framework/Headers || exit 1
4145
cp target/aarch64-apple-ios/release-smaller/libldk_node.a "$BINDINGS_DIR"/LDKNodeFFI.xcframework/ios-arm64/LDKNodeFFI.framework/LDKNodeFFI || exit 1
4246
cp target/lipo-ios-sim/release-smaller/libldk_node.a "$BINDINGS_DIR"/LDKNodeFFI.xcframework/ios-arm64_x86_64-simulator/LDKNodeFFI.framework/LDKNodeFFI || exit 1
4347
cp target/lipo-macos/release-smaller/libldk_node.a "$BINDINGS_DIR"/LDKNodeFFI.xcframework/macos-arm64_x86_64/LDKNodeFFI.framework/LDKNodeFFI || exit 1
44-
# rm "$BINDINGS_DIR"/LDKNodeFFI.h || exit 1
45-
# rm "$BINDINGS_DIR"/LDKNodeFFI.modulemap || exit 1
48+
rm "$BINDINGS_DIR"/LDKNodeFFI.h || exit 1
49+
rm "$BINDINGS_DIR"/LDKNodeFFI.modulemap || exit 1
4650
echo finished successfully!

0 commit comments

Comments
 (0)