chore: RxSwift 6 ready

BREAKING CHANGE: RxSwift 6

Author: rynecheow

Cartfile

@@ -1,2 +1,2 @@
-github "ReactiveX/RxSwift" ~> 5.1
+github "ReactiveX/RxSwift" "6.0.0"
 github "Alamofire/Alamofire" ~> 5.4

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "Alamofire/Alamofire" "5.4.0"
+github "Alamofire/Alamofire" "5.4.1"
 github "AliSoftware/OHHTTPStubs" "9.1.0"
-github "ReactiveX/RxSwift" "5.1.1"
+github "ReactiveX/RxSwift" "6.0.0"

Examples/Podfile

@@ -9,7 +9,7 @@ end
 def common_tests
   pod "OHHTTPStubs", "~> 9.1"
   pod "OHHTTPStubs/Swift", "~> 9.1"
-  pod "RxBlocking", "~> 5.1"
+  pod "RxBlocking", "~> 6.0"
 end
 
 target "RxAlamofireDemo-iOS" do

Examples/Podfile.lock

@@ -1,17 +1,17 @@
 PODS:
-  - Alamofire (5.4.0)
-  - RxAlamofire/Core (5.0.0):
+  - Alamofire (5.4.1)
+  - RxAlamofire/Core (5.7.1):
     - Alamofire (~> 5.4)
-    - RxSwift (~> 5.1)
-  - RxAlamofire/RxCocoa (5.0.0):
+    - RxSwift (~> 6.0)
+  - RxAlamofire/RxCocoa (5.7.1):
     - RxAlamofire/Core
-    - RxCocoa (~> 5.1)
-  - RxCocoa (5.1.1):
-    - RxRelay (~> 5)
-    - RxSwift (~> 5)
-  - RxRelay (5.1.1):
-    - RxSwift (~> 5)
-  - RxSwift (5.1.1)
+    - RxCocoa (~> 6.0)
+  - RxCocoa (6.0.0):
+    - RxRelay (= 6.0.0)
+    - RxSwift (= 6.0.0)
+  - RxRelay (6.0.0):
+    - RxSwift (= 6.0.0)
+  - RxSwift (6.0.0)
 
 DEPENDENCIES:
   - RxAlamofire/RxCocoa (from `../`)
@@ -28,12 +28,12 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Alamofire: 3b6a534a3df22db367e4dedeeca73d1ddfcf0e2f
-  RxAlamofire: 94b1d6c9d4cada13fad706f6ca0df777ba25427a
-  RxCocoa: 32065309a38d29b5b0db858819b5bf9ef038b601
-  RxRelay: d77f7d771495f43c556cbc43eebd1bb54d01e8e9
-  RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178
+  Alamofire: 2291f7d21ca607c491dd17642e5d40fdcda0e65c
+  RxAlamofire: 2dbdd68051f7e7779fdd2b7bda9b93ac1e533a19
+  RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e
+  RxRelay: 8d593be109c06ea850df027351beba614b012ffb
+  RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295
 
-PODFILE CHECKSUM: 9140f995889a245f4d0dc5f05c91c276c4aa4d63
+PODFILE CHECKSUM: a7610a5168228508e279f8c77f56aa8c67f26640
 
 COCOAPODS: 1.10.0

Examples/RxAlamofireDemo-iOS/MasterViewController.swift

@@ -58,7 +58,7 @@ class MasterViewController: UIViewController, UITextFieldDelegate {
         self?.toTextField.text = "\(rate * fromValue)"
       }, onError: { [weak self] e in
         self?.displayError(e as NSError)
-            })
+      })
       .disposed(by: disposeBag)
   }
 
