ffi: fix swift package

Signed-off-by: Yuki Kishimoto <[email protected]>
rust-nostr · Nov 5, 2024 · 4f076ba · 4f076ba
1 parent 008c68b
commit 4f076ba
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 18 deletions.
diff --git a/bindings/nostr-sdk-ffi/justfile b/bindings/nostr-sdk-ffi/justfile
@@ -56,7 +56,6 @@ x86_64-linux-android: ndk
 android: aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
 
 kotlin: clean-android android
-	find ./ffi/kotlin/jniLibs -name libnostr_ffi.so -type f -delete
 	cargo run -p uniffi-bindgen generate --library ../../target/x86_64-linux-android/release/libnostr_sdk_ffi.so --language kotlin --no-format -o ffi/kotlin
 
 # Copy required modules and libs and assemble AAR
@@ -111,7 +110,6 @@ swift-darwin: darwin-universal
 assemble-swift-package:
     mkdir -p swift/Sources/NostrSDK
     cargo run -p uniffi-bindgen generate --library ../../target/aarch64-apple-ios/release/libnostr_sdk_ffi.a --no-format --language swift --out-dir swift/Sources/NostrSDK
-    mv swift/Sources/NostrSDK/nostr_ffi.swift swift/Sources/NostrSDK/Nostr.swift
     mv swift/Sources/NostrSDK/nostr_sdk_ffi.swift swift/Sources/NostrSDK/NostrSDK.swift
     cp swift/Sources/NostrSDK/*.h swift/nostr_sdkFFI.xcframework/ios-arm64/Headers
     cp swift/Sources/NostrSDK/*.h swift/nostr_sdkFFI.xcframework/ios-arm64_x86_64-simulator/Headers

diff --git a/bindings/nostr-sdk-ffi/python/.gitignore b/bindings/nostr-sdk-ffi/python/.gitignore
@@ -8,7 +8,6 @@ libnostr_sdk_ffi.dylib
 
 *.swp
 
-src/nostr-sdk/nostr_ffi.py
 src/nostr-sdk/nostr_sdk_ffi.py
 src/nostr-sdk/*.so
 *.whl

diff --git a/bindings/nostr-sdk-ffi/swift/nostr_sdkFFI.xcframework/ios-arm64/Headers/module.modulemap b/bindings/nostr-sdk-ffi/swift/nostr_sdkFFI.xcframework/ios-arm64/Headers/module.modulemap
@@ -1,8 +1,3 @@
-module nostrFFI {
-  header "nostrFFI.h"
-  export *
-}
-
 module nostr_sdkFFI {
   header "nostr_sdkFFI.h"
   export *

diff --git a/...dk-ffi/swift/nostr_sdkFFI.xcframework/ios-arm64_x86_64-simulator/Headers/module.modulemap b/...dk-ffi/swift/nostr_sdkFFI.xcframework/ios-arm64_x86_64-simulator/Headers/module.modulemap
@@ -1,8 +1,3 @@
-module nostrFFI {
-  header "nostrFFI.h"
-  export *
-}
-
 module nostr_sdkFFI {
   header "nostr_sdkFFI.h"
   export *

diff --git a/.../nostr-sdk-ffi/swift/nostr_sdkFFI.xcframework/macos-arm64_x86_64/Headers/module.modulemap b/.../nostr-sdk-ffi/swift/nostr_sdkFFI.xcframework/macos-arm64_x86_64/Headers/module.modulemap
@@ -1,8 +1,3 @@
-module nostrFFI {
-  header "nostrFFI.h"
-  export *
-}
-
 module nostr_sdkFFI {
   header "nostr_sdkFFI.h"
   export *
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ libnostr_sdk_ffi.dylib @@
     *.swp
-    src/nostr-sdk/nostr_ffi.py
     src/nostr-sdk/nostr_sdk_ffi.py
     src/nostr-sdk/*.so
     *.whl
@@ Expand Down @@