Release 4.0.0-beta.0

ReactiveX · Sep 17, 2017 · a0bf386 · a0bf386
1 parent efe3af1
commit a0bf386
Show file tree

Hide file tree

Showing 33 changed files with 74 additions and 1,699 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,27 @@ All notable changes to this project will be documented in this file.
 ## Master
 
 * Adds `materialize()` operator for RxBlocking's `BlockingObservable`. #1383
-* Adds `first` operator to ObservableType.
+* Adds `first` operator to `ObservableType`.
+
+#### Anomalies
+
+* Call `controlTextDidChange(…)` as an optional method. #1406
+* Fixed issue with `NSControl.rx.value` regarding multiple observers. #1399
+
+## [4.0.0-beta.0](https://github.com/ReactiveX/RxSwift/releases/tag/4.0.0-beta.0)
+
+* Adds `materialize()` operator for RxBlocking's `BlockingObservable`. #1383
+* Adds `first` operator to `ObservableType`.
+* Deprecates `UIBindingObserver` in favor of `Binder`. #1411
+* Adds another specialization of `SharedSequence` called `Signal`.
+* Refactors `DelegateProxy` to be type safe.
+* Changes nested `SharedSequence` strategy to use inner sharing strategy for result.
+
+#### Anomalies
+
+* Call `controlTextDidChange(…)` as an optional method. #1406
+* Fixed issue with `NSControl.rx.value` regarding multiple observers. #1399
+* Removes useless extensions from `PrimitiveSequence`. #1248
 
 ## [4.0.0-alpha.1](https://github.com/ReactiveX/RxSwift/releases/tag/4.0.0-alpha.1)
 

diff --git a/RxBlocking.podspec b/RxBlocking.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxBlocking"
-  s.version          = "4.0.0-alpha.1"
+  s.version          = "4.0.0-beta.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,5 +25,5 @@ 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', '~> 4.0.0-alpha.1'
+  s.dependency 'RxSwift', '~> 4.0.0-beta.0'
 end
diff --git a/RxBlocking/Info.plist b/RxBlocking/Info.plist
diff --git a/RxCocoa.podspec b/RxCocoa.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxCocoa"
-  s.version          = "4.0.0-alpha.1"
+  s.version          = "4.0.0-beta.0"
   s.summary          = "RxSwift Cocoa extensions"
   s.description      = <<-DESC
 * UI extensions
@@ -27,5 +27,5 @@ Pod::Spec.new do |s|
   s.watchos.source_files  = 'RxCocoa/iOS/**/*.swift'
   s.tvos.source_files     = 'RxCocoa/iOS/**/*.swift'
 
-  s.dependency 'RxSwift', '~> 4.0.0-alpha.1'
+  s.dependency 'RxSwift', '~> 4.0.0-beta.0'
 end
diff --git a/RxCocoa/Info.plist b/RxCocoa/Info.plist
diff --git a/RxExample/Extensions/RxCLLocationManagerDelegateProxy.swift b/RxExample/Extensions/RxCLLocationManagerDelegateProxy.swift
@@ -12,19 +12,27 @@ import CoreLocation
     import RxCocoa
 #endif
 
