Skip to content

Commit 120149c

Browse files
authored
Merge pull request #651 from ReactiveCocoa/update-podspec
[podspec] Add cocoapods_version and swift_version to be explicit
2 parents e22fd0b + bd5cc7a commit 120149c

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ jobs:
3838
XCODE_DESTINATION="platform=watchOS Simulator,name=Apple Watch Series 3 - 38mm"
3939
script/build
4040
- script:
41+
# To work around the lint error: "ERROR | swift: Specification `ReactiveSwift` specifies an inconsistent `swift_version` (`4.1`) compared to the one present in your `.swift-version` file (`4.1.2`). Please remove the `.swift-version` file which is now deprecated and only use the `swift_version` attribute within your podspec."
42+
# `.swift-version` is for swiftenv, not for CocoaPods, so we can't remove the file as suggested.
43+
- rm .swift-version
4144
- pod repo update --silent
4245
- pod lib lint ReactiveSwift.podspec
4346
env:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
*Please add new entries at the top.*
44

5+
1. [CocoaPods] CocoaPods 1.4.0 is the minimum required version. (#651, kudos to @ikesyo)
56
1. `<~` bindings now works with optional left-hand-side operands. (#642, kudos to @andersio and @Ankit-Aggarwal)
67

78
```swift

ReactiveSwift.podspec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ Pod::Spec.new do |s|
2020
s.dependency 'Result', '~> 4.0'
2121

2222
s.pod_target_xcconfig = {"OTHER_SWIFT_FLAGS[config=Release]" => "$(inherited) -suppress-warnings" }
23+
24+
s.cocoapods_version = ">= 1.4.0"
25+
s.swift_version = "4.1"
2326
end

0 commit comments

Comments
 (0)