diff --git a/CHANGELOG.md b/CHANGELOG.md index c7b37ee4d..96cd5acbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file. --- -## 6.1.0 +## 6.2.0 **Breaking** diff --git a/Gemfile b/Gemfile index 682a66928..b923fbd3e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' gem 'danger' -gem 'cocoapods', '~> 1.9' \ No newline at end of file +gem 'cocoapods', '~> 1.10.1' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 4876ef29e..ec116bed8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,15 +1,15 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.2) - activesupport (4.2.11.3) - i18n (~> 0.7) + CFPropertyList (3.0.3) + activesupport (5.2.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - algoliasearch (1.27.4) + algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) @@ -18,15 +18,14 @@ GEM cork nap open4 (~> 1.3) - cocoapods (1.9.3) - activesupport (>= 4.0.2, < 5) + cocoapods (1.10.1) + addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.3) + cocoapods-core (= 1.10.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.2.2, < 2.0) + cocoapods-downloader (>= 1.4.0, < 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-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) @@ -36,30 +35,31 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.3) - activesupport (>= 4.0.2, < 6) + xcodeproj (>= 1.19.0, < 2.0) + cocoapods-core (1.10.1) + activesupport (> 5.0, < 6) + addressable (~> 2.6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) + public_suffix typhoeus (~> 1.0) cocoapods-deintegrate (1.0.4) cocoapods-downloader (1.4.0) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) - cocoapods-stats (1.1.0) cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) cork (0.3.0) colored2 (~> 3.1) - danger (8.0.6) + danger (8.2.3) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -71,55 +71,63 @@ GEM kramdown-parser-gfm (~> 1.0) no_proxy_fix octokit (~> 4.7) - terminal-table (~> 1) + terminal-table (>= 1, < 4) escape (0.0.4) - ethon (0.12.0) - ffi (>= 1.3.0) - faraday (1.0.1) + ethon (0.14.0) + ffi (>= 1.15.0) + faraday (1.4.1) + faraday-excon (~> 1.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) + ruby2_keywords (>= 0.0.4) + faraday-excon (1.1.0) faraday-http-cache (2.2.0) faraday (>= 0.8) - ffi (1.13.1) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.1.0) + ffi (1.15.0) 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) httpclient (2.8.3) - i18n (0.9.5) + i18n (1.8.10) concurrent-ruby (~> 1.0) - json (2.3.1) + json (2.5.1) kramdown (2.3.1) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - minitest (5.14.2) + minitest (5.14.4) molinillo (0.6.6) multipart-post (2.1.1) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) no_proxy_fix (0.1.2) - octokit (4.18.0) + octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) open4 (1.3.4) public_suffix (4.0.6) rchardet (1.8.0) - rexml (3.2.4) + rexml (3.2.5) ruby-macho (1.4.0) + ruby2_keywords (0.0.4) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - terminal-table (1.8.0) + terminal-table (3.0.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) unicode-display_width (1.7.0) - xcodeproj (1.18.0) + xcodeproj (1.19.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -130,8 +138,8 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (~> 1.9) + cocoapods (~> 1.10.1) danger BUNDLED WITH - 2.1.4 + 2.2.14 diff --git a/README.md b/README.md index c0d3cce1f..20330166b 100644 --- a/README.md +++ b/README.md @@ -146,14 +146,14 @@ Open Rx.xcworkspace, choose `RxExample` and hit run. This method will build ever use_frameworks! target 'YOUR_TARGET_NAME' do - pod 'RxSwift', '6.1.0' - pod 'RxCocoa', '6.1.0' + pod 'RxSwift', '6.2.0' + pod 'RxCocoa', '6.2.0' end # RxTest and RxBlocking make the most sense in the context of unit/integration tests target 'YOUR_TESTING_TARGET' do - pod 'RxBlocking', '6.1.0' - pod 'RxTest', '6.1.0' + pod 'RxBlocking', '6.2.0' + pod 'RxTest', '6.2.0' end ``` @@ -178,7 +178,7 @@ Simply drag the needed framework binaries to your **Frameworks, Libraries, and E Add this to `Cartfile` ``` -github "ReactiveX/RxSwift" "6.1.0" +github "ReactiveX/RxSwift" "6.2.0" ``` ```bash @@ -211,7 +211,7 @@ import PackageDescription let package = Package( name: "RxTestProject", dependencies: [ - .package(url: "https://github.com/ReactiveX/RxSwift.git", .exact("6.1.0")) + .package(url: "https://github.com/ReactiveX/RxSwift.git", .exact("6.2.0")) ], targets: [ .target(name: "RxTestProject", dependencies: ["RxSwift", "RxCocoa"]) diff --git a/RxBlocking.podspec b/RxBlocking.podspec index bd006ba72..6775f20e6 100644 --- a/RxBlocking.podspec +++ b/RxBlocking.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RxBlocking" - s.version = "6.1.0" + s.version = "6.2.0" s.summary = "RxSwift Blocking operatos" s.description = <<-DESC Set of blocking operators for RxSwift. These operators are mostly intended for unit/integration tests @@ -25,6 +25,6 @@ Waiting for observable sequence to complete before exiting command line applicat s.source_files = 'RxBlocking/**/*.swift', 'Platform/**/*.swift' s.exclude_files = 'RxBlocking/Platform/**/*.swift' - s.dependency 'RxSwift', '6.1.0' + s.dependency 'RxSwift', '6.2.0' s.swift_version = '5.1' end diff --git a/RxBlocking/Info.plist b/RxBlocking/Info.plist index 94bd648e9..4d119a75b 100644 --- a/RxBlocking/Info.plist +++ b/RxBlocking/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 6.1.0 + 6.2.0 CFBundleSignature ???? CFBundleVersion diff --git a/RxCocoa.podspec b/RxCocoa.podspec index aa6785b7f..8028b2e8c 100644 --- a/RxCocoa.podspec +++ b/RxCocoa.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RxCocoa" - s.version = "6.1.0" + s.version = "6.2.0" s.summary = "RxSwift Cocoa extensions" s.description = <<-DESC * UI extensions @@ -23,8 +23,8 @@ Pod::Spec.new do |s| s.source_files = 'RxCocoa/**/*.{swift,h,m}', 'Platform/**/*.swift' s.exclude_files = 'RxCocoa/Platform/**/*.swift', 'Platform/AtomicInt.swift' - s.dependency 'RxSwift', '6.1.0' - s.dependency 'RxRelay', '6.1.0' + s.dependency 'RxSwift', '6.2.0' + s.dependency 'RxRelay', '6.2.0' s.swift_version = '5.1' end diff --git a/RxCocoa/Info.plist b/RxCocoa/Info.plist index 94bd648e9..4d119a75b 100644 --- a/RxCocoa/Info.plist +++ b/RxCocoa/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 6.1.0 + 6.2.0 CFBundleSignature ???? CFBundleVersion diff --git a/RxRelay.podspec b/RxRelay.podspec index 5ee5b2492..3a0840402 100644 --- a/RxRelay.podspec +++ b/RxRelay.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RxRelay" - s.version = "6.1.0" + s.version = "6.2.0" s.summary = "Relays for RxSwift - PublishRelay, BehaviorRelay and ReplayRelay" s.description = <<-DESC Relays for RxSwift - PublishRelay, BehaviorRelay and ReplayRelay @@ -24,6 +24,6 @@ Relays for RxSwift - PublishRelay, BehaviorRelay and ReplayRelay s.source_files = 'RxRelay/**/*.{swift,h,m}' - s.dependency 'RxSwift', '6.1.0' + s.dependency 'RxSwift', '6.2.0' s.swift_version = '5.1' end diff --git a/RxRelay/Info.plist b/RxRelay/Info.plist index 94bd648e9..4d119a75b 100644 --- a/RxRelay/Info.plist +++ b/RxRelay/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 6.1.0 + 6.2.0 CFBundleSignature ???? CFBundleVersion diff --git a/RxSwift.podspec b/RxSwift.podspec index 00d4c5cc2..ecb7b6e3e 100644 --- a/RxSwift.podspec +++ b/RxSwift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RxSwift" - s.version = "6.1.0" + s.version = "6.2.0" s.summary = "RxSwift is a Swift implementation of Reactive Extensions" s.description = <<-DESC This is a Swift port of [ReactiveX.io](https://github.com/ReactiveX) diff --git a/RxSwift/Info.plist b/RxSwift/Info.plist index 94bd648e9..4d119a75b 100644 --- a/RxSwift/Info.plist +++ b/RxSwift/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 6.1.0 + 6.2.0 CFBundleSignature ???? CFBundleVersion diff --git a/RxTest.podspec b/RxTest.podspec index a374f2dab..42874444c 100644 --- a/RxTest.podspec +++ b/RxTest.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RxTest" - s.version = "6.1.0" + s.version = "6.2.0" s.summary = "RxSwift Testing extensions" s.description = <<-DESC Unit testing extensions for RxSwift. This library contains mock schedulers, observables, and observers @@ -56,7 +56,7 @@ func testMap() { s.framework = 'XCTest' - s.dependency 'RxSwift', '6.1.0' + s.dependency 'RxSwift', '6.2.0' s.swift_version = '5.1' s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' } diff --git a/RxTest/Info.plist b/RxTest/Info.plist index 94bd648e9..4d119a75b 100644 --- a/RxTest/Info.plist +++ b/RxTest/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 6.1.0 + 6.2.0 CFBundleSignature ???? CFBundleVersion