RxSwift 6

tackgyu · Jan 3, 2021 · 1f39621 · 1f39621
1 parent 08baa32
commit 1f39621
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
 github "JohnEstropia/CoreStore" >= 7.3.0
-github "ReactiveX/RxSwift" >= 5.1.1
+github "ReactiveX/RxSwift" >= 6.0.0
diff --git a/Carthage/Checkouts/RxSwift b/Carthage/Checkouts/RxSwift
diff --git a/RxCoreStore.podspec b/RxCoreStore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name = "RxCoreStore"
-    s.version = "2.2.0"
+    s.version = "2.3.0"
     s.license = "MIT"
     s.summary = "RxSwift extensions for CoreStore"
     s.homepage = "https://github.com/JohnEstropia/RxCoreStore"
@@ -15,6 +15,6 @@ Pod::Spec.new do |s|
     s.frameworks = "Foundation", "CoreData"
     s.requires_arc = true
     s.dependency "CoreStore", ">=7.3.0"
-    s.dependency "RxCocoa", ">=5.1.1"
-    s.dependency "RxSwift", ">=5.1.1"
+    s.dependency "RxCocoa", ">=6.0.0"
+    s.dependency "RxSwift", ">=6.0.0"
 end
diff --git a/RxCoreStore.xcodeproj/project.pbxproj b/RxCoreStore.xcodeproj/project.pbxproj
@@ -437,7 +437,7 @@
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.RxCoreStore;
 				PRODUCT_NAME = RxCoreStore;
 				SKIP_INSTALL = YES;
@@ -459,7 +459,7 @@
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.RxCoreStore;
 				PRODUCT_NAME = RxCoreStore;
 				SKIP_INSTALL = YES;

diff --git a/RxCoreStore.xcodeproj/xcshareddata/xcschemes/RxCoreStore iOS.xcscheme b/RxCoreStore.xcodeproj/xcshareddata/xcschemes/RxCoreStore iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1230"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/RxCoreStoreTests/RxCoreStoreTests.swift b/RxCoreStoreTests/RxCoreStoreTests.swift
@@ -172,7 +172,7 @@ class RxCoreStoreTests: XCTestCase {
 
                     transactionExpectation.fulfill()
                 },
-                onError: { (error) in
+                onFailure: { (error) in
 
                     XCTFail(error.localizedDescription)
                 }
@@ -196,7 +196,7 @@ class RxCoreStoreTests: XCTestCase {
                     XCTAssertEqual(Set(people.map({ $0.name.value })), Set(["John", "Bob", "Joe"]))
                     importExpectation.fulfill()
                 },
-                onError: { (error) in
+                onFailure: { (error) in
 
                     XCTFail(error.localizedDescription)
                 }

diff --git a/Sources/RxDataStack+Transaction.swift b/Sources/RxDataStack+Transaction.swift
@@ -73,7 +73,7 @@ extension Reactive where Base == DataStack {
                     },
                     failure: { (error) in
 
-                        observable(.error(error))
+                        observable(.failure(error))
                     }
                 )
                 return Disposables.create()
@@ -129,7 +129,7 @@ extension Reactive where Base == DataStack {
                     },
                     failure: { (error) in
 
-                        observable(.error(error))
+                        observable(.failure(error))
                     }
                 )
                 return Disposables.create()
@@ -179,7 +179,7 @@ extension Reactive where Base == DataStack {
                     },
                     failure: { (error) in
 
-                        observable(.error(error))
+                        observable(.failure(error))
                     }
                 )
                 return Disposables.create()
@@ -239,7 +239,7 @@ extension Reactive where Base == DataStack {
                     },
                     failure: { (error) in
 
-                        observable(.error(error))
+                        observable(.failure(error))
                     }
                 )
                 return Disposables.create()
@@ -286,7 +286,7 @@ extension Reactive where Base == DataStack {
                     },
                     failure: { (error) in
 
-                        observable(.error(error))
+                        observable(.failure(error))
                     }
                 )
                 return Disposables.create()