Fix compilation for < Swift 6.2, add CI for Xcode 16 (#2688)

Author: freak4pc

.github/workflows/tests.yml

@@ -23,7 +23,23 @@ jobs:
         run: sudo xcode-select -s /Applications/Xcode_26.2.app
       - name: Run Tests
         run: CI=1 ./scripts/all-tests.sh "${{ matrix.environment }}"
-  
+
+  xcode16:
+    name: "Xcode 16"
+    runs-on: macos-15
+
+    strategy:
+      fail-fast: false
+      matrix:
+        environment: [iOS, iOS-Example, Unix, watchOS, tvOS, SPM]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Select Xcode 16
+        run: sudo xcode-select -s /Applications/Xcode_16.4.app
+      - name: Run Tests
+        run: CI=1 ./scripts/all-tests.sh "${{ matrix.environment }}"
+
   linux:
     name: "Build (Android)"
     runs-on: ubuntu-latest

.swiftformat

@@ -1,3 +1,5 @@
 --ifdef no-indent
 --wrap-arguments before-first
---exclude Sources/AllTestz/main.swift,RxTest/HotObservable.swift,Tests/RxSwiftTests/BagTest.swift
+--commas inline
+--doc-comments preserve
+--exclude Sources/AllTestz/main.swift,RxTest/HotObservable.swift,Tests/RxSwiftTests/BagTest.swift

Package.swift

@@ -34,7 +34,7 @@ extension Product {
         if targetsDarwin {
             [
                 .library(name: "RxCocoa", targets: ["RxCocoa"]),
-                .library(name: "RxCocoa-Dynamic", type: .dynamic, targets: ["RxCocoa"]),
+                .library(name: "RxCocoa-Dynamic", type: .dynamic, targets: ["RxCocoa"])
             ]
         } else {
             []
@@ -47,7 +47,7 @@ extension Target {
         .target(
             name: name,
             dependencies: dependencies,
-            resources: [.copy("PrivacyInfo.xcprivacy")],
+            resources: [.copy("PrivacyInfo.xcprivacy")]
         )
     }
 }
@@ -63,10 +63,10 @@ extension Target {
                     dependencies: [
                         "RxSwift",
                         "RxRelay",
-                        .target(name: "RxCocoaRuntime", condition: .when(platforms: [.iOS, .macOS, .tvOS, .watchOS])),
+                        .target(name: "RxCocoaRuntime", condition: .when(platforms: [.iOS, .macOS, .tvOS, .watchOS]))
                     ],
-                    resources: [.copy("PrivacyInfo.xcprivacy")],
-                ),
+                    resources: [.copy("PrivacyInfo.xcprivacy")]
+                )
             ]
         }
     }
@@ -79,8 +79,8 @@ extension Target {
                 .target(
                     name: "RxCocoaRuntime",
                     dependencies: ["RxSwift"],
-                    resources: [.copy("PrivacyInfo.xcprivacy")],
-                ),
+                    resources: [.copy("PrivacyInfo.xcprivacy")]
+                )
             ]
         }
     }
@@ -106,23 +106,23 @@ let package = Package(
             .library(name: "RxSwift-Dynamic", type: .dynamic, targets: ["RxSwift"]),
             .library(name: "RxRelay-Dynamic", type: .dynamic, targets: ["RxRelay"]),
             .library(name: "RxBlocking-Dynamic", type: .dynamic, targets: ["RxBlocking"]),
-            .library(name: "RxTest-Dynamic", type: .dynamic, targets: ["RxTest"]),
+            .library(name: "RxTest-Dynamic", type: .dynamic, targets: ["RxTest"])
         ],
         Product.rxCocoaProducts(),
-        Product.allTests(),
+        Product.allTests()
     ] as [[Product]]).flatMap(\.self),
     targets: ([
         [
-            .rxTarget(name: "RxSwift", dependencies: []),
+            .rxTarget(name: "RxSwift", dependencies: [])
         ],
         Target.rxCocoa(),
         Target.rxCocoaRuntime(),
         [
             .rxTarget(name: "RxRelay", dependencies: ["RxSwift"]),
             .target(name: "RxBlocking", dependencies: ["RxSwift"]),
-            .target(name: "RxTest", dependencies: ["RxSwift"]),
+            .target(name: "RxTest", dependencies: ["RxSwift"])
         ],
-        Target.allTests(),
+        Target.allTests()
     ] as [[Target]]).flatMap(\.self),
