Merge pull request RxSwiftCommunity#1 from sendyhalim/swift-3.0

Swift 3.0

Cartfile

@@ -1,2 +1,2 @@
-github "realm/realm-cocoa.git" "master"
+github "realm/realm-cocoa.git" ~> 1.1.0
 github "ReactiveX/RxSwift" "master"

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "ReactiveX/RxSwift" "06129b50cf17bc24bd0bef9e60982eac35f7d1c1"
-github "realm/realm-cocoa" "8e833ea68802d008c4a7caf118781af97782a481"
+github "ReactiveX/RxSwift" "4952adb27c684b47792923b00015516849061eab"
+github "realm/realm-cocoa" "v1.1.0"

Pod/Classes/RxRealm.swift

@@ -22,7 +22,7 @@ public protocol NotificationEmitter {
 
      - returns: `NotificationToken` - retain this value to keep notifications being emitted for the current collection.
      */
-    func addNotificationBlock(block: @escaping (RealmCollectionChange<Self>) -> ()) -> NotificationToken
+    func addNotificationBlock(_ block: @escaping (RealmCollectionChange<Self>) -> ()) -> NotificationToken
 }
 
 extension List: NotificationEmitter {}
@@ -66,13 +66,13 @@ public extension NotificationEmitter where Self: RealmCollection {
                 let value: Self
 
                 switch changeset {
-                case .Initial(let latestValue):
+                case .initial(let latestValue):
                     value = latestValue
-                    
-                case .Update(let latestValue, _, _, _):
+
+                case .update(let latestValue, _, _, _):
                     value = latestValue
-                    
-                case .Error(let error):
+
+                case .error(let error):
                     observer.onError(error)
                     return
                 }
@@ -112,11 +112,11 @@ public extension NotificationEmitter where Self: RealmCollection {
             let token = self.addNotificationBlock {changeset in
 
                 switch changeset {
-                case .Initial(let value):
+                case .initial(let value):
                     observer.onNext((value, nil))
-                case .Update(let value, let deletes, let inserts, let updates):
+                case .update(let value, let deletes, let inserts, let updates):
                     observer.onNext((value, RealmChangeset(deleted: deletes, inserted: inserts, updated: updates)))
-                case .Error(let error):
+                case .error(let error):
                     observer.onError(error)
                     return
                 }
@@ -148,7 +148,7 @@ public extension NotificationEmitter where Self: RealmCollection {
 public extension Realm {
 
     /**
-     Returns an `Observable<(Realm, Notification)>` that emits each time the Realm emits a notification.
+     Returns an `Observable<(Realm, Realm.Notification)>` that emits each time the Realm emits a notification.
 
      The Observable you will get emits a tuple made out of:
 
@@ -160,12 +160,12 @@ public extension Realm {
 
      - returns: `Observable<(Realm, Notification)>`, which you can subscribe to.
      */
-    public func asObservable() -> Observable<(Realm, RealmSwift.Notification)> {
+    public func asObservable() -> Observable<(Realm, Realm.Notification)> {
         return Observable.create {observer in
-            let token = self.addNotificationBlock {(notification: RealmSwift.Notification, realm: Realm) in
-                observer.onNext(realm, notification)
+            let token = self.addNotificationBlock {(notification: Realm.Notification, realm: Realm) in
+              observer.onNext((realm, notification))
             }
-            
+
             return Disposables.create {
                 observer.onCompleted()
                 token.stop()
@@ -182,10 +182,10 @@ public extension Realm {
      - param: update - if set to `true` it will override existing objects with matching primary key
      - returns: `AnyObserver<O>`, which you can use to subscribe an `Observable` to
      */
-    public static func rx_add<O: Sequence where O.Iterator.Element: Object>(
+    public static func rx_add<O: Sequence>(
         _ configuration: Realm.Configuration = Realm.Configuration.defaultConfiguration,
-        update: Bool = false) -> AnyObserver<O> {
-        
+        update: Bool = false) -> AnyObserver<O> where O.Iterator.Element: Object {
+
         return RealmObserver(configuration: configuration) {realm, elements in
             try! realm.write {
                 realm.add(elements, update: update)
@@ -216,7 +216,7 @@ public extension Realm {
      - param: update - if set to `true` it will override existing objects with matching primary key
      - returns: `AnyObserver<O>`, which you can use to subscribe an `Observable` to
      */
-    public func rx_add<O: Sequence where O.Iterator.Element: Object>(update: Bool = false) -> AnyObserver<O> {
+    public func rx_add<O: Sequence>(update: Bool = false) -> AnyObserver<O> where O.Iterator.Element: Object {
         return RealmObserver(realm: self) {realm, element in
             try! realm.write {
                 realm.add(element, update: update)
@@ -241,7 +241,7 @@ public extension Realm {
      Returns bindable sink wich deletes objects in sequence from Realm.
      - returns: `AnyObserver<O>`, which you can use to subscribe an `Observable` to
      */
-    public static func rx_delete<S: Sequence where S.Iterator.Element: Object>() -> AnyObserver<S> {
+    public static func rx_delete<S: Sequence>() -> AnyObserver<S> where S.Iterator.Element: Object {
         return AnyObserver {event in
 
             guard let elements = event.element,
@@ -280,7 +280,7 @@ public extension Realm {
      Returns bindable sink wich deletes objects in sequence from Realm.
      - returns: `AnyObserver<O>`, which you can use to subscribe an `Observable` to
      */
-    public func rx_delete<S: Sequence where S.Iterator.Element: Object>() -> AnyObserver<S> {
+    public func rx_delete<S: Sequence>() -> AnyObserver<S> where S.Iterator.Element: Object {
         return RealmObserver(realm: self, binding: { (realm, elements) in
             try! realm.write {
                 realm.delete(elements)

RxRealm.xcodeproj/project.pbxproj

@@ -412,6 +412,7 @@
 				PRODUCT_NAME = RxRealm;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -438,6 +439,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};