Merge pull request #202 from arshiacont/bugfix/xcode15

Fix Observable namespace for Swift5.9/XCode15 conflict
RxSwiftCommunity · Oct 29, 2023 · 343ad4c · 343ad4c
2 parents 117bf24 + 7404c7a
commit 343ad4c
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 78 deletions.
diff --git a/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm iOS.xcscheme b/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm iOS.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "EEE27013D976367AF376A874"
-               BuildableName = "RxRealm iOS.framework"
+               BuildableName = "RxRealm.framework"
                BlueprintName = "RxRealm iOS"
                ReferencedContainer = "container:RxRealm.xcodeproj">
             </BuildableReference>
@@ -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">
@@ -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"
@@ -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"
@@ -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">

diff --git a/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm macOS.xcscheme b/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm macOS.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "563C797F5D0B85053BEECA0C"
-               BuildableName = "RxRealm macOS.framework"
+               BuildableName = "RxRealm.framework"
                BlueprintName = "RxRealm macOS"
                ReferencedContainer = "container:RxRealm.xcodeproj">
             </BuildableReference>
@@ -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">
@@ -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"
@@ -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"
@@ -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">

diff --git a/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm tvOS.xcscheme b/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm tvOS.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "26B52508DC9867614B34B3C5"
-               BuildableName = "RxRealm tvOS.framework"
+               BuildableName = "RxRealm.framework"
                BlueprintName = "RxRealm tvOS"
                ReferencedContainer = "container:RxRealm.xcodeproj">
             </BuildableReference>
@@ -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">
@@ -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"
@@ -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"
@@ -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">

diff --git a/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm watchOS.xcscheme b/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm watchOS.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "E4ACD8160538E2144FA53C11"
-               BuildableName = "RxRealm watchOS.framework"
+               BuildableName = "RxRealm.framework"
                BlueprintName = "RxRealm watchOS"
                ReferencedContainer = "container:RxRealm.xcodeproj">
             </BuildableReference>
@@ -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"
@@ -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"
@@ -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">

diff --git 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<Element> {
-    return Observable<Element>.create { observer in
+    return RxSwift.Observable<Element>.create { observer in
       if emitInitialValue {
         observer.onNext(object)
       }
@@ -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):