Skip to content

Commit

Permalink
Merge pull request #62 from mendesbarreto/db/support-swift4.1
Browse files Browse the repository at this point in the history
Add Support to Swift 4.1
  • Loading branch information
devxoul authored Apr 16, 2018
2 parents f6b949f + 9aa7d2b commit 480efff
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ Carthage/
Examples/**/Podfile.lock
*.xcconfig
*.framework.zip
.idea/
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0
4.1
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" "4.0.0"
github "ReactiveX/RxSwift" "4.1.2"
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:4.1

import PackageDescription

Expand Down
11 changes: 7 additions & 4 deletions 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.0-orange.svg)
![Swift](https://img.shields.io/badge/Swift-4.1-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 Expand Up @@ -93,8 +93,8 @@ RxKeyboard.instance.frame

## Dependencies

- [RxSwift](https://github.com/ReactiveX/RxSwift) (~> 4.0.0)
- [RxCocoa](https://github.com/ReactiveX/RxSwift) (~> 4.0.0)
- [RxSwift](https://github.com/ReactiveX/RxSwift) (>= 4.0.0)
- [RxCocoa](https://github.com/ReactiveX/RxSwift) (>= 4.0.0)

## Requirements

Expand Down Expand Up @@ -124,7 +124,10 @@ $ swift package generate-xcodeproj
```

⚠️ With Carthage, RxKeyboard only supports binary installation:


* 0.8.2
* Xcode 9.3 (9E145)
* Swift 4.1.0 (swiftlang-902.0.48 clang-902.0.37.1)
* 0.7.1
* Xcode 9.1 (9B55)
* Swift 4.0.2 (swiftlang-900.0.69.2 clang-900.0.38)
Expand Down
2 changes: 1 addition & 1 deletion RxKeyboard.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'RxKeyboard'
s.version = '0.8.1'
s.version = '0.8.2'
s.summary = 'Reactive Keyboard in iOS'
s.homepage = 'https://github.com/RxSwiftCommunity/RxKeyboard'
s.license = { :type => 'MIT', :file => 'LICENSE' }
Expand Down

0 comments on commit 480efff

Please sign in to comment.