diff --git a/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm iOS.xcscheme b/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm iOS.xcscheme index 7aa083c..043e377 100644 --- a/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm iOS.xcscheme +++ b/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm iOS.xcscheme @@ -15,7 +15,7 @@ @@ -40,9 +40,17 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - codeCoverageEnabled = "YES" - onlyGenerateCoverageForSpecifiedTargets = "NO" - shouldUseLaunchSchemeArgsEnv = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES" + codeCoverageEnabled = "YES"> + + + + @@ -55,17 +63,6 @@ - - - - - - - - - - diff --git a/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm macOS.xcscheme b/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm macOS.xcscheme index 89c2d53..05b7ed5 100644 --- a/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm macOS.xcscheme +++ b/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm macOS.xcscheme @@ -15,7 +15,7 @@ @@ -40,9 +40,17 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - codeCoverageEnabled = "YES" - onlyGenerateCoverageForSpecifiedTargets = "NO" - shouldUseLaunchSchemeArgsEnv = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES" + codeCoverageEnabled = "YES"> + + + + @@ -55,17 +63,6 @@ - - - - - - - - - - diff --git a/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm tvOS.xcscheme b/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm tvOS.xcscheme index 175e1f8..aac990c 100644 --- a/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm tvOS.xcscheme +++ b/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm tvOS.xcscheme @@ -15,7 +15,7 @@ @@ -40,9 +40,17 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - codeCoverageEnabled = "YES" - onlyGenerateCoverageForSpecifiedTargets = "NO" - shouldUseLaunchSchemeArgsEnv = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES" + codeCoverageEnabled = "YES"> + + + + @@ -55,17 +63,6 @@ - - - - - - - - - - diff --git a/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm watchOS.xcscheme b/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm watchOS.xcscheme index d78f7d0..9528e3b 100644 --- a/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm watchOS.xcscheme +++ b/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm watchOS.xcscheme @@ -15,7 +15,7 @@ @@ -26,19 +26,18 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - onlyGenerateCoverageForSpecifiedTargets = "NO" shouldUseLaunchSchemeArgsEnv = "YES"> - - + + - - - - diff --git a/Sources/RxRealm/RxRealm.swift b/Sources/RxRealm/RxRealm.swift index a40affe..8dc2eae 100644 --- a/Sources/RxRealm/RxRealm.swift +++ b/Sources/RxRealm/RxRealm.swift @@ -265,8 +265,8 @@ public extension Observable { - parameter realm: A Realm instance - returns: `Observable<(Realm, Realm.Notification)>`, which you can subscribe to */ - static func from(realm: Realm) -> Observable<(Realm, Realm.Notification)> { - return Observable<(Realm, Realm.Notification)>.create { observer in + static func from(realm: Realm) -> RxSwift.Observable<(Realm, Realm.Notification)> { + return RxSwift.Observable<(Realm, Realm.Notification)>.create { observer in let token = realm.observe { (notification: Realm.Notification, realm: Realm) in observer.onNext((realm, notification)) } @@ -512,7 +512,7 @@ public extension Observable where Element: Object { static func from(object: Element, emitInitialValue: Bool = true, properties: [String]? = nil) -> Observable { - return Observable.create { observer in + return RxSwift.Observable.create { observer in if emitInitialValue { observer.onNext(object) } @@ -546,7 +546,7 @@ public extension Observable where Element: Object { */ static func propertyChanges(object: Element) -> Observable { - return Observable.create { observer in + return RxSwift.Observable.create { observer in let token = object.observe { change in switch change { case let .change(_, changes):