Skip to content

Commit 4fee312

Browse files
authored
Merge pull request #88 from RxSwiftCommunity/swift-5.0
Let's Swift 5.0 🚀
2 parents feb1691 + 772c64b commit 4fee312

File tree

5 files changed

+24
-25
lines changed

5 files changed

+24
-25
lines changed

.travis.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
osx_image: xcode10.1
1+
osx_image: xcode10.2
22
language: objective-c
33
sudo: required
44
env:
@@ -7,15 +7,13 @@ env:
77
- SCHEME="RxKeyboard-Package"
88
- IOS_SDK="iphonesimulator"
99
- MACOS_SDK="macosx10.14"
10-
- TVOS_SDK="appletvsimulator12.0"
11-
- WATCHOS_SDK="watchsimulator5.0"
10+
- TVOS_SDK="appletvsimulator12.2"
11+
- WATCHOS_SDK="watchsimulator5.2"
1212
- FRAMEWORK="RxKeyboard"
1313
matrix:
14-
- SDK="$IOS_SDK" TEST=0 SWIFT_VERSION=4.0 DESTINATION="platform=iOS Simulator,name=iPhone 8"
15-
- SDK="$IOS_SDK" TEST=0 SWIFT_VERSION=4.2.1 DESTINATION="platform=iOS Simulator,name=iPhone 8"
14+
- SDK="$IOS_SDK" TEST=0 SWIFT_VERSION=5.0 DESTINATION="platform=iOS Simulator,name=iPhone 8"
1615

1716
install:
18-
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
1917
- swift --version
2018
- bundle install
2119

Gemfile.lock

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,50 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
CFPropertyList (3.0.0)
5-
activesupport (4.2.10)
5+
activesupport (4.2.11.1)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
1010
atomos (0.1.3)
1111
claide (1.0.2)
12-
cocoapods (1.5.3)
12+
cocoapods (1.6.1)
1313
activesupport (>= 4.0.2, < 5)
1414
claide (>= 1.0.2, < 2.0)
15-
cocoapods-core (= 1.5.3)
15+
cocoapods-core (= 1.6.1)
1616
cocoapods-deintegrate (>= 1.0.2, < 2.0)
17-
cocoapods-downloader (>= 1.2.0, < 2.0)
17+
cocoapods-downloader (>= 1.2.2, < 2.0)
1818
cocoapods-plugins (>= 1.0.0, < 2.0)
1919
cocoapods-search (>= 1.0.0, < 2.0)
2020
cocoapods-stats (>= 1.0.0, < 2.0)
21-
cocoapods-trunk (>= 1.3.0, < 2.0)
21+
cocoapods-trunk (>= 1.3.1, < 2.0)
2222
cocoapods-try (>= 1.1.0, < 2.0)
2323
colored2 (~> 3.1)
2424
escape (~> 0.0.4)
25-
fourflusher (~> 2.0.1)
25+
fourflusher (>= 2.2.0, < 3.0)
2626
gh_inspector (~> 1.0)
27-
molinillo (~> 0.6.5)
27+
molinillo (~> 0.6.6)
2828
nap (~> 1.0)
29-
ruby-macho (~> 1.1)
30-
xcodeproj (>= 1.5.7, < 2.0)
31-
cocoapods-core (1.5.3)
29+
ruby-macho (~> 1.4)
30+
xcodeproj (>= 1.8.1, < 2.0)
31+
cocoapods-core (1.6.1)
3232
activesupport (>= 4.0.2, < 6)
3333
fuzzy_match (~> 2.0.4)
3434
nap (~> 1.0)
35-
cocoapods-deintegrate (1.0.2)
35+
cocoapods-deintegrate (1.0.4)
3636
cocoapods-downloader (1.2.2)
3737
cocoapods-plugins (1.0.0)
3838
nap
3939
cocoapods-search (1.0.0)
40-
cocoapods-stats (1.0.0)
40+
cocoapods-stats (1.1.0)
4141
cocoapods-trunk (1.3.1)
4242
nap (>= 0.8, < 2.0)
4343
netrc (~> 0.11)
4444
cocoapods-try (1.1.0)
4545
colored2 (3.1.2)
46-
concurrent-ruby (1.1.3)
46+
concurrent-ruby (1.1.5)
4747
escape (0.0.4)
48-
fourflusher (2.0.1)
48+
fourflusher (2.2.0)
4949
fuzzy_match (2.0.4)
5050
gh_inspector (1.1.3)
5151
i18n (0.9.5)
@@ -55,14 +55,14 @@ GEM
5555
nanaimo (0.2.6)
5656
nap (1.1.0)
5757
netrc (0.11.0)
58-
ruby-macho (1.3.1)
58+
ruby-macho (1.4.0)
5959
swiftproj (0.1.0)
6060
colored2 (>= 3.0)
6161
xcodeproj (>= 1.5)
6262
thread_safe (0.3.6)
6363
tzinfo (1.2.5)
6464
thread_safe (~> 0.1)
65-
xcodeproj (1.7.0)
65+
xcodeproj (1.8.2)
6666
CFPropertyList (>= 2.3.3, < 4.0)
6767
atomos (~> 0.1.3)
6868
claide (>= 1.0.2, < 2.0)
@@ -80,4 +80,4 @@ RUBY VERSION
8080
ruby 2.3.1p112
8181

8282
BUNDLED WITH
83-
1.16.6
83+
1.17.3

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:4.0
1+
// swift-tools-version:5.0
22

33
import PackageDescription
44

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# RxKeyboard
22

3-
![Swift](https://img.shields.io/badge/Swift-4.2-orange.svg)
3+
![Swift](https://img.shields.io/badge/Swift-5.0-orange.svg)
44
[![CocoaPods](http://img.shields.io/cocoapods/v/RxKeyboard.svg)](https://cocoapods.org/pods/RxKeyboard)
55
[![Build Status](https://travis-ci.org/RxSwiftCommunity/RxKeyboard.svg?branch=master)](https://travis-ci.org/RxSwiftCommunity/RxKeyboard)
66
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)

RxKeyboard.podspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Pod::Spec.new do |s|
1010
s.source_files = 'Sources/**/*.swift'
1111
s.frameworks = 'UIKit', 'Foundation'
1212
s.requires_arc = true
13+
s.swift_version = "5.0"
1314

1415
s.dependency 'RxSwift', '>= 4.4.0'
1516
s.dependency 'RxCocoa', '>= 4.4.0'

0 commit comments

Comments
 (0)