@@ -213,17 +213,17 @@ class MasterViewController: UIViewController, UITextFieldDelegate {
 
       let postInfo = NSMutableString()
       if let postDict = postJSON as? [String: AnyObject],
-        let commentsArray = commentsJSON as? [[String: AnyObject]],
-        let postTitle = postDict["title"] as? String,
-        let postBody = postDict["body"] as? String {
+         let commentsArray = commentsJSON as? [[String: AnyObject]],
+         let postTitle = postDict["title"] as? String,
+         let postBody = postDict["body"] as? String {
         postInfo.append("Title: ")
         postInfo.append(postTitle)
         postInfo.append("\n\n")
         postInfo.append(postBody)
         postInfo.append("\n\n\nComments:\n")
         for comment in commentsArray {
           if let email = comment["email"] as? String,
-            let body = comment["body"] as? String {
+             let body = comment["body"] as? String {
             postInfo.append(email)
             postInfo.append(": ")
             postInfo.append(body)
@@ -236,7 +236,7 @@ class MasterViewController: UIViewController, UITextFieldDelegate {
     }, onError: { e in
       self.dummyDataTextView.text = "An Error Occurred"
       self.displayError(e as NSError)
-            }).disposed(by: disposeBag)
+    }).disposed(by: disposeBag)
   }
 
   // MARK: - Utils

Examples/RxAlamofireDemo.xcodeproj/project.pbxproj

@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'cocoapods', '~> 1.9'
+gem 'cocoapods', '~> 1.10'
 gem 'danger', '~> 8.0'
 gem 'danger-swiftlint', '~> 0.20'
-gem 'jazzy', '~> 0.13'
-gem 'xcov', '~> 1.7.3'
-gem 'danger-xcov', '~> 0.5'
+gem 'jazzy', '~> 0.13'

Gemfile

@@ -13,23 +13,6 @@ GEM
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.402.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-core (~> 3, >= 3.109.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.86.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
-      aws-eventstream (~> 1, >= 1.0.2)
-    babosa (1.0.4)
     claide (1.0.3)
     claide-plugins (0.9.2)
       cork
@@ -72,10 +55,7 @@ GEM
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
-    colored (1.2)
     colored2 (3.1.2)
-    commander-fastlane (4.4.6)
-      highline (~> 1.7.2)
     concurrent-ruby (1.1.7)
     cork (0.3.0)
       colored2 (~> 3.1)
@@ -96,107 +76,24 @@ GEM
       danger
       rake (> 10)
       thor (~> 0.19)
-    danger-xcov (0.5.0)
-      danger (>= 2.1)
-      xcov (>= 1.7.3)
-    declarative (0.0.20)
-    declarative-option (0.1.0)
-    digest-crc (0.6.1)
-      rake (~> 13.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
-    emoji_regex (3.2.1)
     escape (0.0.4)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    excon (0.78.1)
-    faraday (1.1.0)
+    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-http-cache (2.2.0)
       faraday (>= 0.8)
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
-    fastimage (2.2.0)
-    fastlane (2.170.0)
-      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.3, < 3.0.0)
-      aws-sdk-s3 (~> 1.0)
-      babosa (>= 1.0.3, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
-      colored
-      commander-fastlane (>= 4.4.6, < 5.0.0)
-      dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 4.0)
-      excon (>= 0.71.0, < 1.0.0)
-      faraday (~> 1.0)
-      faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 1.0)
-      fastimage (>= 2.1.0, < 3.0.0)
-      gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.37.0, < 0.39.0)
-      google-cloud-storage (>= 1.15.0, < 2.0.0)
-      highline (>= 1.7.2, < 2.0.0)
-      json (< 3.0.0)
-      jwt (>= 2.1.0, < 3)
-      mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
-      plist (>= 3.1.0, < 4.0.0)
-      rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
-      simctl (~> 1.6.3)
-      slack-notifier (>= 2.0.0, < 3.0.0)
-      terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
-      tty-screen (>= 0.6.3, < 1.0.0)
-      tty-spinner (>= 0.8.0, < 1.0.0)
-      word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
-    ffi (1.13.1)
+    faraday-net_http (1.0.0)
+    ffi (1.14.2)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    git (1.7.0)
+    git (1.8.1)
       rchardet (~> 1.8)
-    google-api-client (0.38.0)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.9)
-      httpclient (>= 2.8.1, < 3.0)
-      mini_mime (~> 1.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-      signet (~> 0.12)
-    google-cloud-core (1.5.0)
-      google-cloud-env (~> 1.0)
-      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.4.0)
-      faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.0.1)
-    google-cloud-storage (1.29.1)
-      addressable (~> 2.5)
-      digest-crc (~> 0.4)
-      google-api-client (~> 0.33)
-      google-cloud-core (~> 1.2)
-      googleauth (~> 0.9)
-      mini_mime (~> 1.0)
-    googleauth (0.14.0)
-      faraday (>= 0.17.3, < 2.0)
-      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
-      multi_json (~> 1.11)
-      os (>= 0.9, < 2.0)
-      signet (~> 0.14)
-    highline (1.7.10)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.8.5)
+    i18n (1.8.6)
       concurrent-ruby (~> 1.0)
     jazzy (0.13.6)
       cocoapods (~> 1.5)
