From a580d07ed002217fd91d8446c3a852486e9beefa Mon Sep 17 00:00:00 2001 From: freak4pc <freak4pc@gmail.com> Date: Tue, 7 Apr 2020 07:44:59 +0300 Subject: [PATCH] Update Gemfile and text --- CHANGELOG.md | 2 ++ Gemfile | 2 +- Gemfile.lock | 36 +++++++++++------------------------- README.md | 10 +++++----- 4 files changed, 19 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e39e68baf..6518b1876 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ All notable changes to this project will be documented in this file. * Make `NSTextView` not weak for Swift 5.2 and up. * Add `WKWebView` navigation delegate reactive extensions. #2144 +**Note**: We no longer guarantee support for Xcode 10.x. Maintaining these is counter-intuitive as they're over a year old and are ridden with bugs. + ## [5.1.0](https://github.com/ReactiveX/RxSwift/releases/tag/5.1.0) * Remove UIWebView Reactive Extensions due to [Apple's hard deprecation, starting April 2020](https://developer.apple.com/news/?id=12232019b). #2062 diff --git a/Gemfile b/Gemfile index 9e8f1e7ac..98fa49b13 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' gem 'danger' -gem 'cocoapods', '~> 1.9.0' +gem 'cocoapods', '~> 1.7.0' diff --git a/Gemfile.lock b/Gemfile.lock index 8b4144eef..a99f67154 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,25 +9,22 @@ GEM tzinfo (~> 1.1) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - algoliasearch (1.27.1) - httpclient (~> 2.8, >= 2.8.3) - json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) claide-plugins (0.9.2) cork nap open4 (~> 1.3) - cocoapods (1.9.1) + cocoapods (1.7.5) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.1) + cocoapods-core (= 1.7.5) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.4.0, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) @@ -36,15 +33,11 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.1) + xcodeproj (>= 1.10.0, < 2.0) + cocoapods-core (1.7.5) activesupport (>= 4.0.2, < 6) - algoliasearch (~> 1.0) - concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) - netrc (~> 0.11) - typhoeus (~> 1.0) cocoapods-deintegrate (1.0.4) cocoapods-downloader (1.3.0) cocoapods-plugins (1.0.0) @@ -59,7 +52,7 @@ GEM concurrent-ruby (1.1.6) cork (0.3.0) colored2 (~> 3.1) - danger (6.3.1) + danger (6.3.2) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -73,22 +66,17 @@ GEM octokit (~> 4.7) terminal-table (~> 1) escape (0.0.4) - ethon (0.12.0) - ffi (>= 1.3.0) faraday (0.17.3) multipart-post (>= 1.2, < 3) - faraday-http-cache (2.0.0) + faraday-http-cache (2.1.0) faraday (~> 0.8) - ffi (1.12.2) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) git (1.6.0) rchardet (~> 1.8) - httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - json (2.3.0) kramdown (2.1.0) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) @@ -99,11 +87,11 @@ GEM nap (1.1.0) netrc (0.11.0) no_proxy_fix (0.1.2) - octokit (4.17.0) + octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) open4 (1.3.4) - public_suffix (4.0.3) + public_suffix (4.0.4) rchardet (1.8.0) ruby-macho (1.4.0) sawyer (0.8.2) @@ -112,9 +100,7 @@ GEM terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) - typhoeus (1.3.1) - ethon (>= 0.9.0) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) unicode-display_width (1.7.0) xcodeproj (1.15.0) @@ -128,7 +114,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (~> 1.9.0) + cocoapods (~> 1.7.0) danger BUNDLED WITH diff --git a/README.md b/README.md index c66614258..59e861383 100644 --- a/README.md +++ b/README.md @@ -124,16 +124,16 @@ searchResults ## Requirements -* Xcode 10.2 -* Swift 5.0 +* Xcode 11.x +* Swift 5.x -For Xcode 10.1 and below, [use RxSwift 4.5](https://github.com/ReactiveX/RxSwift/releases/tag/4.5.0). +For Xcode 10.3.1 and below, [use RxSwift 5.0.1](https://github.com/ReactiveX/RxSwift/releases/tag/5.0.1). ## Installation -Rx doesn't contain any external dependencies. +RxSwift doesn't contain any external dependencies. -These are currently the supported options: +These are currently the supported intllation options: ### Manual