Skip to content

Commit

Permalink
Merge pull request #88 from RxSwiftCommunity/swift-5.0
Browse files Browse the repository at this point in the history
Let's Swift 5.0 🚀
  • Loading branch information
devxoul authored Apr 2, 2019
2 parents feb1691 + 772c64b commit 4fee312
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 25 deletions.
10 changes: 4 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
osx_image: xcode10.1
osx_image: xcode10.2
language: objective-c
sudo: required
env:
Expand All @@ -7,15 +7,13 @@ env:
- SCHEME="RxKeyboard-Package"
- IOS_SDK="iphonesimulator"
- MACOS_SDK="macosx10.14"
- TVOS_SDK="appletvsimulator12.0"
- WATCHOS_SDK="watchsimulator5.0"
- TVOS_SDK="appletvsimulator12.2"
- WATCHOS_SDK="watchsimulator5.2"
- FRAMEWORK="RxKeyboard"
matrix:
- SDK="$IOS_SDK" TEST=0 SWIFT_VERSION=4.0 DESTINATION="platform=iOS Simulator,name=iPhone 8"
- SDK="$IOS_SDK" TEST=0 SWIFT_VERSION=4.2.1 DESTINATION="platform=iOS Simulator,name=iPhone 8"
- SDK="$IOS_SDK" TEST=0 SWIFT_VERSION=5.0 DESTINATION="platform=iOS Simulator,name=iPhone 8"

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

Expand Down
34 changes: 17 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,50 +2,50 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.0)
activesupport (4.2.10)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.5.3)
cocoapods (1.6.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.5.3)
cocoapods-core (= 1.6.1)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.0, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.3.0, < 2.0)
cocoapods-trunk (>= 1.3.1, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
fourflusher (>= 2.2.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.5)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.1)
xcodeproj (>= 1.5.7, < 2.0)
cocoapods-core (1.5.3)
ruby-macho (~> 1.4)
xcodeproj (>= 1.8.1, < 2.0)
cocoapods-core (1.6.1)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.2)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.2.2)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.3.1)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
colored2 (3.1.2)
concurrent-ruby (1.1.3)
concurrent-ruby (1.1.5)
escape (0.0.4)
fourflusher (2.0.1)
fourflusher (2.2.0)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
i18n (0.9.5)
Expand All @@ -55,14 +55,14 @@ GEM
nanaimo (0.2.6)
nap (1.1.0)
netrc (0.11.0)
ruby-macho (1.3.1)
ruby-macho (1.4.0)
swiftproj (0.1.0)
colored2 (>= 3.0)
xcodeproj (>= 1.5)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
xcodeproj (1.7.0)
xcodeproj (1.8.2)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -80,4 +80,4 @@ RUBY VERSION
ruby 2.3.1p112

BUNDLED WITH
1.16.6
1.17.3
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:4.0
// swift-tools-version:5.0

import PackageDescription

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# RxKeyboard

![Swift](https://img.shields.io/badge/Swift-4.2-orange.svg)
![Swift](https://img.shields.io/badge/Swift-5.0-orange.svg)
[![CocoaPods](http://img.shields.io/cocoapods/v/RxKeyboard.svg)](https://cocoapods.org/pods/RxKeyboard)
[![Build Status](https://travis-ci.org/RxSwiftCommunity/RxKeyboard.svg?branch=master)](https://travis-ci.org/RxSwiftCommunity/RxKeyboard)
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
Expand Down
1 change: 1 addition & 0 deletions RxKeyboard.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Pod::Spec.new do |s|
s.source_files = 'Sources/**/*.swift'
s.frameworks = 'UIKit', 'Foundation'
s.requires_arc = true
s.swift_version = "5.0"

s.dependency 'RxSwift', '>= 4.4.0'
s.dependency 'RxCocoa', '>= 4.4.0'
Expand Down

0 comments on commit 4fee312

Please sign in to comment.