-class RxCLLocationManagerDelegateProxy
+public class RxCLLocationManagerDelegateProxy
     : DelegateProxy<CLLocationManager, CLLocationManagerDelegate>
     , DelegateProxyType
     , CLLocationManagerDelegate {
 
+    public init(parentObject: CLLocationManager) {
+        super.init(parentObject: parentObject, delegateProxy: RxCLLocationManagerDelegateProxy.self)
+    }
+
+    public static func registerKnownImplementations() {
+        self.register { RxCLLocationManagerDelegateProxy(parentObject: $0) }
+    }
+
     internal lazy var didUpdateLocationsSubject = PublishSubject<[CLLocation]>()
     internal lazy var didFailWithErrorSubject = PublishSubject<Error>()
 
-    override class func currentDelegate(for object: ParentObject) -> CLLocationManagerDelegate? {
+    public class func currentDelegate(for object: ParentObject) -> CLLocationManagerDelegate? {
         return object.delegate
     }
 
-    override class func setCurrentDelegate(_ delegate: CLLocationManagerDelegate?, toObject object: ParentObject) {
+    public class func setCurrentDelegate(_ delegate: CLLocationManagerDelegate?, to object: ParentObject) {
         object.delegate = delegate
     }
 

diff --git a/RxExample/Extensions/RxImagePickerDelegateProxy.swift b/RxExample/Extensions/RxImagePickerDelegateProxy.swift
@@ -16,7 +16,11 @@
 
 open class RxImagePickerDelegateProxy
     : RxNavigationControllerDelegateProxy, UIImagePickerControllerDelegate {
-
+
+    public init(parentObject: UIImagePickerController) {
+        super.init(parentObject: parentObject)
+    }
+
 }
 
 #endif
diff --git a/RxExample/RxDataSources/DataSources+Rx/RxCollectionViewSectionedAnimatedDataSource.swift b/RxExample/RxDataSources/DataSources+Rx/RxCollectionViewSectionedAnimatedDataSource.swift
@@ -54,7 +54,7 @@ open class RxCollectionViewSectionedAnimatedDataSource<S: AnimatableSectionModel
      Collection view behaves poorly during fast updates, so this should remedy those issues.
     */
     open func collectionView(_ collectionView: UICollectionView, throttledObservedEvent event: Event<Element>) {
-        UIBindingObserver(UIElement: self) { dataSource, newSections in
+        Binder(self) { dataSource, newSections in
             let oldSections = dataSource.sectionModels
             do {
                 let differences = try differencesForSectionedView(oldSections, finalSections: newSections)
@@ -77,7 +77,7 @@ open class RxCollectionViewSectionedAnimatedDataSource<S: AnimatableSectionModel
     }
 
     open func collectionView(_ collectionView: UICollectionView, observedEvent: Event<Element>) {
-        UIBindingObserver(UIElement: self) { dataSource, newSections in
+        Binder(self) { dataSource, newSections in
             #if DEBUG
                 self._dataSourceBound = true
             #endif

diff --git a/RxExample/RxDataSources/DataSources+Rx/RxCollectionViewSectionedReloadDataSource.swift b/RxExample/RxDataSources/DataSources+Rx/RxCollectionViewSectionedReloadDataSource.swift
@@ -24,7 +24,7 @@ open class RxCollectionViewSectionedReloadDataSource<S: SectionModelType>
     }
 
     open func collectionView(_ collectionView: UICollectionView, observedEvent: Event<Element>) {
-        UIBindingObserver(UIElement: self) { dataSource, element in
+        Binder(self) { dataSource, element in
             #if DEBUG
                 self._dataSourceBound = true
             #endif

diff --git a/RxExample/RxDataSources/DataSources+Rx/RxTableViewSectionedAnimatedDataSource.swift b/RxExample/RxDataSources/DataSources+Rx/RxTableViewSectionedAnimatedDataSource.swift
@@ -27,7 +27,7 @@ open class RxTableViewSectionedAnimatedDataSource<S: AnimatableSectionModelType>
     }
 
     open func tableView(_ tableView: UITableView, observedEvent: Event<Element>) {
-        UIBindingObserver(UIElement: self) { dataSource, newSections in
+        Binder(self) { dataSource, newSections in
             #if DEBUG
                 self._dataSourceBound = true
             #endif

diff --git a/RxExample/RxDataSources/DataSources+Rx/RxTableViewSectionedReloadDataSource.swift b/RxExample/RxDataSources/DataSources+Rx/RxTableViewSectionedReloadDataSource.swift
@@ -23,7 +23,7 @@ open class RxTableViewSectionedReloadDataSource<S: SectionModelType>
     }
 
     open func tableView(_ tableView: UITableView, observedEvent: Event<Element>) {
-        UIBindingObserver(UIElement: self) { dataSource, element in
+        Binder(self) { dataSource, element in
             #if DEBUG
                 self._dataSourceBound = true
             #endif

diff --git a/RxExample/RxExample-iOSTests/CLLocationManager+RxTests.swift b/RxExample/RxExample-iOSTests/CLLocationManager+RxTests.swift
@@ -10,6 +10,7 @@ import RxSwift
 import RxCocoa
 import XCTest
 import CoreLocation
+import RxExample_iOS
 
 class CLLocationManagerTests : RxTest {
 

diff --git a/RxExample/RxExample-iOSTests/Info.plist b/RxExample/RxExample-iOSTests/Info.plist
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>We use it</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>We use it</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>

diff --git a/RxExample/RxExample-iOSTests/RxExample_iOSTests.swift b/RxExample/RxExample-iOSTests/RxExample_iOSTests.swift
@@ -140,7 +140,7 @@ class RxExample_iOSTests
         
         This method enables using mock schedulers for while testing drivers.
         */
-        driveOnScheduler(scheduler) {
+        SharingScheduler.mock(scheduler: scheduler) {
 
             let viewModel = GithubSignupViewModel2(
                 input: (

diff --git a/RxExample/RxExample-iOSTests/UIImagePickerController+RxTests.swift b/RxExample/RxExample-iOSTests/UIImagePickerController+RxTests.swift
@@ -14,6 +14,7 @@ import RxSwift
 import RxCocoa
 import XCTest
 import UIKit
+import RxExample_iOS
 
 class UIImagePickerControllerTests: RxTest {
 

diff --git a/RxExample/RxExample.xcodeproj/project.pbxproj b/RxExample/RxExample.xcodeproj/project.pbxproj
@@ -122,9 +122,6 @@
 		C886A6911D85AD7E00653EE4 /* CLLocationManager+RxTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C886A6901D85AD7E00653EE4 /* CLLocationManager+RxTests.swift */; };
 		C886A6931D85ADA100653EE4 /* UIImagePickerController+RxTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C886A6921D85ADA100653EE4 /* UIImagePickerController+RxTests.swift */; };
 		C886A6951D85AEA300653EE4 /* RxTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C886A6941D85AEA300653EE4 /* RxTest.swift */; };
-		C886A6991D85B0E400653EE4 /* CLLocationManager+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C886A68C1D85AD2000653EE4 /* CLLocationManager+Rx.swift */; };
-		C886A69A1D85B0E400653EE4 /* RxCLLocationManagerDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C886A68D1D85AD2000653EE4 /* RxCLLocationManagerDelegateProxy.swift */; };
-		C886A69B1D85B0E500653EE4 /* UIImagePickerController+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C886A68A1D85AC9400653EE4 /* UIImagePickerController+Rx.swift */; };
 		C88BB8BB1B07E6C90064D411 /* SearchResultViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86E2F321AE5A0CA00C31024 /* SearchResultViewModel.swift */; };
 		C88BB8BC1B07E6C90064D411 /* HtmlParsing.swift in Sources */ = {isa = PBXBuildFile; fileRef = C83367111AD029AE00C668A7 /* HtmlParsing.swift */; };
 		C88BB8BE1B07E6C90064D411 /* ImageService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C83367121AD029AE00C668A7 /* ImageService.swift */; };
@@ -136,7 +133,6 @@
 		C88BB8CC1B07E6C90064D411 /* WikipediaPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86E2F3C1AE5A0CA00C31024 /* WikipediaPage.swift */; };
 		C88C2B2A1D67EC5200B01A98 /* FlowTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88C2B291D67EC5200B01A98 /* FlowTests.swift */; };
 		C88CB7261D8F253D0021D83F /* RxImagePickerDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88CB7251D8F253D0021D83F /* RxImagePickerDelegateProxy.swift */; };
-		C88CB73B1D8F25440021D83F /* RxImagePickerDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88CB7251D8F253D0021D83F /* RxImagePickerDelegateProxy.swift */; };
 		C890A65D1AEC084100AFF7E6 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C890A65C1AEC084100AFF7E6 /* ViewController.swift */; };
 		C89634081B95BE50002AE38C /* RxBlocking.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C8A468EF1B8A8BD000BF917B /* RxBlocking.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		C89634091B95BE50002AE38C /* RxCocoa.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C8A468ED1B8A8BCC00BF917B /* RxCocoa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -1558,13 +1554,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C886A6991D85B0E400653EE4 /* CLLocationManager+Rx.swift in Sources */,
 				C89C2BD61C321DA200EBC99C /* TestScheduler+MarbleTests.swift in Sources */,
 				C886A6951D85AEA300653EE4 /* RxTest.swift in Sources */,
 				C849EF901C319E9A0048AC4A /* GithubSignupViewModel1.swift in Sources */,
 				C849EF641C3190360048AC4A /* RxExample_iOSTests.swift in Sources */,
-				C886A69B1D85B0E500653EE4 /* UIImagePickerController+Rx.swift in Sources */,
-				C88CB73B1D8F25440021D83F /* RxImagePickerDelegateProxy.swift in Sources */,
 				C886A6911D85AD7E00653EE4 /* CLLocationManager+RxTests.swift in Sources */,
 				C849EF921C319E9A0048AC4A /* DefaultImplementations.swift in Sources */,
 				C849EF991C31A63C0048AC4A /* Wireframe.swift in Sources */,
@@ -1573,7 +1566,6 @@
 				C849EF9A1C31A7680048AC4A /* ActivityIndicator.swift in Sources */,
 				C849EF951C319E9D0048AC4A /* GithubSignupViewModel2.swift in Sources */,
 				C886A6931D85ADA100653EE4 /* UIImagePickerController+RxTests.swift in Sources */,
-				C886A69A1D85B0E400653EE4 /* RxCLLocationManagerDelegateProxy.swift in Sources */,
 				C89C2BDD1C32231A00EBC99C /* MockWireframe.swift in Sources */,
 				C89C2BDF1C32231A00EBC99C /* ValidationResult+Equatable.swift in Sources */,
 				C849EF911C319E9A0048AC4A /* Protocols.swift in Sources */,

diff --git a/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOSTests.xcscheme b/RxExample/RxExample.xcodeproj/xcshareddata/xcschemes/RxExample-iOSTests.xcscheme
@@ -10,6 +10,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -30,6 +31,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/RxExample/RxExample/Examples/GeolocationExample/GeolocationViewController.swift b/RxExample/RxExample/Examples/GeolocationExample/GeolocationViewController.swift
@@ -14,8 +14,8 @@ import CoreLocation
 #endif
 
 private extension Reactive where Base: UILabel {
-    var coordinates: UIBindingObserver<Base, CLLocationCoordinate2D> {
-        return UIBindingObserver(UIElement: base) { label, location in
+    var coordinates: Binder<CLLocationCoordinate2D> {
+        return Binder(base) { label, location in
             label.text = "Lat: \(location.latitude)\nLon: \(location.longitude)"
         }
     }

diff --git a/...ample/RxExample/Examples/GitHubSearchRepositories/UINavigationController+Extensions.swift b/...ample/RxExample/Examples/GitHubSearchRepositories/UINavigationController+Extensions.swift
@@ -16,8 +16,8 @@ struct Colors {
 }
 
 extension Reactive where Base: UINavigationController {
-    var isOffline: UIBindingObserver<Base, Bool> {
-        return UIBindingObserver(UIElement: base) { navigationController, isOffline in
+    var isOffline: Binder<Bool> {
+        return Binder(base) { navigationController, isOffline in
             navigationController.navigationBar.barTintColor = isOffline
                 ? Colors.offlineColor
                 : Colors.onlineColor

diff --git a/RxExample/RxExample/Examples/GitHubSignup/BindingExtensions.swift b/RxExample/RxExample/Examples/GitHubSignup/BindingExtensions.swift
@@ -48,8 +48,8 @@ extension ValidationResult {
 }
 
 extension Reactive where Base: UILabel {
-    var validationResult: UIBindingObserver<Base, ValidationResult> {
-        return UIBindingObserver(UIElement: base) { label, result in
+    var validationResult: Binder<ValidationResult> {
+        return Binder(base) { label, result in
             label.textColor = result.textColor
             label.text = result.description
         }

diff --git a/...RxExample/Examples/UIPickerViewExample/CustomPickerViewAdapterExampleViewController.swift b/...RxExample/Examples/UIPickerViewExample/CustomPickerViewAdapterExampleViewController.swift
@@ -61,10 +61,10 @@ final class PickerViewViewAdapter
     }
 
     func pickerView(_ pickerView: UIPickerView, observedEvent: Event<Element>) {
-        UIBindingObserver(UIElement: self) { (adapter, items) in
+        Binder(self) { (adapter, items) in
             adapter.items = items
             pickerView.reloadAllComponents()
-            }.on(observedEvent)
+        }.on(observedEvent)
     }
 }
 

diff --git a/RxExample/RxExample/Info-iOS.plist b/RxExample/RxExample/Info-iOS.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>We need location</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>

diff --git a/RxExample/RxExample/Services/UIImageView+DownloadableImage.swift b/RxExample/RxExample/Services/UIImageView+DownloadableImage.swift
@@ -15,12 +15,12 @@ import UIKit
 
 extension Reactive where Base: UIImageView {
 
-    var downloadableImage: UIBindingObserver<Base, DownloadableImage>{
+    var downloadableImage: Binder<DownloadableImage>{
         return downloadableImageAnimated(nil)
     }
 
-    func downloadableImageAnimated(_ transitionType:String?) -> UIBindingObserver<Base, DownloadableImage> {
-        return UIBindingObserver(UIElement: base) { imageView, image in
+    func downloadableImageAnimated(_ transitionType:String?) -> Binder<DownloadableImage> {
+        return Binder(base) { imageView, image in
             for subview in imageView.subviews {
                 subview.removeFromSuperview()
             }

diff --git a/RxExample/RxExample/iOS/AppDelegate.swift b/RxExample/RxExample/iOS/AppDelegate.swift
@@ -18,9 +18,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         if UIApplication.isInUITest {
             UIView.setAnimationsEnabled(false)
         }
-
-        // Install delegate proxy
-        RxImagePickerDelegateProxy.register(for: UIImagePickerController.self)
+
+        RxImagePickerDelegateProxy.register { RxImagePickerDelegateProxy(parentObject: $0) }
 
         #if DEBUG
         _ = Observable<Int>.interval(1, scheduler: MainScheduler.instance)

diff --git a/RxSwift.podspec b/RxSwift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxSwift"
-  s.version          = "4.0.0-alpha.1"
+  s.version          = "4.0.0-beta.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
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.0-alpha.1</string>
+	<string>4.0.0-beta.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/RxTest.podspec b/RxTest.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxTest"
-  s.version          = "4.0.0-alpha.1"
+  s.version          = "4.0.0-beta.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', '~> 4.0.0-alpha.1'
+  s.dependency 'RxSwift', '~> 4.0.0-beta.0'
 
   s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' }
 end
diff --git a/RxTest/Info.plist b/RxTest/Info.plist
diff --git a/Sources/AllTestz/PrimitiveSequenceTest.swift b/Sources/AllTestz/PrimitiveSequenceTest.swift