Skip to content

Commit 677d558

Browse files
authored
Merge pull request #1212 from mxcl/swift/3.1
[oh] we no longer support Swift 3.1
2 parents c0d2c0d + a955b79 commit 677d558

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

Documentation/Installation.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ PromiseKit contains Swift, so there have been rev-lock issues with Xcode:
8888

8989
| PromiseKit | Swift | Xcode | CI Status | Release Notes |
9090
| ---------- | ----------------------- | -------- | ------------ | ----------------- |
91-
| 6 | 3.1, 3.2, 3.3, 4.x, 5.x | 8.3, 9.x, 10.x | ![ci-master] | [2018/02][news-6] |
91+
| 6 | 3.2, 3.3, 4.x, 5.x | 8.3, 9.x, 10.x | ![ci-master] | [2018/02][news-6] |
9292
| 5 | 3.1, 3.2, 3.3, 4.x | 8.3, 9.x, 10.1 | *Deprecated* | *n/a* |
9393
| 4 | 3.0, 3.1, 3.2, 3.3, 4.x | 8.x, 9.x, 10.1 | ![ci-master] | [2016/09][news-4] |
9494
| 3 | 2.x | 7.x, 8.0 | ![ci-swift2] | [2015/10][news-3] |
9595
| 2 | 1.x | 7.x | *Deprecated* | [2015/10][news-3] |
9696
| 1† | *N/A* | * | ![ci-legacy] ||
97-
97+
9898
† PromiseKit 1 is pure Objective-C and thus can be used with any Xcode, it is
9999
also your only choice if you need to support iOS 7 or below.
100100

@@ -152,7 +152,7 @@ extension) then all your final products that use PromiseKit will have forced
152152
dependencies on all the Apple frameworks that PromiseKit provides extensions
153153
for.
154154

155-
This isn’t that bad, but every framework that loads entails overhead and
155+
This isn’t that bad, but every framework that loads entails overhead and
156156
lengthens startup time.
157157

158158
It’s both better and worse with Carthage. We build individual micro-frameworks

PromiseKit.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
1919
s.default_subspecs = 'CorePromise', 'UIKit', 'Foundation'
2020
s.requires_arc = true
2121

22-
s.swift_versions = ['3.1', '3.2', '3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '5.2', '5.3', '5.4']
22+
s.swift_versions = ['3.2', '3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '5.2', '5.3', '5.4']
2323

2424
# CocoaPods requires us to specify the root deployment targets
2525
# even though for us it is nonsense. Our root spec has no

0 commit comments

Comments
 (0)