Merge branch 'release/1.3.0'

nuomi1 · Oct 9, 2021 · 012f8bc · 012f8bc
2 parents 88efc63 + 7f1ed45
commit 012f8bc
Show file tree

Hide file tree

Showing 14 changed files with 536 additions and 288 deletions.
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -12,17 +12,16 @@ env:
 jobs:
   build:
     runs-on: macos-latest
-    strategy:
-      matrix:
-        target: [NBusQQSDK, NBusWechatSDK, NBusWeiboSDK, NBus]
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
+      - name: Setup Homebrew
+        run: brew bundle
       - name: Setup Xcode
         run: bundle exec fastlane setup
       - name: SwiftLint
         run: bundle exec fastlane lint
       - name: CocoaPods Lint
-        run: bundle exec fastlane pod_lint target:${{ matrix.target }}
+        run: bundle exec fastlane pod_lint target:all
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.7.2
+2.7.4
diff --git a/Brewfile b/Brewfile
@@ -0,0 +1 @@
+brew "xcodegen"
diff --git a/Example/Podfile b/Example/Podfile
@@ -6,9 +6,9 @@ target "BusMock" do
   pod "NBus/BusHandlers", :path => "../"
   pod "NBus/SDKHandlers", :path => "../"
 
-  pod "NBusQQSDK", :path => "../"
-  pod "NBusWechatSDK", :path => "../"
-  pod "NBusWeiboSDK", :path => "../"
+  pod "NBusQQSDK"
+  pod "NBusWechatSDK"
+  pod "NBusWeiboSDK"
 
   pod "PinLayout"
   pod "RxCocoa"
@@ -17,15 +17,15 @@ target "BusMock" do
 end
 
 target "BusMockQQSDK" do
-  pod "NBusQQSDK", :path => "../"
+  pod "NBusQQSDK"
 end
 
 target "BusMockWechatSDK" do
-  pod "NBusWechatSDK", :path => "../"
+  pod "NBusWechatSDK"
 end
 
 target "BusMockWeiboSDK" do
-  pod "NBusWeiboSDK", :path => "../"
+  pod "NBusWeiboSDK"
 end
 
 post_install do |installer|

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,35 +1,35 @@
 PODS:
-  - NBus/BusHandlers (1.1.0):
+  - NBus/BusHandlers (1.2.0):
     - NBus/QQHandler
     - NBus/SystemHandler
     - NBus/WechatHandler
     - NBus/WeiboHandler
-  - NBus/Core (1.1.0)
-  - NBus/QQHandler (1.1.0):
+  - NBus/Core (1.2.0)
+  - NBus/QQHandler (1.2.0):
     - NBus/Core
-  - NBus/QQSDKHandler (1.1.0):
+  - NBus/QQSDKHandler (1.2.0):
     - NBus/Core
     - NBusQQSDK
-  - NBus/SDKHandlers (1.1.0):
+  - NBus/SDKHandlers (1.2.0):
     - NBus/QQSDKHandler
     - NBus/SystemHandler
     - NBus/WechatSDKHandler
     - NBus/WeiboSDKHandler
-  - NBus/SystemHandler (1.1.0):
+  - NBus/SystemHandler (1.2.0):
     - NBus/Core
-  - NBus/WechatHandler (1.1.0):
+  - NBus/WechatHandler (1.2.0):
     - NBus/Core
-  - NBus/WechatSDKHandler (1.1.0):
+  - NBus/WechatSDKHandler (1.2.0):
     - NBus/Core
     - NBusWechatSDK
-  - NBus/WeiboHandler (1.1.0):
+  - NBus/WeiboHandler (1.2.0):
     - NBus/Core
-  - NBus/WeiboSDKHandler (1.1.0):
+  - NBus/WeiboSDKHandler (1.2.0):
     - NBus/Core
     - NBusWeiboSDK
-  - NBusQQSDK (1.1.0)
-  - NBusWechatSDK (1.1.0)
-  - NBusWeiboSDK (1.1.0)
+  - NBusQQSDK (3.5.5)
+  - NBusWechatSDK (1.9.2)
+  - NBusWeiboSDK (3.3.1)
   - PinLayout (1.9.3)
   - RxCocoa (6.0.0):
     - RxRelay (= 6.0.0)
@@ -43,16 +43,19 @@ PODS:
 DEPENDENCIES:
   - NBus/BusHandlers (from `../`)
   - NBus/SDKHandlers (from `../`)
-  - NBusQQSDK (from `../`)
-  - NBusWechatSDK (from `../`)
-  - NBusWeiboSDK (from `../`)
+  - NBusQQSDK
+  - NBusWechatSDK
+  - NBusWeiboSDK
   - PinLayout
   - RxCocoa
   - SwiftTrace
   - WoodPeckeriOS
 
 SPEC REPOS:
   trunk:
+    - NBusQQSDK
+    - NBusWechatSDK
+    - NBusWeiboSDK
     - PinLayout
     - RxCocoa
     - RxRelay
@@ -63,25 +66,19 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   NBus:
     :path: "../"
-  NBusQQSDK:
-    :path: "../"
-  NBusWechatSDK:
-    :path: "../"
-  NBusWeiboSDK:
-    :path: "../"
 
 SPEC CHECKSUMS:
-  NBus: 40852aac276e22a8be685ad00b78f88277e1edbf
-  NBusQQSDK: 3c76cf2e000167ff93107edc523823fde0c360b8
-  NBusWechatSDK: 037e80710c02e25a07d146b0ebb84f887a94f86a
-  NBusWeiboSDK: 682756d75ecd0656a33b9f714f14429df15bf9e8
+  NBus: 4a55a119c071788957a44da94bac3c37dc894331
+  NBusQQSDK: 142d3d57365a2f95138f2eea6aabc8398abf669c
+  NBusWechatSDK: b8d9c4e44232fb2a903f8be08332fbf8196541b4
+  NBusWeiboSDK: bc486ada525aa8d4c12a272357c6e2e5f217f57f
   PinLayout: 4d8733121f8687edcc8f00c19bf1379d12808767
   RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e
   RxRelay: 8d593be109c06ea850df027351beba614b012ffb
   RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295
   SwiftTrace: affc6601a316add7c299a3916d9f43c286a583ef
   WoodPeckeriOS: f16864f7a78d5c6daa605591dd66690d466d95be
 
-PODFILE CHECKSUM: 5a4008dd7f37cb627bf857accb2ec39b29f874f0
+PODFILE CHECKSUM: 7615e56e197a0fccb1a3d0d7e94e2eb4c3b595fa
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.11.2