-    swiftLanguageVersions: [.v5],
+    swiftLanguageVersions: [.v5]
 )

[email protected]

@@ -34,7 +34,7 @@ extension Product {
         if targetsDarwin {
             [
                 .library(name: "RxCocoa", targets: ["RxCocoa"]),
-                .library(name: "RxCocoa-Dynamic", type: .dynamic, targets: ["RxCocoa"]),
+                .library(name: "RxCocoa-Dynamic", type: .dynamic, targets: ["RxCocoa"])
             ]
         } else {
             []
@@ -63,10 +63,10 @@ extension Target {
                     dependencies: [
                         "RxSwift",
                         "RxRelay",
-                        .target(name: "RxCocoaRuntime", condition: .when(platforms: [.iOS, .macOS, .tvOS, .watchOS, .visionOS])),
+                        .target(name: "RxCocoaRuntime", condition: .when(platforms: [.iOS, .macOS, .tvOS, .watchOS, .visionOS]))
                     ],
                     resources: [.copy("PrivacyInfo.xcprivacy")]
-                ),
+                )
             ]
         }
     }
@@ -80,7 +80,7 @@ extension Target {
                     name: "RxCocoaRuntime",
                     dependencies: ["RxSwift"],
                     resources: [.copy("PrivacyInfo.xcprivacy")]
-                ),
+                )
             ]
         }
     }
@@ -106,23 +106,23 @@ let package = Package(
             .library(name: "RxSwift-Dynamic", type: .dynamic, targets: ["RxSwift"]),
             .library(name: "RxRelay-Dynamic", type: .dynamic, targets: ["RxRelay"]),
             .library(name: "RxBlocking-Dynamic", type: .dynamic, targets: ["RxBlocking"]),
-            .library(name: "RxTest-Dynamic", type: .dynamic, targets: ["RxTest"]),
+            .library(name: "RxTest-Dynamic", type: .dynamic, targets: ["RxTest"])
         ],
         Product.rxCocoaProducts(),
-        Product.allTests(),
+        Product.allTests()
     ] as [[Product]]).flatMap(\.self),
     targets: ([
         [
-            .rxTarget(name: "RxSwift", dependencies: []),
+            .rxTarget(name: "RxSwift", dependencies: [])
         ],
         Target.rxCocoa(),
         Target.rxCocoaRuntime(),
         [
             .rxTarget(name: "RxRelay", dependencies: ["RxSwift"]),
             .target(name: "RxBlocking", dependencies: ["RxSwift"]),
-            .target(name: "RxTest", dependencies: ["RxSwift"]),
+            .target(name: "RxTest", dependencies: ["RxSwift"])
         ],
-        Target.allTests(),
+        Target.allTests()
     ] as [[Target]]).flatMap(\.self),
     swiftLanguageVersions: [.v5]
 )

Rx.playground/Pages/Creating_and_Subscribing_to_Observables.xcplaygroundpage/Contents.swift

