Skip to content

Commit

Permalink
Bumping deployment target due to Xcode 12 warning (#818)
Browse files Browse the repository at this point in the history
* Bumping deployment target due to Xcode 12 warning

* Fix unavailable QueueScheduler initializer in tests.

Co-authored-by: Anders Ha <[email protected]>
  • Loading branch information
harleyjcooper and andersio authored Mar 8, 2021
1 parent df0e782 commit 660aab4
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 11 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# master
*Please add new entries at the top.*

# 6.5.1
1. Added the `interval` operator (#810, kudos to @mluisbrown)
1. Bumped deployment target to iOS 9.0, per Xcode 12 warnings

# 6.5.0

1. Add `ExpressibleByNilLiteral` constraint to `OptionalProtocol` (#805, kudos to @nkristek)
Expand Down
2 changes: 1 addition & 1 deletion Documentation/RxCheatsheet.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Inspired by the [RxSwift to Combine cheatsheet](https://github.com/CombineCommun

| | RxSwift | ReactiveSwift |
|-----------------------|----------------------------------|--------------------------------------------|
| Deployment Target | iOS 8.0+ | iOS 8.0+
| Deployment Target | iOS 8.0+ | iOS 9.0+
| Platforms supported | iOS, macOS, tvOS, watchOS, Linux | iOS, macOS, tvOS, watchOS, Linux
| Spec | Reactive Extensions (ReactiveX) | Originally ReactiveX, with significant divergence
| Framework Consumption | Third-party | Third-party
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ code and state to bridge the gap.

## Installation

ReactiveSwift supports macOS 10.9+, iOS 8.0+, watchOS 2.0+, tvOS 9.0+ and Linux.
ReactiveSwift supports macOS 10.9+, iOS 9.0+, watchOS 2.0+, tvOS 9.0+ and Linux.

#### Carthage

Expand Down
4 changes: 2 additions & 2 deletions ReactiveSwift.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "ReactiveSwift"
# Version goes here and will be used to access the git tag later on, once we have a first release.
s.version = "6.5.0"
s.version = "6.5.1"
s.summary = "Streams of values over time"
s.description = <<-DESC
ReactiveSwift is a Swift framework inspired by Functional Reactive Programming. It provides APIs for composing and transforming streams of values over time.
Expand All @@ -10,7 +10,7 @@ Pod::Spec.new do |s|
s.license = { :type => "MIT", :file => "LICENSE.md" }
s.author = "ReactiveCocoa"

s.ios.deployment_target = "8.0"
s.ios.deployment_target = "9.0"
s.osx.deployment_target = "10.9"
s.watchos.deployment_target = "2.0"
s.tvos.deployment_target = "9.0"
Expand Down
8 changes: 4 additions & 4 deletions ReactiveSwift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1502,7 +1502,7 @@
CODE_SIGNING_REQUIRED = NO;
CURRENT_PROJECT_VERSION = 1;
ENABLE_TESTABILITY = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(PROJECT_NAME)";
Expand All @@ -1522,7 +1522,7 @@
BITCODE_GENERATION_MODE = bitcode;
CODE_SIGNING_REQUIRED = NO;
CURRENT_PROJECT_VERSION = 1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(PROJECT_NAME)";
Expand Down Expand Up @@ -1634,7 +1634,7 @@
BITCODE_GENERATION_MODE = bitcode;
CODE_SIGNING_REQUIRED = NO;
CURRENT_PROJECT_VERSION = 1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(PROJECT_NAME)";
Expand Down Expand Up @@ -1700,7 +1700,7 @@
BITCODE_GENERATION_MODE = bitcode;
CODE_SIGNING_REQUIRED = NO;
CURRENT_PROJECT_VERSION = 1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)-Tests";
PRODUCT_NAME = "$(PROJECT_NAME)";
Expand Down
6 changes: 3 additions & 3 deletions Tests/ReactiveSwiftTests/QueueScheduler+Factory.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ extension QueueScheduler {
let label = "reactiveswift:\(file):\(line)"

#if targetEnvironment(macCatalyst)
return QueueScheduler()
return QueueScheduler(name: label)
#else
if #available(OSX 10.10, iOS 8.0, *) {
return QueueScheduler()
return QueueScheduler(name: label)
} else {
return QueueScheduler(queue: DispatchQueue(label: label))
return QueueScheduler()
}
#endif
}
Expand Down

0 comments on commit 660aab4

Please sign in to comment.