Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Observable namespace for Swift5.9/XCode15 conflict #202

Merged
merged 5 commits into from
Oct 29, 2023
Merged

Fix Observable namespace for Swift5.9/XCode15 conflict #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec4ac63
Fix Observable namespace for Swift5.9/XCode15 conflict
arshiacont Sep 22, 2023
ef051cb
Update Cocoapod dependency
arshiacont Oct 10, 2023
593b851
Update xcschemes
arshiacont Oct 11, 2023
e03e3ce
Update Cocoapod dependency (fixes ActiveSupport crash on CI)
arshiacont Oct 26, 2023
7404c7a
Merge pull request #1 from RxSwiftCommunity/main
arshiacont Oct 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 14 additions & 21 deletions RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "EEE27013D976367AF376A874"
BuildableName = "RxRealm iOS.framework"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm iOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
Expand All @@ -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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "EEE27013D976367AF376A874"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm iOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -55,17 +63,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "EEE27013D976367AF376A874"
BuildableName = "RxRealm iOS.framework"
BlueprintName = "RxRealm iOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CommandLineArguments>
</CommandLineArguments>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -81,13 +78,11 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "EEE27013D976367AF376A874"
BuildableName = "RxRealm iOS.framework"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm iOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CommandLineArguments>
</CommandLineArguments>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand All @@ -100,13 +95,11 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "EEE27013D976367AF376A874"
BuildableName = "RxRealm iOS.framework"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm iOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
</CommandLineArguments>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
Expand Down
35 changes: 14 additions & 21 deletions RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm macOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "563C797F5D0B85053BEECA0C"
BuildableName = "RxRealm macOS.framework"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm macOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
Expand All @@ -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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "563C797F5D0B85053BEECA0C"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm macOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -55,17 +63,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "563C797F5D0B85053BEECA0C"
BuildableName = "RxRealm macOS.framework"
BlueprintName = "RxRealm macOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CommandLineArguments>
</CommandLineArguments>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -81,13 +78,11 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "563C797F5D0B85053BEECA0C"
BuildableName = "RxRealm macOS.framework"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm macOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CommandLineArguments>
</CommandLineArguments>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand All @@ -100,13 +95,11 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "563C797F5D0B85053BEECA0C"
BuildableName = "RxRealm macOS.framework"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm macOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
</CommandLineArguments>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
Expand Down
35 changes: 14 additions & 21 deletions RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm tvOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "26B52508DC9867614B34B3C5"
BuildableName = "RxRealm tvOS.framework"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm tvOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
Expand All @@ -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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "26B52508DC9867614B34B3C5"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm tvOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -55,17 +63,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "26B52508DC9867614B34B3C5"
BuildableName = "RxRealm tvOS.framework"
BlueprintName = "RxRealm tvOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CommandLineArguments>
</CommandLineArguments>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -81,13 +78,11 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "26B52508DC9867614B34B3C5"
BuildableName = "RxRealm tvOS.framework"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm tvOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CommandLineArguments>
</CommandLineArguments>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand All @@ -100,13 +95,11 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "26B52508DC9867614B34B3C5"
BuildableName = "RxRealm tvOS.framework"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm tvOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
</CommandLineArguments>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
Expand Down
17 changes: 6 additions & 11 deletions RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm watchOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4ACD8160538E2144FA53C11"
BuildableName = "RxRealm watchOS.framework"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm watchOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
Expand All @@ -26,19 +26,18 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
onlyGenerateCoverageForSpecifiedTargets = "NO"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4ACD8160538E2144FA53C11"
BuildableName = "RxRealm watchOS.framework"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm watchOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -54,13 +53,11 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4ACD8160538E2144FA53C11"
BuildableName = "RxRealm watchOS.framework"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm watchOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CommandLineArguments>
</CommandLineArguments>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand All @@ -73,13 +70,11 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4ACD8160538E2144FA53C11"
BuildableName = "RxRealm watchOS.framework"
BuildableName = "RxRealm.framework"
BlueprintName = "RxRealm watchOS"
ReferencedContainer = "container:RxRealm.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
</CommandLineArguments>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
Expand Down
8 changes: 4 additions & 4 deletions Sources/RxRealm/RxRealm.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down Expand Up @@ -512,7 +512,7 @@ public extension Observable where Element: Object {

static func from(object: Element, emitInitialValue: Bool = true,
properties: [String]? = nil) -> Observable<Element> {
return Observable<Element>.create { observer in
return RxSwift.Observable<Element>.create { observer in
if emitInitialValue {
observer.onNext(object)
}
Expand Down Expand Up @@ -546,7 +546,7 @@ public extension Observable where Element: Object {
*/

static func propertyChanges(object: Element) -> Observable<PropertyChange> {
return Observable<PropertyChange>.create { observer in
return RxSwift.Observable<PropertyChange>.create { observer in
let token = object.observe { change in
switch change {
case let .change(_, changes):
Expand Down
Loading