Skip to content

Commit d29857f

Browse files
authored
Merge pull request #36 from EvsenevDev/swift_4
Updated for Swift 4.0
2 parents 8b18390 + c3f24fa commit d29857f

File tree

6 files changed

+37
-30
lines changed

6 files changed

+37
-30
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode8.3
2+
osx_image: xcode9.0
33
sudo: false
44
rvm:
55
- 2.3

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" >= 3.4
1+
github "ReactiveX/RxSwift" ~> 4.0.0

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" "3.4.0"
1+
github "ReactiveX/RxSwift" "4.0.0-beta.0"

Example/Podfile.lock

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
PODS:
2-
- CGFloatLiteral (0.2.0)
2+
- CGFloatLiteral (0.3.0)
33
- ManualLayout (1.3.0)
4-
- ReusableKit (1.1.0)
5-
- RxCocoa (3.5.0):
6-
- RxSwift (~> 3.4)
7-
- RxKeyboard (0.5.0):
4+
- ReusableKit (1.3.0):
5+
- ReusableKit/Core (= 1.3.0)
6+
- ReusableKit/RxSwift (= 1.3.0)
7+
- ReusableKit/Core (1.3.0)
8+
- ReusableKit/RxSwift (1.3.0):
9+
- ReusableKit/Core
810
- RxCocoa (>= 3.4)
911
- RxSwift (>= 3.4)
10-
- RxSwift (3.5.0)
11-
- SnapKit (3.1.2)
12+
- RxCocoa (4.0.0-beta.0):
13+
- RxSwift (~> 4.0.0-beta.0)
14+
- RxKeyboard (0.7.0):
15+
- RxCocoa (~> 4.0.0-beta.0)
16+
- RxSwift (~> 4.0.0-beta.0)
17+
- RxSwift (4.0.0-beta.0)
18+
- SnapKit (4.0.0)
1219
- SwiftyColor (1.0.0)
13-
- SwiftyImage (1.0.0)
14-
- Then (2.1.0)
20+
- SwiftyImage (1.2.0)
21+
- Then (2.1.1)
1522
- UITextView+Placeholder (1.2.0)
1623

1724
DEPENDENCIES:
@@ -27,21 +34,21 @@ DEPENDENCIES:
2734

2835
EXTERNAL SOURCES:
2936
RxKeyboard:
30-
:path: "../"
37+
:path: ../
3138

3239
SPEC CHECKSUMS:
33-
CGFloatLiteral: 5bdcd81cb54b56cd71c4e5e66a33cb86cd51ecbf
40+
CGFloatLiteral: faba125ab2bb8fa90142c414f876b83099c26f25
3441
ManualLayout: 68ac8cfa6b5f656f7a9fadec3730208b95986880
35-
ReusableKit: 89e743a120bab0d95848bff27e481833c2768905
36-
RxCocoa: a0a09f45d0e5b48ecb6a4a7b4b4c89c88d3f633f
37-
RxKeyboard: b360a494f44777cd03f2c09251c50456683ec702
38-
RxSwift: 18ee9d78b45edb3b0b7e79916b47a116e6dbc842
39-
SnapKit: 12b24f569cb7c143acc9c22b9d91b23e7b1c84a2
42+
ReusableKit: 4e4f45128985987555bde17abbf261c0a604f9f2
43+
RxCocoa: 8d809675f4e89c5c4c5a6900bbd11fe632ad5d86
44+
RxKeyboard: 47be2ee793a7fd39e683b8ac86c610c02f5e49b5
45+
RxSwift: e0899fae37065c16db976cc5e3c957e4e388869c
46+
SnapKit: a42d492c16e80209130a3379f73596c3454b7694
4047
SwiftyColor: 7fa09db14051bc5d7f539e1c4576665975225992
41-
SwiftyImage: 79090f8b96057b3e91064de172936b97855086e6
42-
Then: 8496793c8fcac95482b943909b440724c7d8d82c
48+
SwiftyImage: ebaa7c7b6163cd4ad102f3bb05a8fb276d35b4f3
49+
Then: 823a7503a851737269ba8d40e688b4db874dbd2d
4350
UITextView+Placeholder: 77680995fcdd07c3f52ec92fe1150874a2ac89ff
4451

4552
PODFILE CHECKSUM: 49cf5def62bcfa2dfbe0c5118a9372a4162ec992
4653

47-
COCOAPODS: 1.1.1
54+
COCOAPODS: 1.3.1

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# RxKeyboard
22

3-
![Swift](https://img.shields.io/badge/Swift-3.0-orange.svg)
3+
![Swift](https://img.shields.io/badge/Swift-4.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)
@@ -93,12 +93,12 @@ RxKeyboard.instance.frame
9393

9494
## Dependencies
9595

96-
- [RxSwift](https://github.com/ReactiveX/RxSwift) (>= 3.4)
97-
- [RxCocoa](https://github.com/ReactiveX/RxSwift) (>= 3.4)
96+
- [RxSwift](https://github.com/ReactiveX/RxSwift) (~> 4.0.0-beta.0)
97+
- [RxCocoa](https://github.com/ReactiveX/RxSwift) (~> 4.0.0-beta.0)
9898

9999
## Requirements
100100

101-
- Swift 3
101+
- Swift 4
102102
- iOS 8+
103103

104104
## Installation

RxKeyboard.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'RxKeyboard'
3-
s.version = '0.6.2'
3+
s.version = '0.7.0'
44
s.summary = 'Reactive Keyboard in iOS'
55
s.homepage = 'https://github.com/RxSwiftCommunity/RxKeyboard'
66
s.license = { :type => 'MIT', :file => 'LICENSE' }
@@ -11,12 +11,12 @@ Pod::Spec.new do |s|
1111
s.frameworks = 'UIKit', 'Foundation'
1212
s.requires_arc = true
1313

14-
s.dependency 'RxSwift', '>= 3.4'
15-
s.dependency 'RxCocoa', '>= 3.4'
14+
s.dependency 'RxSwift', '~> 4.0.0-beta.0'
15+
s.dependency 'RxCocoa', '~> 4.0.0-beta.0'
1616

1717
s.ios.deployment_target = '8.0'
1818

1919
s.pod_target_xcconfig = {
20-
'SWIFT_VERSION' => '3.1'
20+
'SWIFT_VERSION' => '4.0'
2121
}
2222
end

0 commit comments

Comments
 (0)