Merge pull request #937 from breez/savage-swift-package-fix

Merge Swift package sources into one BreezSDK target
breez · Apr 17, 2024 · 65a87eb · 65a87eb
2 parents 370cb6b + 49944fd
commit 65a87eb
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 9 deletions.
diff --git a/libs/sdk-bindings/bindings-swift/.gitignore b/libs/sdk-bindings/bindings-swift/.gitignore
@@ -2,7 +2,7 @@
 .build/
 *.xcodeproj
 *.podspec
-Sources/BreezSDK
+Sources/BreezSDK/BreezSDK.swift
 **/breez_sdkFFI.h
 **/breez_sdkFFI
 **/breez_sdkFFI.modulemap
diff --git a/libs/sdk-bindings/bindings-swift/Package.swift b/libs/sdk-bindings/bindings-swift/Package.swift
@@ -10,12 +10,11 @@ let package = Package(
         .iOS(.v11),
     ],
     products: [
-        .library(name: "BreezSDK", targets: ["breez_sdkFFI", "BreezSDK", "BreezSDKNotification"]),
+        .library(name: "BreezSDK", targets: ["breez_sdkFFI", "BreezSDK"]),
     ],
     targets: [
         .binaryTarget(name: "breez_sdkFFI", path: "./breez_sdkFFI.xcframework"),
         .target(name: "BreezSDK", dependencies: ["breez_sdkFFI"]),
-        .target(name: "BreezSDKNotification", dependencies: ["BreezSDK"]),
         .testTarget(name: "BreezSDKTests", dependencies: ["BreezSDK"]),
     ]
 )
diff --git a/...ezSDKNotification/BreezSDKConnector.swift → .../Sources/BreezSDK/BreezSDKConnector.swift b/...ezSDKNotification/BreezSDKConnector.swift → .../Sources/BreezSDK/BreezSDKConnector.swift
diff --git a/...rces/BreezSDKNotification/Constants.swift → ...gs-swift/Sources/BreezSDK/Constants.swift b/...rces/BreezSDKNotification/Constants.swift → ...gs-swift/Sources/BreezSDK/Constants.swift
diff --git a/...BreezSDKNotification/ResourceHelper.swift → ...ift/Sources/BreezSDK/ResourceHelper.swift b/...BreezSDKNotification/ResourceHelper.swift → ...ift/Sources/BreezSDK/ResourceHelper.swift
diff --git a/...Notification/SDKNotificationService.swift → ...ces/BreezSDK/SDKNotificationService.swift b/...Notification/SDKNotificationService.swift → ...ces/BreezSDK/SDKNotificationService.swift
diff --git a/.../BreezSDKNotification/ServiceConfig.swift → ...wift/Sources/BreezSDK/ServiceConfig.swift b/.../BreezSDKNotification/ServiceConfig.swift → ...wift/Sources/BreezSDK/ServiceConfig.swift
diff --git a/.../BreezSDKNotification/ServiceLogger.swift → ...wift/Sources/BreezSDK/ServiceLogger.swift b/.../BreezSDKNotification/ServiceLogger.swift → ...wift/Sources/BreezSDK/ServiceLogger.swift
diff --git a/.../BreezSDKNotification/Task/LnurlPay.swift → ...wift/Sources/BreezSDK/Task/LnurlPay.swift b/.../BreezSDKNotification/Task/LnurlPay.swift → ...wift/Sources/BreezSDK/Task/LnurlPay.swift
diff --git a/...ezSDKNotification/Task/LnurlPayInfo.swift → .../Sources/BreezSDK/Task/LnurlPayInfo.swift b/...ezSDKNotification/Task/LnurlPayInfo.swift → .../Sources/BreezSDK/Task/LnurlPayInfo.swift
diff --git a/...DKNotification/Task/LnurlPayInvoice.swift → ...urces/BreezSDK/Task/LnurlPayInvoice.swift b/...DKNotification/Task/LnurlPayInvoice.swift → ...urces/BreezSDK/Task/LnurlPayInvoice.swift
diff --git a/...SDKNotification/Task/ReceivePayment.swift → ...ources/BreezSDK/Task/ReceivePayment.swift b/...SDKNotification/Task/ReceivePayment.swift → ...ources/BreezSDK/Task/ReceivePayment.swift
diff --git a/...reezSDKNotification/Task/RedeemSwap.swift → ...ft/Sources/BreezSDK/Task/RedeemSwap.swift b/...reezSDKNotification/Task/RedeemSwap.swift → ...ft/Sources/BreezSDK/Task/RedeemSwap.swift
diff --git a/...s/BreezSDKNotification/TaskProtocol.swift → ...swift/Sources/BreezSDK/TaskProtocol.swift b/...s/BreezSDKNotification/TaskProtocol.swift → ...swift/Sources/BreezSDK/TaskProtocol.swift
diff --git a/libs/sdk-flutter/ios/breez_sdk.podspec b/libs/sdk-flutter/ios/breez_sdk.podspec
@@ -14,9 +14,8 @@ Pod::Spec.new do |s|
   s.source_files = 'Classes/**/*'
   s.on_demand_resources = { 
     'BreezSDK' => [
-      'bindings-swift/Sources/BreezSDK/BreezSDK.swift', 
-      'bindings-swift/Sources/BreezSDKNotification/*.swift', 
-      'bindings-swift/Sources/BreezSDKNotification/**/*.swift'
+      'bindings-swift/Sources/BreezSDK/*.swift', 
+      'bindings-swift/Sources/BreezSDK/**/*.swift'
     ]
   }
   s.dependency 'Flutter'

diff --git a/libs/sdk-flutter/ios/breez_sdk.podspec.production b/libs/sdk-flutter/ios/breez_sdk.podspec.production
@@ -29,9 +29,8 @@ Pod::Spec.new do |s|
   s.source_files = 'Classes/**/*'
   s.on_demand_resources = { 
     'BreezSDK' => [
-      'bindings-swift/Sources/BreezSDK/BreezSDK.swift', 
-      'bindings-swift/Sources/BreezSDKNotification/*.swift', 
-      'bindings-swift/Sources/BreezSDKNotification/**/*.swift'
+      'bindings-swift/Sources/BreezSDK/*.swift', 
+      'bindings-swift/Sources/BreezSDK/**/*.swift'
     ]
   }
   s.dependency 'Flutter'