@@ -207,82 +104,47 @@ GEM
       sassc (~> 2.1)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
-    jmespath (1.4.0)
-    json (2.3.1)
-    jwt (2.2.2)
+    json (2.5.1)
     kramdown (2.3.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liferaft (0.0.6)
-    memoist (0.16.2)
-    mini_magick (4.11.0)
-    mini_mime (1.0.2)
     minitest (5.14.2)
     molinillo (0.6.6)
-    multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     mustache (1.1.1)
     nanaimo (0.3.0)
     nap (1.1.0)
-    naturally (2.2.0)
     netrc (0.11.0)
     no_proxy_fix (0.1.2)
-    octokit (4.19.0)
+    octokit (4.20.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    os (1.1.1)
-    plist (3.5.0)
     public_suffix (4.0.6)
-    rake (13.0.1)
+    rake (13.0.3)
     rchardet (1.8.0)
-    redcarpet (3.5.0)
-    representable (3.0.4)
-      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
-      uber (< 0.2.0)
-    retriable (3.1.2)
+    redcarpet (3.5.1)
     rexml (3.2.4)
-    rouge (2.0.7)
+    rouge (3.26.0)
     ruby-macho (1.4.0)
     ruby2_keywords (0.0.2)
-    rubyzip (2.3.0)
     sassc (2.4.0)
       ffi (~> 1.9)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    security (0.1.3)
-    signet (0.14.0)
-      addressable (~> 2.3)
-      faraday (>= 0.17.3, < 2.0)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
-    simctl (1.6.8)
-      CFPropertyList
-      naturally
-    slack-notifier (2.3.2)
     sqlite3 (1.4.2)
-    terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tty-cursor (0.7.1)
-    tty-screen (0.8.1)
-    tty-spinner (0.9.3)
-      tty-cursor (~> 0.7)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.8)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
-    word_wrap (1.0.0)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
     xcodeproj (1.19.0)
@@ -291,29 +153,15 @@ GEM
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
-    xcov (1.7.5)
-      fastlane (>= 2.141.0, < 3.0.0)
-      multipart-post
-      slack-notifier
-      terminal-table
-      xcodeproj
-      xcresult (~> 0.2.0)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
-    xcpretty-travis-formatter (1.0.0)
-      xcpretty (~> 0.2, >= 0.0.7)
-    xcresult (0.2.1)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
-  cocoapods (~> 1.9)
+  cocoapods (~> 1.10)
   danger (~> 8.0)
   danger-swiftlint (~> 0.20)
-  danger-xcov (~> 0.5)
   jazzy (~> 0.13)
-  xcov (~> 1.7.3)
 
 BUNDLED WITH
-   1.17.2
+   2.2.4