Skip to content

Commit 343ad4c

Browse files
authored
Merge pull request #202 from arshiacont/bugfix/xcode15
Fix Observable namespace for Swift5.9/XCode15 conflict
2 parents 117bf24 + 7404c7a commit 343ad4c

File tree

5 files changed

+52
-78
lines changed

5 files changed

+52
-78
lines changed

RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm iOS.xcscheme

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "EEE27013D976367AF376A874"
18-
BuildableName = "RxRealm iOS.framework"
18+
BuildableName = "RxRealm.framework"
1919
BlueprintName = "RxRealm iOS"
2020
ReferencedContainer = "container:RxRealm.xcodeproj">
2121
</BuildableReference>
@@ -40,9 +40,17 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
codeCoverageEnabled = "YES"
44-
onlyGenerateCoverageForSpecifiedTargets = "NO"
45-
shouldUseLaunchSchemeArgsEnv = "YES">
43+
shouldUseLaunchSchemeArgsEnv = "YES"
44+
codeCoverageEnabled = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "EEE27013D976367AF376A874"
49+
BuildableName = "RxRealm.framework"
50+
BlueprintName = "RxRealm iOS"
51+
ReferencedContainer = "container:RxRealm.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
4654
<Testables>
4755
<TestableReference
4856
skipped = "NO">
@@ -55,17 +63,6 @@
5563
</BuildableReference>
5664
</TestableReference>
5765
</Testables>
58-
<MacroExpansion>
59-
<BuildableReference
60-
BuildableIdentifier = "primary"
61-
BlueprintIdentifier = "EEE27013D976367AF376A874"
62-
BuildableName = "RxRealm iOS.framework"
63-
BlueprintName = "RxRealm iOS"
64-
ReferencedContainer = "container:RxRealm.xcodeproj">
65-
</BuildableReference>
66-
</MacroExpansion>
67-
<CommandLineArguments>
68-
</CommandLineArguments>
6966
</TestAction>
7067
<LaunchAction
7168
buildConfiguration = "Debug"
@@ -81,13 +78,11 @@
8178
<BuildableReference
8279
BuildableIdentifier = "primary"
8380
BlueprintIdentifier = "EEE27013D976367AF376A874"
84-
BuildableName = "RxRealm iOS.framework"
81+
BuildableName = "RxRealm.framework"
8582
BlueprintName = "RxRealm iOS"
8683
ReferencedContainer = "container:RxRealm.xcodeproj">
8784
</BuildableReference>
8885
</MacroExpansion>
89-
<CommandLineArguments>
90-
</CommandLineArguments>
9186
</LaunchAction>
9287
<ProfileAction
9388
buildConfiguration = "Release"
@@ -100,13 +95,11 @@
10095
<BuildableReference
10196
BuildableIdentifier = "primary"
10297
BlueprintIdentifier = "EEE27013D976367AF376A874"
103-
BuildableName = "RxRealm iOS.framework"
98+
BuildableName = "RxRealm.framework"
10499
BlueprintName = "RxRealm iOS"
105100
ReferencedContainer = "container:RxRealm.xcodeproj">
106101
</BuildableReference>
107102
</BuildableProductRunnable>
108-
<CommandLineArguments>
109-
</CommandLineArguments>
110103
</ProfileAction>
111104
<AnalyzeAction
112105
buildConfiguration = "Debug">

RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm macOS.xcscheme

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "563C797F5D0B85053BEECA0C"
18-
BuildableName = "RxRealm macOS.framework"
18+
BuildableName = "RxRealm.framework"
1919
BlueprintName = "RxRealm macOS"
2020
ReferencedContainer = "container:RxRealm.xcodeproj">
2121
</BuildableReference>
@@ -40,9 +40,17 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
codeCoverageEnabled = "YES"
44-
onlyGenerateCoverageForSpecifiedTargets = "NO"
45-
shouldUseLaunchSchemeArgsEnv = "YES">
43+
shouldUseLaunchSchemeArgsEnv = "YES"
44+
codeCoverageEnabled = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "563C797F5D0B85053BEECA0C"
49+
BuildableName = "RxRealm.framework"
50+
BlueprintName = "RxRealm macOS"
51+
ReferencedContainer = "container:RxRealm.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
4654
<Testables>
4755
<TestableReference
4856
skipped = "NO">
@@ -55,17 +63,6 @@
5563
</BuildableReference>
5664
</TestableReference>
5765
</Testables>
58-
<MacroExpansion>
59-
<BuildableReference
60-
BuildableIdentifier = "primary"
61-
BlueprintIdentifier = "563C797F5D0B85053BEECA0C"
62-
BuildableName = "RxRealm macOS.framework"
63-
BlueprintName = "RxRealm macOS"
64-
ReferencedContainer = "container:RxRealm.xcodeproj">
65-
</BuildableReference>
66-
</MacroExpansion>
67-
<CommandLineArguments>
68-
</CommandLineArguments>
6966
</TestAction>
7067
<LaunchAction
7168
buildConfiguration = "Debug"
@@ -81,13 +78,11 @@
8178
<BuildableReference
8279
BuildableIdentifier = "primary"
8380
BlueprintIdentifier = "563C797F5D0B85053BEECA0C"
84-
BuildableName = "RxRealm macOS.framework"
81+
BuildableName = "RxRealm.framework"
8582
BlueprintName = "RxRealm macOS"
8683
ReferencedContainer = "container:RxRealm.xcodeproj">
8784
</BuildableReference>
8885
</MacroExpansion>
89-
<CommandLineArguments>
90-
</CommandLineArguments>
9186
</LaunchAction>
9287
<ProfileAction
9388
buildConfiguration = "Release"
@@ -100,13 +95,11 @@
10095
<BuildableReference
10196
BuildableIdentifier = "primary"
10297
BlueprintIdentifier = "563C797F5D0B85053BEECA0C"
103-
BuildableName = "RxRealm macOS.framework"
98+
BuildableName = "RxRealm.framework"
10499
BlueprintName = "RxRealm macOS"
105100
ReferencedContainer = "container:RxRealm.xcodeproj">
106101
</BuildableReference>
107102
</BuildableProductRunnable>
108-
<CommandLineArguments>
109-
</CommandLineArguments>
110103
</ProfileAction>
111104
<AnalyzeAction
112105
buildConfiguration = "Debug">

RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm tvOS.xcscheme

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "26B52508DC9867614B34B3C5"
18-
BuildableName = "RxRealm tvOS.framework"
18+
BuildableName = "RxRealm.framework"
1919
BlueprintName = "RxRealm tvOS"
2020
ReferencedContainer = "container:RxRealm.xcodeproj">
2121
</BuildableReference>
@@ -40,9 +40,17 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
codeCoverageEnabled = "YES"
44-
onlyGenerateCoverageForSpecifiedTargets = "NO"
45-
shouldUseLaunchSchemeArgsEnv = "YES">
43+
shouldUseLaunchSchemeArgsEnv = "YES"
44+
codeCoverageEnabled = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "26B52508DC9867614B34B3C5"
49+
BuildableName = "RxRealm.framework"
50+
BlueprintName = "RxRealm tvOS"
51+
ReferencedContainer = "container:RxRealm.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
4654
<Testables>
4755
<TestableReference
4856
skipped = "NO">
@@ -55,17 +63,6 @@
5563
</BuildableReference>
5664
</TestableReference>
5765
</Testables>
58-
<MacroExpansion>
59-
<BuildableReference
60-
BuildableIdentifier = "primary"
61-
BlueprintIdentifier = "26B52508DC9867614B34B3C5"
62-
BuildableName = "RxRealm tvOS.framework"
63-
BlueprintName = "RxRealm tvOS"
64-
ReferencedContainer = "container:RxRealm.xcodeproj">
65-
</BuildableReference>
66-
</MacroExpansion>
67-
<CommandLineArguments>
68-
</CommandLineArguments>
6966
</TestAction>
7067
<LaunchAction
7168
buildConfiguration = "Debug"
@@ -81,13 +78,11 @@
8178
<BuildableReference
8279
BuildableIdentifier = "primary"
8380
BlueprintIdentifier = "26B52508DC9867614B34B3C5"
84-
BuildableName = "RxRealm tvOS.framework"
81+
BuildableName = "RxRealm.framework"
8582
BlueprintName = "RxRealm tvOS"
8683
ReferencedContainer = "container:RxRealm.xcodeproj">
8784
</BuildableReference>
8885
</MacroExpansion>
89-
<CommandLineArguments>
90-
</CommandLineArguments>
9186
</LaunchAction>
9287
<ProfileAction
9388
buildConfiguration = "Release"
@@ -100,13 +95,11 @@
10095
<BuildableReference
10196
BuildableIdentifier = "primary"
10297
BlueprintIdentifier = "26B52508DC9867614B34B3C5"
103-
BuildableName = "RxRealm tvOS.framework"
98+
BuildableName = "RxRealm.framework"
10499
BlueprintName = "RxRealm tvOS"
105100
ReferencedContainer = "container:RxRealm.xcodeproj">
106101
</BuildableReference>
107102
</BuildableProductRunnable>
108-
<CommandLineArguments>
109-
</CommandLineArguments>
110103
</ProfileAction>
111104
<AnalyzeAction
112105
buildConfiguration = "Debug">

RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm watchOS.xcscheme

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "E4ACD8160538E2144FA53C11"
18-
BuildableName = "RxRealm watchOS.framework"
18+
BuildableName = "RxRealm.framework"
1919
BlueprintName = "RxRealm watchOS"
2020
ReferencedContainer = "container:RxRealm.xcodeproj">
2121
</BuildableReference>
@@ -26,19 +26,18 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
onlyGenerateCoverageForSpecifiedTargets = "NO"
3029
shouldUseLaunchSchemeArgsEnv = "YES">
31-
<Testables>
32-
</Testables>
3330
<MacroExpansion>
3431
<BuildableReference
3532
BuildableIdentifier = "primary"
3633
BlueprintIdentifier = "E4ACD8160538E2144FA53C11"
37-
BuildableName = "RxRealm watchOS.framework"
34+
BuildableName = "RxRealm.framework"
3835
BlueprintName = "RxRealm watchOS"
3936
ReferencedContainer = "container:RxRealm.xcodeproj">
4037
</BuildableReference>
4138
</MacroExpansion>
39+
<Testables>
40+
</Testables>
4241
</TestAction>
4342
<LaunchAction
4443
buildConfiguration = "Debug"
@@ -54,13 +53,11 @@
5453
<BuildableReference
5554
BuildableIdentifier = "primary"
5655
BlueprintIdentifier = "E4ACD8160538E2144FA53C11"
57-
BuildableName = "RxRealm watchOS.framework"
56+
BuildableName = "RxRealm.framework"
5857
BlueprintName = "RxRealm watchOS"
5958
ReferencedContainer = "container:RxRealm.xcodeproj">
6059
</BuildableReference>
6160
</MacroExpansion>
62-
<CommandLineArguments>
63-
</CommandLineArguments>
6461
</LaunchAction>
6562
<ProfileAction
6663
buildConfiguration = "Release"
@@ -73,13 +70,11 @@
7370
<BuildableReference
7471
BuildableIdentifier = "primary"
7572
BlueprintIdentifier = "E4ACD8160538E2144FA53C11"
76-
BuildableName = "RxRealm watchOS.framework"
73+
BuildableName = "RxRealm.framework"
7774
BlueprintName = "RxRealm watchOS"
7875
ReferencedContainer = "container:RxRealm.xcodeproj">
7976
</BuildableReference>
8077
</BuildableProductRunnable>
81-
<CommandLineArguments>
82-
</CommandLineArguments>
8378
</ProfileAction>
8479
<AnalyzeAction
8580
buildConfiguration = "Debug">

Sources/RxRealm/RxRealm.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ public extension Observable {
265265
- parameter realm: A Realm instance
266266
- returns: `Observable<(Realm, Realm.Notification)>`, which you can subscribe to
267267
*/
268-
static func from(realm: Realm) -> Observable<(Realm, Realm.Notification)> {
269-
return Observable<(Realm, Realm.Notification)>.create { observer in
268+
static func from(realm: Realm) -> RxSwift.Observable<(Realm, Realm.Notification)> {
269+
return RxSwift.Observable<(Realm, Realm.Notification)>.create { observer in
270270
let token = realm.observe { (notification: Realm.Notification, realm: Realm) in
271271
observer.onNext((realm, notification))
272272
}
@@ -512,7 +512,7 @@ public extension Observable where Element: Object {
512512

513513
static func from(object: Element, emitInitialValue: Bool = true,
514514
properties: [String]? = nil) -> Observable<Element> {
515-
return Observable<Element>.create { observer in
515+
return RxSwift.Observable<Element>.create { observer in
516516
if emitInitialValue {
517517
observer.onNext(object)
518518
}
@@ -546,7 +546,7 @@ public extension Observable where Element: Object {
546546
*/
547547

548548
static func propertyChanges(object: Element) -> Observable<PropertyChange> {
549-
return Observable<PropertyChange>.create { observer in
549+
return RxSwift.Observable<PropertyChange>.create { observer in
550550
let token = object.observe { change in
551551
switch change {
552552
case let .change(_, changes):

0 commit comments

Comments
 (0)