From 16ea4bde86b386e5758aaf14c3f229f315f275bf Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Sat, 15 Sep 2018 16:44:38 +0200 Subject: [PATCH] Release 4.3.0 --- CHANGELOG.md | 11 ++++++----- RxBlocking.podspec | 2 +- RxBlocking/Info.plist | 2 +- RxCocoa.podspec | 2 +- RxCocoa/Info.plist | 2 +- RxExample/RxExample.xcodeproj/project.pbxproj | 6 +++--- RxExample/RxExample/Info-iOS.plist | 4 ++-- RxSwift.podspec | 2 +- RxSwift/Info.plist | 2 +- RxTest.podspec | 2 +- RxTest/Info.plist | 2 +- Tests/RxCocoaTests/UITableView+RxTests.swift | 8 ++++---- scripts/common.sh | 2 +- scripts/test-linux.sh | 2 +- 14 files changed, 25 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e438b2d9f..33df5802f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. --- ## Master + +## [4.3.0](https://github.com/ReactiveX/RxSwift/releases/tag/4.3.0) + +* Compatibility with Xcode 10.0 +* Adds new `insert` extension to collect and add multiple disposables to `DisposeBag`. +* Removes string interpolation warning * Adds `scan(into:accumulator:)`. * Adds `queuePriority` parameter (defaults to `.normal`) to `OperationQueueScheduler`. * Performance enhancement reduces Bag dispatch inline code size by 12%. @@ -15,11 +21,6 @@ All notable changes to this project will be documented in this file. * Fix build issues on new arm64_32 architecture (watchOS 5). -## [4.X.X](https://github.com/ReactiveX/RxSwift/releases/tag/4.X.X) - -* Adds new `insert` extension to collect and add multiple disposables to `DisposeBag`. -* Removes string interpolation warning - ## [4.2.0](https://github.com/ReactiveX/RxSwift/releases/tag/4.2.0) * Adds Smart Key Path subscripting to create a binder for property of object. diff --git a/RxBlocking.podspec b/RxBlocking.podspec index 37c06563e..4b370cd50 100644 --- a/RxBlocking.podspec +++ b/RxBlocking.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RxBlocking" - s.version = "4.2.0" + s.version = "4.3.0" s.summary = "RxSwift Blocking operatos" s.description = <<-DESC Set of blocking operators for RxSwift. These operators are mostly intended for unit/integration tests diff --git a/RxBlocking/Info.plist b/RxBlocking/Info.plist index b6ba9041b..b94d08631 100644 --- a/RxBlocking/Info.plist +++ b/RxBlocking/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.2.0 + 4.3.0 CFBundleSignature ???? CFBundleVersion diff --git a/RxCocoa.podspec b/RxCocoa.podspec index 90df98bff..5192c193e 100644 --- a/RxCocoa.podspec +++ b/RxCocoa.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RxCocoa" - s.version = "4.2.0" + s.version = "4.3.0" s.summary = "RxSwift Cocoa extensions" s.description = <<-DESC * UI extensions diff --git a/RxCocoa/Info.plist b/RxCocoa/Info.plist index b6ba9041b..b94d08631 100644 --- a/RxCocoa/Info.plist +++ b/RxCocoa/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.2.0 + 4.3.0 CFBundleSignature ???? CFBundleVersion diff --git a/RxExample/RxExample.xcodeproj/project.pbxproj b/RxExample/RxExample.xcodeproj/project.pbxproj index 0ba340c86..4e3166b22 100644 --- a/RxExample/RxExample.xcodeproj/project.pbxproj +++ b/RxExample/RxExample.xcodeproj/project.pbxproj @@ -1876,7 +1876,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "-objc_loadall"; - PRODUCT_BUNDLE_IDENTIFIER = io.rx.example.4.0.0; + PRODUCT_BUNDLE_IDENTIFIER = io.rx.example.4.3.0; PRODUCT_NAME = "RxExample-iOS"; SDKROOT = iphoneos; }; @@ -1891,7 +1891,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "-objc_loadall"; - PRODUCT_BUNDLE_IDENTIFIER = io.rx.example.4.0.0; + PRODUCT_BUNDLE_IDENTIFIER = io.rx.example.4.3.0; PRODUCT_NAME = "RxExample-iOS"; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -2100,7 +2100,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "-objc_loadall"; - PRODUCT_BUNDLE_IDENTIFIER = io.rx.example.4.0.0; + PRODUCT_BUNDLE_IDENTIFIER = io.rx.example.4.3.0; PRODUCT_NAME = "RxExample-iOS"; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; diff --git a/RxExample/RxExample/Info-iOS.plist b/RxExample/RxExample/Info-iOS.plist index 369908173..f5b390d78 100644 --- a/RxExample/RxExample/Info-iOS.plist +++ b/RxExample/RxExample/Info-iOS.plist @@ -29,12 +29,12 @@ NSCameraUsageDescription We need camera + NSLocationAlwaysAndWhenInUseUsageDescription + We need location NSLocationAlwaysUsageDescription We need location NSLocationWhenInUseUsageDescription We need location - NSLocationAlwaysAndWhenInUseUsageDescription - We need location NSPhotoLibraryUsageDescription We need photo library UILaunchStoryboardName diff --git a/RxSwift.podspec b/RxSwift.podspec index de6b89ca0..f6f23cb5e 100644 --- a/RxSwift.podspec +++ b/RxSwift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RxSwift" - s.version = "4.2.0" + s.version = "4.3.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 b6ba9041b..b94d08631 100644 --- a/RxSwift/Info.plist +++ b/RxSwift/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.2.0 + 4.3.0 CFBundleSignature ???? CFBundleVersion diff --git a/RxTest.podspec b/RxTest.podspec index ca9fa08e0..9dc700450 100644 --- a/RxTest.podspec +++ b/RxTest.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RxTest" - s.version = "4.2.0" + s.version = "4.3.0" s.summary = "RxSwift Testing extensions" s.description = <<-DESC Unit testing extensions for RxSwift. This library contains mock schedulers, observables, and observers diff --git a/RxTest/Info.plist b/RxTest/Info.plist index b6ba9041b..b94d08631 100644 --- a/RxTest/Info.plist +++ b/RxTest/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.2.0 + 4.3.0 CFBundleSignature ???? CFBundleVersion diff --git a/Tests/RxCocoaTests/UITableView+RxTests.swift b/Tests/RxCocoaTests/UITableView+RxTests.swift index cbda27afc..f4115cbab 100644 --- a/Tests/RxCocoaTests/UITableView+RxTests.swift +++ b/Tests/RxCocoaTests/UITableView+RxTests.swift @@ -666,8 +666,8 @@ extension UITableViewTests { XCTAssertEqual(firstEvents, [] as [Arguments]) { $0 == $1 } XCTAssertEqual(secondEvents, [] as [Arguments]) { $0 == $1 } tableView.dataSource!.tableView!(tableView, commit: .delete, forRowAt: indexPath as IndexPath) - XCTAssertEqual(firstEvents, [Arguments(values: [tableView, deleteEditingStyle, indexPath])] as [Arguments]) { $0 == $1 } - XCTAssertEqual(secondEvents, [Arguments(values: [tableView, deleteEditingStyle, indexPath])] as [Arguments]) { $0 == $1 } + XCTAssertEqual(firstEvents, [Arguments(values: [tableView, deleteEditingStyle, indexPath])]) + XCTAssertEqual(secondEvents, [Arguments(values: [tableView, deleteEditingStyle, indexPath])]) subscription1.dispose() @@ -723,8 +723,8 @@ extension UITableViewTests { XCTAssertEqual(firstEvents, [] as [Arguments]) { $0 == $1 } XCTAssertEqual(secondEvents, [] as [Arguments]) { $0 == $1 } tableView.dataSource!.tableView!(tableView, commit: .delete, forRowAt: indexPath as IndexPath) - XCTAssertEqual(firstEvents, [Arguments(values: [tableView, deleteEditingStyle, indexPath])] as [Arguments]) { $0 == $1 } - XCTAssertEqual(secondEvents, [Arguments(values: [tableView, deleteEditingStyle, indexPath])] as [Arguments]) { $0 == $1 } + XCTAssertEqual(firstEvents, [Arguments(values: [tableView, deleteEditingStyle, indexPath])]) + XCTAssertEqual(secondEvents, [Arguments(values: [tableView, deleteEditingStyle, indexPath])]) subscription1.dispose() diff --git a/scripts/common.sh b/scripts/common.sh index bf863dfe1..8d1519d72 100755 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -35,7 +35,7 @@ if [[ `uname` == "Darwin" ]]; then elif [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.watchOS-4-4 | wc -l` -eq 1 ]; then DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/4.4 else - DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/4.0 + DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/4.2 fi if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.tvOS-11-3 | wc -l` -eq 1 ]; then diff --git a/scripts/test-linux.sh b/scripts/test-linux.sh index f398fe0a3..50f88a16f 100755 --- a/scripts/test-linux.sh +++ b/scripts/test-linux.sh @@ -12,7 +12,7 @@ if [[ `uname` == "Darwin" ]]; then trap cleanup EXIT echo "Running linux" eval $(docker-machine env default) - docker exec -it rx4.0 bash -c "cd /projects/RxSwift; scripts/test-linux.sh" + docker exec -it swift bash -c "cd /projects/RxSwift; scripts/test-linux.sh" elif [[ `uname` == "Linux" ]]; then CONFIGURATIONS=(debug release)