Merge pull request #29 from MuShare/update/rx

Update RxSwift to 6.0+
MuShare · Jan 17, 2021 · 3ced08d · 3ced08d
2 parents 05163dc + 4c5facc
commit 3ced08d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/Example/Pluto-Example.xcodeproj/project.pbxproj b/Example/Pluto-Example.xcodeproj/project.pbxproj
@@ -127,7 +127,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1030;
-				LastUpgradeCheck = 1030;
+				LastUpgradeCheck = 1230;
 				ORGANIZATIONNAME = MuShare;
 				TargetAttributes = {
 					77A9A7B022F54FDA003B4DE6 = {
@@ -287,6 +287,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -312,7 +313,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -349,6 +350,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -368,7 +370,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -386,7 +388,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
 				INFOPLIST_FILE = "Pluto-Example/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -405,7 +407,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
 				INFOPLIST_FILE = "Pluto-Example/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,21 +1,19 @@
 PODS:
-  - Alamofire (5.4.0)
-  - Kingfisher (5.15.8):
-    - Kingfisher/Core (= 5.15.8)
-  - Kingfisher/Core (5.15.8)
-  - PlutoSDK/Core (0.8.10):
+  - Alamofire (5.4.1)
+  - Kingfisher (6.0.1)
+  - PlutoSDK/Core (1.0):
     - Alamofire (~> 5)
     - SwiftyJSON (~> 5)
     - SwiftyUserDefaults (~> 5)
-  - PlutoSDK/Rx (0.8.10):
-    - PlutoSDK/Core (~> 0)
-    - RxCocoa (~> 5)
-  - RxCocoa (5.1.1):
-    - RxRelay (~> 5)
-    - RxSwift (~> 5)
-  - RxRelay (5.1.1):
-    - RxSwift (~> 5)
-  - RxSwift (5.1.1)
+  - PlutoSDK/Rx (1.0):
+    - PlutoSDK/Core (~> 1)
+    - RxCocoa (~> 6)
+  - RxCocoa (6.0.0):
+    - RxRelay (= 6.0.0)
+    - RxSwift (= 6.0.0)
+  - RxRelay (6.0.0):
+    - RxSwift (= 6.0.0)
+  - RxSwift (6.0.0)
   - SwiftyJSON (5.0.0)
   - SwiftyUserDefaults (5.0.0)
 
@@ -38,12 +36,12 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Alamofire: 3b6a534a3df22db367e4dedeeca73d1ddfcf0e2f
-  Kingfisher: a3c03d702433fa6cfedabb2bddbe076fb8f2e902
-  PlutoSDK: a0c9c7a898b1c628874ab5c0586dd34d383213c0
-  RxCocoa: 32065309a38d29b5b0db858819b5bf9ef038b601
-  RxRelay: d77f7d771495f43c556cbc43eebd1bb54d01e8e9
-  RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178
+  Alamofire: 2291f7d21ca607c491dd17642e5d40fdcda0e65c
+  Kingfisher: adde87a4f74f6a3845395769354efff593581740
+  PlutoSDK: 334853b1c01388986f44c914b0969ee524deca5d
+  RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e
+  RxRelay: 8d593be109c06ea850df027351beba614b012ffb
+  RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295
   SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
   SwiftyUserDefaults: 33fcb42bd1feb53a37d873feb62c82967db5f7f6
 

diff --git a/Pluto/Classes/Rx/Pluto+Rx.swift b/Pluto/Classes/Rx/Pluto+Rx.swift
@@ -33,7 +33,7 @@ extension Reactive where Base: Pluto {
         Single.create { [weak base] observer in
             base?.getAccessToken {
                 guard let token = $0 else {
-                    observer(.error(PlutoError.unknown))
+                    observer(.failure(PlutoError.unknown))
                     return
                 }
                 observer(.success(token))

diff --git a/PlutoSDK.podspec b/PlutoSDK.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'PlutoSDK'
-  s.version          = '0.8.10'
+  s.version          = '1.0'
   s.summary          = 'Swift SDK for Pluto login microservice.'
 
 # This description is used to generate tags and improve search results.
@@ -41,7 +41,7 @@ Swift SDK for Pluto login microservice, which simplify the implementation for si
 
   s.subspec 'Rx' do |rx|
     rx.source_files = 'Pluto/Classes/Rx/**/*'
-    rx.dependency 'PlutoSDK/Core', '~> 0'
-    rx.dependency 'RxCocoa', '~> 5'
+    rx.dependency 'PlutoSDK/Core', '~> 1'
+    rx.dependency 'RxCocoa', '~> 6'
   end
 end