From 8eb85e8dfed93801c5e0047a72713da85c5c394e Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Mon, 19 May 2025 13:05:18 -0400 Subject: [PATCH 1/3] [Sessions] Remove Swift 5.9 guard statements --- .../Sources/SessionInitiator.swift | 36 ++----------------- .../Tests/Unit/Mocks/MockSubscriber.swift | 1 + 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/FirebaseSessions/Sources/SessionInitiator.swift b/FirebaseSessions/Sources/SessionInitiator.swift index 4a58fa9cea8..745f8e969c5 100644 --- a/FirebaseSessions/Sources/SessionInitiator.swift +++ b/FirebaseSessions/Sources/SessionInitiator.swift @@ -13,7 +13,7 @@ // limitations under the License. import Foundation -#if os(iOS) || os(tvOS) +#if os(iOS) || os(tvOS) || os(visionOS) import UIKit #elseif os(macOS) import AppKit @@ -22,17 +22,6 @@ import Foundation import WatchKit #endif // os(iOS) || os(tvOS) -// swift(>=5.9) implies Xcode 15+ -// Need to have this Swift version check to use os(visionOS) macro, VisionOS support. -// TODO: Remove this check and add `os(visionOS)` to the `os(iOS) || os(tvOS)` conditional above -// when Xcode 15 is the minimum supported by Firebase. -#if swift(>=5.9) - #if os(visionOS) - import UIKit - #endif // os(visionOS) -#endif // swift(>=5.9) - -/// /// The SessionInitiator is responsible for: /// 1) Running the initiate callback whenever a Session Start Event should /// begin sending. This can happen at a cold start of the app, and when it @@ -55,7 +44,7 @@ class SessionInitiator { self.initiateSessionStart() let notificationCenter = NotificationCenter.default - #if os(iOS) || os(tvOS) + #if os(iOS) || os(tvOS) || os(visionOS) notificationCenter.addObserver( self, selector: #selector(appBackgrounded), @@ -98,27 +87,6 @@ class SessionInitiator { ) } #endif // os(iOS) || os(tvOS) - - // swift(>=5.9) implies Xcode 15+ - // Need to have this Swift version check to use os(visionOS) macro, VisionOS support. - // TODO: Remove this check and add `os(visionOS)` to the `os(iOS) || os(tvOS)` conditional above - // when Xcode 15 is the minimum supported by Firebase. - #if swift(>=5.9) - #if os(visionOS) - notificationCenter.addObserver( - self, - selector: #selector(appBackgrounded), - name: UIApplication.didEnterBackgroundNotification, - object: nil - ) - notificationCenter.addObserver( - self, - selector: #selector(appForegrounded), - name: UIApplication.didBecomeActiveNotification, - object: nil - ) - #endif // os(visionOS) - #endif // swift(>=5.9) } @objc private func appBackgrounded() { diff --git a/FirebaseSessions/Tests/Unit/Mocks/MockSubscriber.swift b/FirebaseSessions/Tests/Unit/Mocks/MockSubscriber.swift index 2f3845e70bc..47aadb9b7cf 100644 --- a/FirebaseSessions/Tests/Unit/Mocks/MockSubscriber.swift +++ b/FirebaseSessions/Tests/Unit/Mocks/MockSubscriber.swift @@ -32,6 +32,7 @@ final class MockSubscriber: SessionsSubscriber, Sendable { private let _sessionThatChanged = FIRAllocatedUnfairLock( initialState: nil + initialState: nil ) private let _isDataCollectionEnabled = FIRAllocatedUnfairLock(initialState: true) From 68782699dc437f7a43fcdee808e433c577f8faad Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Mon, 19 May 2025 13:20:53 -0400 Subject: [PATCH 2/3] style --- FirebaseSessions/Tests/Unit/Mocks/MockSubscriber.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/FirebaseSessions/Tests/Unit/Mocks/MockSubscriber.swift b/FirebaseSessions/Tests/Unit/Mocks/MockSubscriber.swift index 47aadb9b7cf..869e58233a5 100644 --- a/FirebaseSessions/Tests/Unit/Mocks/MockSubscriber.swift +++ b/FirebaseSessions/Tests/Unit/Mocks/MockSubscriber.swift @@ -31,8 +31,7 @@ final class MockSubscriber: SessionsSubscriber, Sendable { } private let _sessionThatChanged = FIRAllocatedUnfairLock( - initialState: nil - initialState: nil + initialState: nil initialState: nil ) private let _isDataCollectionEnabled = FIRAllocatedUnfairLock(initialState: true) From 85e2637ba7b51de73790fb998c63e0407493362e Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Mon, 19 May 2025 13:22:34 -0400 Subject: [PATCH 3/3] fix --- FirebaseSessions/Tests/Unit/Mocks/MockSubscriber.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirebaseSessions/Tests/Unit/Mocks/MockSubscriber.swift b/FirebaseSessions/Tests/Unit/Mocks/MockSubscriber.swift index 869e58233a5..2f3845e70bc 100644 --- a/FirebaseSessions/Tests/Unit/Mocks/MockSubscriber.swift +++ b/FirebaseSessions/Tests/Unit/Mocks/MockSubscriber.swift @@ -31,7 +31,7 @@ final class MockSubscriber: SessionsSubscriber, Sendable { } private let _sessionThatChanged = FIRAllocatedUnfairLock( - initialState: nil initialState: nil + initialState: nil ) private let _isDataCollectionEnabled = FIRAllocatedUnfairLock(initialState: true)