refactor: move source file

nuomi1 · Mar 28, 2022 · c64990f · c64990f
1 parent c2a895e
commit c64990f
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 18 deletions.
diff --git a/NBus/Assets/.gitkeep b/NBus/Assets/.gitkeep
diff --git a/Package.swift b/Package.swift
@@ -18,32 +18,23 @@ let package = Package(
     ],
     targets: [
         .target(
-            name: "NBusCore",
-            path: "NBus/Classes/Core"
+            name: "NBusCore"
         ),
         .target(
             name: "NBusQQHandler",
-            dependencies: ["NBusCore"],
-            path: "NBus/Classes/Handler",
-            sources: ["QQHandler.swift"]
+            dependencies: ["NBusCore"]
         ),
         .target(
             name: "NBusWechatHandler",
-            dependencies: ["NBusCore"],
-            path: "NBus/Classes/Handler",
-            sources: ["WechatHandler.swift"]
+            dependencies: ["NBusCore"]
         ),
         .target(
             name: "NBusWeiboHandler",
-            dependencies: ["NBusCore"],
-            path: "NBus/Classes/Handler",
-            sources: ["WeiboHandler.swift"]
+            dependencies: ["NBusCore"]
         ),
         .target(
             name: "NBusSystemHandler",
-            dependencies: ["NBusCore"],
-            path: "NBus/Classes/Handler",
-            sources: ["SystemHandler.swift"]
+            dependencies: ["NBusCore"]
         ),
         .testTarget(
             name: "NBusTests",

diff --git a/NBus/Classes/Core/Bus+Debug.swift → Sources/NBusCore/Bus+Debug.swift b/NBus/Classes/Core/Bus+Debug.swift → Sources/NBusCore/Bus+Debug.swift
diff --git a/NBus/Classes/Core/Bus+Endpoint.swift → Sources/NBusCore/Bus+Endpoint.swift b/NBus/Classes/Core/Bus+Endpoint.swift → Sources/NBusCore/Bus+Endpoint.swift
diff --git a/NBus/Classes/Core/Bus+Error.swift → Sources/NBusCore/Bus+Error.swift b/NBus/Classes/Core/Bus+Error.swift → Sources/NBusCore/Bus+Error.swift
diff --git a/NBus/Classes/Core/Bus+Handler.swift → Sources/NBusCore/Bus+Handler.swift b/NBus/Classes/Core/Bus+Handler.swift → Sources/NBusCore/Bus+Handler.swift
diff --git a/NBus/Classes/Core/Bus+Helper.swift → Sources/NBusCore/Bus+Helper.swift b/NBus/Classes/Core/Bus+Helper.swift → Sources/NBusCore/Bus+Helper.swift
diff --git a/NBus/Classes/Core/Bus+Message.swift → Sources/NBusCore/Bus+Message.swift b/NBus/Classes/Core/Bus+Message.swift → Sources/NBusCore/Bus+Message.swift
diff --git a/NBus/Classes/Core/Bus+Platform.swift → Sources/NBusCore/Bus+Platform.swift b/NBus/Classes/Core/Bus+Platform.swift → Sources/NBusCore/Bus+Platform.swift
diff --git a/NBus/Classes/Core/Bus+Wrapper.swift → Sources/NBusCore/Bus+Wrapper.swift b/NBus/Classes/Core/Bus+Wrapper.swift → Sources/NBusCore/Bus+Wrapper.swift
diff --git a/NBus/Classes/Core/Bus.swift → Sources/NBusCore/Bus.swift b/NBus/Classes/Core/Bus.swift → Sources/NBusCore/Bus.swift
@@ -168,6 +168,7 @@ extension Bus {
         guard
             let handler = handlers.first(where: { $0.canOpenURL(url) })
         else {
+            assertionFailure()
             return false
         }
 
@@ -184,6 +185,7 @@ extension Bus {
         guard
             let handler = handlers.first(where: { $0.canOpenUserActivity(userActivity) })
         else {
+            assertionFailure()
             return false
         }
 

diff --git a/NBus/Classes/Handler/QQHandler.swift → Sources/NBusQQHandler/QQHandler.swift b/NBus/Classes/Handler/QQHandler.swift → Sources/NBusQQHandler/QQHandler.swift
@@ -9,7 +9,7 @@
 import Foundation
 import UIKit
 
-#if canImport(NBusCore)
+#if SWIFT_PACKAGE
 import NBusCore
 #endif
 

diff --git a/NBus/Classes/Handler/QQSDKHandler.swift → Sources/NBusQQSDKHandler/QQSDKHandler.swift b/NBus/Classes/Handler/QQSDKHandler.swift → Sources/NBusQQSDKHandler/QQSDKHandler.swift
diff --git a/NBus/Classes/Handler/SystemHandler.swift → ...ces/NBusSystemHandler/SystemHandler.swift b/NBus/Classes/Handler/SystemHandler.swift → ...ces/NBusSystemHandler/SystemHandler.swift
@@ -10,7 +10,7 @@ import AuthenticationServices
 import Foundation
 import UIKit
 
-#if canImport(NBusCore)
+#if SWIFT_PACKAGE
 import NBusCore
 #endif
 

diff --git a/NBus/Classes/Handler/WechatHandler.swift → ...ces/NBusWechatHandler/WechatHandler.swift b/NBus/Classes/Handler/WechatHandler.swift → ...ces/NBusWechatHandler/WechatHandler.swift
@@ -9,7 +9,7 @@
 import Foundation
 import UIKit
 
-#if canImport(NBusCore)
+#if SWIFT_PACKAGE
 import NBusCore
 #endif
 

diff --git a/NBus/Classes/Handler/WechatSDKHandler.swift → ...usWechatSDKHandler/WechatSDKHandler.swift b/NBus/Classes/Handler/WechatSDKHandler.swift → ...usWechatSDKHandler/WechatSDKHandler.swift
diff --git a/NBus/Classes/Handler/WeiboHandler.swift → Sources/NBusWeiboHandler/WeiboHandler.swift b/NBus/Classes/Handler/WeiboHandler.swift → Sources/NBusWeiboHandler/WeiboHandler.swift
@@ -9,7 +9,7 @@
 import Foundation
 import UIKit
 
-#if canImport(NBusCore)
+#if SWIFT_PACKAGE
 import NBusCore
 #endif
 

diff --git a/NBus/Classes/Handler/WeiboSDKHandler.swift → ...NBusWeiboSDKHandler/WeiboSDKHandler.swift b/NBus/Classes/Handler/WeiboSDKHandler.swift → ...NBusWeiboSDKHandler/WeiboSDKHandler.swift