Merge 67ea1c4 into 8221cf5

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.2)
+    CFPropertyList (3.0.3)
     activesupport (5.2.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
@@ -14,16 +14,16 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     aws-eventstream (1.1.0)
-    aws-partitions (1.388.0)
-    aws-sdk-core (3.109.1)
+    aws-partitions (1.414.0)
+    aws-sdk-core (3.110.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.39.0)
+    aws-sdk-kms (1.40.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.83.1)
+    aws-sdk-s3 (1.87.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -76,26 +76,28 @@ GEM
     concurrent-ruby (1.1.7)
     declarative (0.0.20)
     declarative-option (0.1.0)
-    digest-crc (0.6.1)
-      rake (~> 13.0)
+    digest-crc (0.6.3)
+      rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
-    emoji_regex (3.2.0)
+    emoji_regex (3.2.1)
     escape (0.0.4)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    excon (0.78.0)
-    faraday (1.1.0)
+    excon (0.78.1)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
+    faraday-net_http (1.0.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    fastimage (2.2.0)
-    fastlane (2.165.0)
+    fastimage (2.2.1)
+    fastlane (2.171.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       aws-sdk-s3 (~> 1.0)
@@ -131,7 +133,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    ffi (1.13.1)
+    ffi (1.14.2)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -149,7 +151,7 @@ GEM
     google-cloud-env (1.4.0)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.0.1)
-    google-cloud-storage (1.29.1)
+    google-cloud-storage (1.29.2)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
       google-api-client (~> 0.33)
@@ -167,15 +169,15 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.8.5)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
-    json (2.3.1)
+    json (2.5.1)
     jwt (2.2.2)
     memoist (0.16.2)
-    mini_magick (4.10.1)
+    mini_magick (4.11.0)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     minitest (5.14.2)
     molinillo (0.6.6)
     multi_json (1.15.0)
@@ -184,12 +186,14 @@ GEM
     nap (1.1.0)
     naturally (2.2.0)
     netrc (0.11.0)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.0)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     os (1.1.1)
-    plist (3.5.0)
+    plist (3.6.0)
     public_suffix (4.0.6)
-    rake (13.0.1)
+    racc (1.5.2)
+    rake (13.0.3)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -209,7 +213,7 @@ GEM
       CFPropertyList
       naturally
     slack-notifier (2.3.2)
-    slather (2.5.0)
+    slather (2.6.0)
       CFPropertyList (>= 2.2, < 4)
       activesupport
       clamp (~> 1.3)
@@ -225,7 +229,7 @@ GEM
       tty-cursor (~> 0.7)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
@@ -241,7 +245,7 @@ GEM
       nanaimo (~> 0.3.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
-    xcpretty-travis-formatter (1.0.0)
+    xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS

Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
         "state": {
           "branch": null,
-          "revision": "002d325b0bdee94e7882e1114af5ff4fe1e96afa",
-          "version": "5.1.1"
+          "revision": "c8742ed97fc2f0c015a5ea5eddefb064cd7532d2",
+          "version": "6.0.0"
         }
       }
     ]

Package.swift

@@ -15,7 +15,7 @@ let package = Package(
             targets: ["RxRestler"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.1.1")),
+        .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.0.0")),
     ],
     targets: [
         .target(

README.md

@@ -278,5 +278,5 @@ Run command `./Scripts/pod_lib_lint.rb Restler.podspec` to lint the podspec befo
 #### Gems
 
 - [cocoapods](https://rubygems.org/gems/cocoapods) 1.10.0
-- [fastlane](https://rubygems.org/gems/fastlane) 2.165.0
-- [slather](https://rubygems.org/gems/slather) 2.5.0
+- [fastlane](https://rubygems.org/gems/fastlane) 2.171.0
+- [slather](https://rubygems.org/gems/slather) 2.6.0

Restler-Example/Restler-Example.xcodeproj/project.pbxproj

@@ -526,7 +526,7 @@
 			repositoryURL = "https://github.com/ReactiveX/RxSwift.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 5.1.1;
+				minimumVersion = 6.0.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

Restler-Example/Restler-Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
         "state": {
           "branch": null,
-          "revision": "002d325b0bdee94e7882e1114af5ff4fe1e96afa",
-          "version": "5.1.1"
+          "revision": "c8742ed97fc2f0c015a5ea5eddefb064cd7532d2",
+          "version": "6.0.0"
         }
       }
     ]

Restler-Example/Restler-Example/Source/Comment/CommentViewModel.swift

@@ -41,10 +41,10 @@ final class CommentViewModel: ObservableObject {
         self.restler.head(Endpoint.comments)
             .decode(Void.self)
             .rx
-            .observeOn(MainScheduler.instance)
+            .observe(on: MainScheduler.instance)
             .subscribe(
                 onSuccess: { print("Endpoint exists") },
-                onError: { print("Request HEAD error:", $0) })
+                onFailure: { print("Request HEAD error:", $0) })
             .disposed(by: self.disposeBag)
     }
 

RxRestler.podspec

@@ -17,5 +17,5 @@ Pod::Spec.new do |s|
 
   s.source_files = 'Sources/RxRestler/**/*.swift'
   s.dependency 'RestlerCore', '~> 1.1'
-  s.dependency 'RxSwift', '~> 5.1.1'
+  s.dependency 'RxSwift', '~> 6.0'
 end

Sources/RxRestler/Request+Rx.swift

@@ -7,7 +7,7 @@ extension Restler.Request {
         Single<D>.create { single in
             let task = self.subscribe(
                 onSuccess: { single(.success($0)) },
-                onFailure: { single(.error($0)) })
+                onFailure: { single(.failure($0)) })
             return Disposables.create { task?.cancel() }
         }
     }

Tests/RestlerTests/Mocks/Public/RestlerDownloadRequestMock.swift

@@ -7,7 +7,7 @@ final class RestlerDownloadRequestMock {
     var subscribeReturnValue: RestlerDownloadTaskMock = .init()
     private(set) var subscribeParams: [SubscribeParams] = []
     struct SubscribeParams {
-        let onProgress: ((Progress) -> Void)?
+        let onProgress: ((RestlerDownloadTaskType) -> Void)?
         let onSuccess: ((URL) -> Void)?
         let onError: ((Restler.Error) -> Void)?
         let onCompletion: ((Result<URL, Restler.Error>) -> Void)?
@@ -17,7 +17,7 @@ final class RestlerDownloadRequestMock {
 // MARK: - RestlerDownloadRequestType
 extension RestlerDownloadRequestMock: RestlerDownloadRequestType {
     func subscribe(
-        onProgress: ((Progress) -> Void)?,
+        onProgress: ((RestlerDownloadTaskType) -> Void)?,
         onSuccess: ((URL) -> Void)?,
         onError: ((Restler.Error) -> Void)?,
         onCompletion: ((Result<URL, Restler.Error>) -> Void)?