From 17fbade9d674034f34d1096314e0ececd05d8077 Mon Sep 17 00:00:00 2001 From: Nate Mann Date: Mon, 14 Aug 2023 13:59:32 -0400 Subject: [PATCH] added RxSwfit namespace to Observable --- Package.resolved | 16 ++++----- .../xcschemes/RxRealm iOS.xcscheme | 35 ++++++++----------- .../xcschemes/RxRealm macOS.xcscheme | 35 ++++++++----------- .../xcschemes/RxRealm tvOS.xcscheme | 35 ++++++++----------- .../xcschemes/RxRealm watchOS.xcscheme | 17 ++++----- Sources/RxRealm/RxRealm.swift | 12 +++---- 6 files changed, 62 insertions(+), 88 deletions(-) diff --git a/Package.resolved b/Package.resolved index 8fb9fbc..6459420 100644 --- a/Package.resolved +++ b/Package.resolved @@ -2,21 +2,21 @@ "object": { "pins": [ { - "package": "Realm", - "repositoryURL": "https://github.com/realm/realm-cocoa.git", + "package": "RealmDatabase", + "repositoryURL": "https://github.com/realm/realm-core", "state": { "branch": null, - "revision": "39177714b95bb5b1b29fffe28f1c7da77eef8e8b", - "version": "10.21.1" + "revision": "c04f5e401a1ec682e6b08b1ee157e19a0f834a5f", + "version": "13.17.1" } }, { - "package": "RealmDatabase", - "repositoryURL": "https://github.com/realm/realm-core", + "package": "Realm", + "repositoryURL": "https://github.com/realm/realm-swift.git", "state": { "branch": null, - "revision": "f1976f0d96d9b06fbe0afbd60090b1c3966b1e23", - "version": "11.8.0" + "revision": "933abaa8076966e237e66497def74df84c6adbb4", + "version": "10.42.0" } }, { 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..4c0a272 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)) } @@ -511,8 +511,8 @@ public extension Observable where Element: Object { */ static func from(object: Element, emitInitialValue: Bool = true, - properties: [String]? = nil) -> Observable { - return Observable.create { observer in + properties: [String]? = nil) -> RxSwift.Observable { + return RxSwift.Observable.create { observer in if emitInitialValue { observer.onNext(object) } @@ -545,8 +545,8 @@ public extension Observable where Element: Object { - returns: `Observable` will emit any time a change is detected on the object */ - static func propertyChanges(object: Element) -> Observable { - return Observable.create { observer in + static func propertyChanges(object: Element) -> RxSwift.Observable { + return RxSwift.Observable.create { observer in let token = object.observe { change in switch change { case let .change(_, changes):