Remove #available and @available checks

ReactiveCocoa · Dec 20, 2022 · eb10eec · eb10eec
1 parent eb87f45
commit eb10eec
Show file tree

Hide file tree

Showing 7 changed files with 157 additions and 195 deletions.
diff --git a/Sources/Scheduler.swift b/Sources/Scheduler.swift
@@ -297,7 +297,7 @@ public final class UIScheduler: Scheduler {
 /// be equal.
 private final class DispatchSourceTimerWrapper: Hashable {
 	private let value: DispatchSourceTimer
-	
+
 	#if swift(>=4.1.50)
 	fileprivate func hash(into hasher: inout Hasher) {
 		hasher.combine(ObjectIdentifier(self))
@@ -307,11 +307,11 @@ private final class DispatchSourceTimerWrapper: Hashable {
 		return ObjectIdentifier(self).hashValue
 	}
 	#endif
-	
+
 	fileprivate init(_ value: DispatchSourceTimer) {
 		self.value = value
 	}
-	
+
 	fileprivate static func ==(lhs: DispatchSourceTimerWrapper, rhs: DispatchSourceTimerWrapper) -> Bool {
 		// Note that this isn't infinite recursion thanks to `===`.
 		return lhs === rhs
@@ -324,7 +324,7 @@ public final class QueueScheduler: DateScheduler {
 	/// queue.
 	///
 	/// - note: Unlike `UIScheduler`, this scheduler supports scheduling for a
-	///         future date, and will always schedule asynchronously (even if 
+	///         future date, and will always schedule asynchronously (even if
 	///         already running on the main thread).
 	public static let main = QueueScheduler(internalQueue: DispatchQueue.main)
 
@@ -333,9 +333,9 @@ public final class QueueScheduler: DateScheduler {
 	}
 
 	public let queue: DispatchQueue
-	
+
 	private var timers: Atomic<Set<DispatchSourceTimerWrapper>>
-	
+
 	internal init(internalQueue: DispatchQueue) {
 		queue = internalQueue
 		timers = Atomic(Set())
@@ -362,7 +362,6 @@ public final class QueueScheduler: DateScheduler {
 	///   - name: A name for the queue in the form of reverse domain.
 	///   - targeting: (Optional) The queue on which this scheduler's work is
 	///     targeted
-	@available(OSX 10.10, *)
 	public convenience init(
 		qos: DispatchQoS = .default,
 		name: String = "org.reactivecocoa.ReactiveSwift.QueueScheduler",
@@ -434,8 +433,8 @@ public final class QueueScheduler: DateScheduler {
 	///   - interval: A repetition interval.
 	///   - action: Closure of the action to repeat.
 	///
-	///	- note: If you plan to specify an `interval` value greater than 200,000 
-	///			seconds, use `schedule(after:interval:leeway:action)` instead 
+	///	- note: If you plan to specify an `interval` value greater than 200,000
+	///			seconds, use `schedule(after:interval:leeway:action)` instead
 	///			and specify your own `leeway` value to avoid potential overflow.
 	///
 	/// - returns: Optional disposable that can be used to cancel the work
@@ -485,14 +484,14 @@ public final class QueueScheduler: DateScheduler {
 		timer.resume()
 
 		let wrappedTimer = DispatchSourceTimerWrapper(timer)
-		
+
 		timers.modify { timers in
 			timers.insert(wrappedTimer)
 		}
 
 		return AnyDisposable { [weak self] in
 			timer.cancel()
-			
+
 			if let scheduler = self {
 				scheduler.timers.modify { timers in
 					timers.remove(wrappedTimer)

diff --git a/Tests/ReactiveSwiftTests/ActionSpec.swift b/Tests/ReactiveSwiftTests/ActionSpec.swift
@@ -186,24 +186,22 @@ class ActionSpec: QuickSpec {
 				action1.apply().start()
 			}
 
-			if #available(macOS 10.10, *) {
-				it("should not loop indefinitely") {
-					let condition = MutableProperty(1)
+			it("should not loop indefinitely") {
+				let condition = MutableProperty(1)
 
-					let action = Action<Void, Void, Never>(state: condition, enabledIf: { $0 == 0 }) { _, _ in
-						return .empty
-					}
+				let action = Action<Void, Void, Never>(state: condition, enabledIf: { $0 == 0 }) { _, _ in
+					return .empty
+				}
 
-					var count = 0
+				var count = 0
 
-					action.isExecuting.producer
-						.startWithValues { _ in
-							condition.value = 10
+				action.isExecuting.producer
+					.startWithValues { _ in
+						condition.value = 10
 
-							count += 1
-							expect(count) == 1
-						}
-				}
+						count += 1
+						expect(count) == 1
+					}
 			}
 
 			describe("completed") {

diff --git a/Tests/ReactiveSwiftTests/PropertySpec.swift b/Tests/ReactiveSwiftTests/PropertySpec.swift
@@ -272,13 +272,7 @@ class PropertySpec: QuickSpec {
 			}
 
 			it("should not deadlock") {
-				let queue: DispatchQueue
-
-				if #available(macOS 10.10, *) {
-					queue = DispatchQueue.global(qos: .userInteractive)
-				} else {
-					queue = DispatchQueue.global(priority: .high)
-				}
+				let queue = DispatchQueue.global(qos: .userInteractive)
 
 				let setup = DispatchGroup()
 				let workers = DispatchGroup()

diff --git a/Tests/ReactiveSwiftTests/QueueScheduler+Factory.swift b/Tests/ReactiveSwiftTests/QueueScheduler+Factory.swift
@@ -6,14 +6,6 @@ extension QueueScheduler {
 		let file = URL(string: file)?.lastPathComponent ?? "<unknown>"
 		let label = "reactiveswift:\(file):\(line)"
 
-		#if targetEnvironment(macCatalyst)
 		return QueueScheduler(name: label)
-		#else
-		if #available(OSX 10.10, iOS 8.0, *) {
-			return QueueScheduler(name: label)
-		} else {
-			return QueueScheduler()
-		}
-		#endif
 	}
 }
diff --git a/Tests/ReactiveSwiftTests/SchedulerSpec.swift b/Tests/ReactiveSwiftTests/SchedulerSpec.swift
@@ -42,12 +42,7 @@ class SchedulerSpec: QuickSpec {
 			func dispatchSyncInBackground(_ action: @escaping () -> Void) {
 				let group = DispatchGroup()
 
-				let globalQueue: DispatchQueue
-				if #available(*, OSX 10.10) {
-					globalQueue = DispatchQueue.global()
-				} else {
-					globalQueue = DispatchQueue.global(priority: .default)
-				}
+				let globalQueue = DispatchQueue.global()
 
 				globalQueue.async(group: group, execute: action)
 				group.wait()

diff --git a/Tests/ReactiveSwiftTests/SignalProducerSpec.swift b/Tests/ReactiveSwiftTests/SignalProducerSpec.swift
@@ -3088,12 +3088,7 @@ class SignalProducerSpec: QuickSpec {
 
 				let group = DispatchGroup()
 
-				let globalQueue: DispatchQueue
-				if #available(*, OSX 10.10) {
-					globalQueue = DispatchQueue.global()
-				} else {
-					globalQueue = DispatchQueue.global(priority: .default)
-				}
+				let globalQueue = DispatchQueue.global()
 
 				globalQueue.async(group: group, flags: []) {
 					result = producer.last()
@@ -3136,12 +3131,7 @@ class SignalProducerSpec: QuickSpec {
 
 				let group = DispatchGroup()
 
-				let globalQueue: DispatchQueue
-				if #available(*, OSX 10.10) {
-					globalQueue = DispatchQueue.global()
-				} else {
-					globalQueue = DispatchQueue.global(priority: .default)
-				}
+				let globalQueue = DispatchQueue.global()
 
 				globalQueue.async(group: group, flags: []) {
 					result = producer.wait()