@@ -156,7 +156,7 @@ example("generate") {
     Observable.generate(
         initialState: 0,
         condition: { $0 < 3 },
-        iterate: { $0 + 1 },
+        iterate: { $0 + 1 }
     )
     .subscribe(onNext: { print($0) })
     .disposed(by: disposeBag)

Rx.playground/Pages/Filtering_and_Conditional_Operators.xcplaygroundpage/Contents.swift

@@ -22,7 +22,7 @@ example("filter") {
     Observable.of(
         "🐱", "🐰", "🐶",
         "🐸", "🐱", "🐰",
-        "🐹", "🐸", "🐱",
+        "🐹", "🐸", "🐱"
     )
     .filter {
         $0 == "🐱"

RxCocoa/Common/DelegateProxy.swift

@@ -263,7 +263,11 @@ private final class MessageDispatcher {
     fileprivate let selector: Selector
 
     init(selector: Selector, delegateProxy _delegateProxy: DelegateProxy<some Any, some Any>) {
+        #if swift(>=6.2)
         weak let weakDelegateProxy = _delegateProxy
+        #else
+        weak var weakDelegateProxy = _delegateProxy
+        #endif
 
         let dispatcher = PublishSubject<[Any]>()
         self.dispatcher = dispatcher

RxCocoa/Common/DelegateProxyType.swift

@@ -209,7 +209,11 @@ public extension DelegateProxyType {
     /// - parameter onProxyForObject: Object that has `delegate` property.
     /// - returns: Disposable object that can be used to clear forward delegate.
     static func installForwardDelegate(_ forwardDelegate: Delegate, retainDelegate: Bool, onProxyForObject object: ParentObject) -> Disposable {
+        #if swift(>=6.2)
         weak let weakForwardDelegate: AnyObject? = forwardDelegate as AnyObject
+        #else
+        weak var weakForwardDelegate: AnyObject? = forwardDelegate as AnyObject
+        #endif
         let proxy = proxy(for: object)
 
         assert(
@@ -218,7 +222,7 @@ public extension DelegateProxyType {
                 "If you are ok with this, try to set delegate (data source) to `nil` in front of this operation.\n" +
                 " This is the source object value: \(object)\n" +
                 " This is the original delegate (data source) value: \(proxy.forwardToDelegate()!)\n" +
-                "Hint: Maybe delegate was already set in xib or storyboard and now it's being overwritten in code.\n",
+                "Hint: Maybe delegate was already set in xib or storyboard and now it's being overwritten in code.\n"
         )
 
         proxy.setForwardToDelegate(forwardDelegate, retainDelegate: retainDelegate)

RxCocoa/Common/Observable+Bind.swift

@@ -75,7 +75,7 @@ public extension ObservableType {
      */
     func bind<Object: AnyObject>(
         with object: Object,
-        onNext: @escaping (Object, Element) -> Void,
+        onNext: @escaping (Object, Element) -> Void
     ) -> Disposable {
         subscribe(
             onNext: { [weak object] in
@@ -84,7 +84,7 @@ public extension ObservableType {
             },
             onError: { error in
                 rxFatalErrorInDebug("Binding error: \(error)")
-            },
+            }
         )
     }
 
@@ -101,7 +101,7 @@ public extension ObservableType {
             onNext: onNext,
             onError: { error in
                 rxFatalErrorInDebug("Binding error: \(error)")
-            },
+            }
         )
     }
 }

RxCocoa/Foundation/NSObject+Rx.swift

@@ -65,7 +65,7 @@ public extension Reactive where Base: NSObject {
         _: Element.Type,
         _ keyPath: String,
         options: KeyValueObservingOptions = [.new, .initial],
-        retainSelf: Bool = true,
+        retainSelf: Bool = true
     ) -> Observable<Element?> {
         KVOObservable(object: base, keyPath: keyPath, options: options, retainTarget: retainSelf).asObservable()
     }
@@ -82,7 +82,7 @@ public extension Reactive where Base: NSObject {
      */
     func observe<Element>(
         _ keyPath: KeyPath<Base, Element>,
-        options: NSKeyValueObservingOptions = [.new, .initial],
+        options: NSKeyValueObservingOptions = [.new, .initial]
     ) -> Observable<Element> {
         Observable<Element>.create { [weak base] observer in
             let observation = base?.observe(keyPath, options: options) { obj, _ in
@@ -237,7 +237,7 @@ public extension Reactive where Base: AnyObject {
                 base,
                 selectorReference,
                 subject,
-                .OBJC_ASSOCIATION_RETAIN_NONATOMIC,
+                .OBJC_ASSOCIATION_RETAIN_NONATOMIC
             )
         }
 
@@ -475,9 +475,13 @@ private extension ObservableType where Element == AnyObject? {
 private func observeWeaklyKeyPathFor(
     _ target: NSObject,
     keyPathSections: [String],
-    options: KeyValueObservingOptions,
+    options: KeyValueObservingOptions
 ) -> Observable<AnyObject?> {
+    #if swift(>=6.2)
     weak let weakTarget: AnyObject? = target
+    #else
+    weak var weakTarget: AnyObject? = target
+    #endif
 
     let propertyName = keyPathSections[0]
     let remainingPaths = Array(keyPathSections[1 ..< keyPathSections.count])