Revert "ffi: remove arg from uniffi::setup_scaffolding macro"

Removing the `nostr_sdk` arg from `uniffi::setup_scaffolding` caused issues with Swift Bindings, so revert commit 64c592a Fixes rust-nostr/nostr-sdk-swift#3 Signed-off-by: Yuki Kishimoto <[email protected]>
rust-nostr · Nov 16, 2024 · 798f485 · 798f485
1 parent 6ed72cb
commit 798f485
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/bindings/nostr-sdk-ffi/bindings-python/src/nostr-sdk/__init__.py b/bindings/nostr-sdk-ffi/bindings-python/src/nostr-sdk/__init__.py
diff --git a/bindings/nostr-sdk-ffi/justfile b/bindings/nostr-sdk-ffi/justfile
@@ -100,7 +100,7 @@ darwin-universal: swift-deps
 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_sdk_ffi.swift swift/Sources/NostrSDK/NostrSDK.swift
+    mv swift/Sources/NostrSDK/nostr_sdk.swift swift/Sources/NostrSDK/NostrSDK.swift
     cp swift/Sources/NostrSDK/nostr_sdkFFI.h swift/nostr_sdkFFI.xcframework/ios-arm64/nostr_sdkFFI.framework/Headers
     cp swift/Sources/NostrSDK/nostr_sdkFFI.h swift/nostr_sdkFFI.xcframework/ios-arm64_x86_64-simulator/nostr_sdkFFI.framework/Headers
     cp swift/Sources/NostrSDK/nostr_sdkFFI.h swift/nostr_sdkFFI.xcframework/macos-arm64_x86_64/nostr_sdkFFI.framework/Headers

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

diff --git a/bindings/nostr-sdk-ffi/python/src/nostr-sdk/__init__.py b/bindings/nostr-sdk-ffi/python/src/nostr-sdk/__init__.py
@@ -1,2 +1,2 @@
-from nostr_sdk.nostr_sdk_ffi import *
-from nostr_sdk.nostr_sdk_ffi import uniffi_set_event_loop
+from nostr_sdk.nostr_sdk import *
+from nostr_sdk.nostr_sdk import uniffi_set_event_loop
diff --git a/bindings/nostr-sdk-ffi/src/lib.rs b/bindings/nostr-sdk-ffi/src/lib.rs
@@ -44,4 +44,6 @@ impl NostrLibrary {
     }
 }
 
-uniffi::setup_scaffolding!();
+// Changes to this arg will break binding packages (in particular Swift).
+// If this is removed, make sure to update `uniffi.toml`
+uniffi::setup_scaffolding!("nostr_sdk");