Skip to content

Commit f3fc99a

Browse files
authored
Bump Minimums OSes to suppress Xcode 14 warnings (#865)
This updates all deployment target minimums to the values supported by Xcode 14. It removes spurious warnings of the form: ``` The iOS Simulator deployment target 'IPHONEOS_DEPLOYMENT_TARGET' is set to 10.0, but the range of supported deployment target versions is 11.0 to 16.2.99. ```
1 parent 509916c commit f3fc99a

12 files changed

+30
-75
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# master
22
*Please add new entries at the top.*
33

4+
1. Bumped deployment target to iOS 11, tvOS 11, watchOS 4, macOS 10.13, per Xcode 14 warnings
5+
46
# 7.1.0
57
1. Add CI Release jobs on tag push (#862, kudos to @p4checo)
68
1. Fix some issues related to locking, bumped min OS versions to iOS 10, macOS 10.12, tvOS 10, watchOS 3 (#859, kudos to @mluisbrown)

Documentation/RxCheatsheet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Inspired by the [RxSwift to Combine cheatsheet](https://github.com/CombineCommun
77

88
| | RxSwift | ReactiveSwift |
99
|-----------------------|----------------------------------|--------------------------------------------|
10-
| Deployment Target | iOS 8.0+ | iOS 9.0+
10+
| Deployment Target | iOS 9.0+ | iOS 11.0+
1111
| Platforms supported | iOS, macOS, tvOS, watchOS, Linux | iOS, macOS, tvOS, watchOS, Linux
1212
| Spec | Reactive Extensions (ReactiveX) | Originally ReactiveX, with significant divergence
1313
| Framework Consumption | Third-party | Third-party

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import PackageDescription
44
let package = Package(
55
name: "ReactiveSwift",
66
platforms: [
7-
.macOS(.v10_12), .iOS(.v10), .tvOS(.v10), .watchOS(.v3)
7+
.macOS(.v10_13), .iOS(.v11), .tvOS(.v11), .watchOS(.v4)
88
],
99
products: [
1010
.library(name: "ReactiveSwift", targets: ["ReactiveSwift"]),

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ code and state to bridge the gap.
7373

7474
## Installation
7575

76-
ReactiveSwift supports macOS 10.9+, iOS 9.0+, watchOS 2.0+, tvOS 9.0+ and Linux.
76+
ReactiveSwift supports macOS 10.13+, iOS 11.0+, watchOS 4.0+, tvOS 11.0+ and Linux.
7777

7878
#### Carthage
7979

ReactiveSwift.podspec

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ Pod::Spec.new do |s|
1111
s.author = "ReactiveCocoa"
1212

1313
s.ios.deployment_target = "10.0"
14-
s.osx.deployment_target = "10.12"
15-
s.watchos.deployment_target = "3.0"
16-
s.tvos.deployment_target = "10.0"
14+
s.osx.deployment_target = "10.13"
15+
s.watchos.deployment_target = "4.0"
16+
s.tvos.deployment_target = "11.0"
17+
1718
s.source = { :git => "https://github.com/ReactiveCocoa/ReactiveSwift.git", :tag => "#{s.version}" }
1819
# Directory glob for all Swift files
1920
s.source_files = ["Sources/*.{swift}", "Sources/**/*.{swift}"]

Sources/Scheduler.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,6 @@ public final class QueueScheduler: DateScheduler {
362362
/// - name: A name for the queue in the form of reverse domain.
363363
/// - targeting: (Optional) The queue on which this scheduler's work is
364364
/// targeted
365-
@available(OSX 10.10, *)
366365
public convenience init(
367366
qos: DispatchQoS = .default,
368367
name: String = "org.reactivecocoa.ReactiveSwift.QueueScheduler",

Tests/ReactiveSwiftTests/ActionSpec.swift

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -186,24 +186,22 @@ class ActionSpec: QuickSpec {
186186
action1.apply().start()
187187
}
188188

189-
if #available(macOS 10.10, *) {
190-
it("should not loop indefinitely") {
191-
let condition = MutableProperty(1)
192-
193-
let action = Action<Void, Void, Never>(state: condition, enabledIf: { $0 == 0 }) { _, _ in
194-
return .empty
195-
}
196-
197-
var count = 0
198-
199-
action.isExecuting.producer
200-
.startWithValues { _ in
201-
condition.value = 10
202-
203-
count += 1
204-
expect(count) == 1
205-
}
189+
it("should not loop indefinitely") {
190+
let condition = MutableProperty(1)
191+
192+
let action = Action<Void, Void, Never>(state: condition, enabledIf: { $0 == 0 }) { _, _ in
193+
return .empty
206194
}
195+
196+
var count = 0
197+
198+
action.isExecuting.producer
199+
.startWithValues { _ in
200+
condition.value = 10
201+
202+
count += 1
203+
expect(count) == 1
204+
}
207205
}
208206

209207
describe("completed") {

Tests/ReactiveSwiftTests/PropertySpec.swift

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,7 @@ class PropertySpec: QuickSpec {
272272
}
273273

274274
it("should not deadlock") {
275-
let queue: DispatchQueue
276-
277-
if #available(macOS 10.10, *) {
278-
queue = DispatchQueue.global(qos: .userInteractive)
279-
} else {
280-
queue = DispatchQueue.global(priority: .high)
281-
}
282-
275+
let queue = DispatchQueue.global(qos: .userInteractive)
283276
let setup = DispatchGroup()
284277
let workers = DispatchGroup()
285278

Tests/ReactiveSwiftTests/QueueScheduler+Factory.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@ extension QueueScheduler {
66
let file = URL(string: file)?.lastPathComponent ?? "<unknown>"
77
let label = "reactiveswift:\(file):\(line)"
88

9-
#if targetEnvironment(macCatalyst)
109
return QueueScheduler(name: label)
11-
#else
12-
if #available(OSX 10.10, iOS 8.0, *) {
13-
return QueueScheduler(name: label)
14-
} else {
15-
return QueueScheduler()
16-
}
17-
#endif
1810
}
1911
}

Tests/ReactiveSwiftTests/SchedulerSpec.swift

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,7 @@ class SchedulerSpec: QuickSpec {
4141
describe("UIScheduler") {
4242
func dispatchSyncInBackground(_ action: @escaping () -> Void) {
4343
let group = DispatchGroup()
44-
45-
let globalQueue: DispatchQueue
46-
if #available(*, OSX 10.10) {
47-
globalQueue = DispatchQueue.global()
48-
} else {
49-
globalQueue = DispatchQueue.global(priority: .default)
50-
}
44+
let globalQueue = DispatchQueue.global()
5145

5246
globalQueue.async(group: group, execute: action)
5347
group.wait()

Tests/ReactiveSwiftTests/SignalProducerSpec.swift

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3087,13 +3087,7 @@ class SignalProducerSpec: QuickSpec {
30873087
var result: Result<Int, Never>?
30883088

30893089
let group = DispatchGroup()
3090-
3091-
let globalQueue: DispatchQueue
3092-
if #available(*, OSX 10.10) {
3093-
globalQueue = DispatchQueue.global()
3094-
} else {
3095-
globalQueue = DispatchQueue.global(priority: .default)
3096-
}
3090+
let globalQueue = DispatchQueue.global()
30973091

30983092
globalQueue.async(group: group, flags: []) {
30993093
result = producer.last()
@@ -3135,13 +3129,7 @@ class SignalProducerSpec: QuickSpec {
31353129
var result: Result<(), Never>?
31363130

31373131
let group = DispatchGroup()
3138-
3139-
let globalQueue: DispatchQueue
3140-
if #available(*, OSX 10.10) {
3141-
globalQueue = DispatchQueue.global()
3142-
} else {
3143-
globalQueue = DispatchQueue.global(priority: .default)
3144-
}
3132+
let globalQueue = DispatchQueue.global()
31453133

31463134
globalQueue.async(group: group, flags: []) {
31473135
result = producer.wait()

Tests/ReactiveSwiftTests/SignalSpec.swift

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -314,13 +314,7 @@ class SignalSpec: QuickSpec {
314314

315315
describe("interruption") {
316316
it("should not send events after sending an interrupted event") {
317-
let queue: DispatchQueue
318-
319-
if #available(macOS 10.10, *) {
320-
queue = DispatchQueue.global(qos: .userInitiated)
321-
} else {
322-
queue = DispatchQueue.global(priority: .high)
323-
}
317+
let queue = DispatchQueue.global(qos: .userInitiated)
324318

325319
let (signal, observer) = Signal<Int, Never>.pipe()
326320

@@ -362,16 +356,10 @@ class SignalSpec: QuickSpec {
362356
}
363357

364358
it("should interrupt concurrently") {
365-
let queue: DispatchQueue
359+
let queue = DispatchQueue.global(qos: .userInitiated)
366360
let counter = Atomic<Int>(0)
367361
let executionCounter = Atomic<Int>(0)
368362

369-
if #available(macOS 10.10, *) {
370-
queue = DispatchQueue.global(qos: .userInitiated)
371-
} else {
372-
queue = DispatchQueue.global(priority: .high)
373-
}
374-
375363
let iterations = 1000
376364
let group = DispatchGroup()
377365

0 commit comments

Comments
 (0)