Skip to content

Commit 60b3035

Browse files
Yusuke Morishitafreak4pc
Yusuke Morishita
authored andcommitted
Support carthage binary to Swift 4.2.1 (#81)
* Add binary json to support swift 4.2.1 * Bump to 0.9.2 * Update .travis.yml * Update dependencies * Fix README
1 parent bc22b8a commit 60b3035

File tree

11 files changed

+89
-81
lines changed

11 files changed

+89
-81
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
osx_image: xcode10
1+
osx_image: xcode10.1
22
language: objective-c
33
sudo: required
44
env:
@@ -12,7 +12,7 @@ env:
1212
- FRAMEWORK="RxKeyboard"
1313
matrix:
1414
- 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 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"
1616

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

Cartfile

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

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" "4.3.1"
1+
github "ReactiveX/RxSwift" "4.4.0"

Example/Podfile.lock

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
PODS:
22
- CGFloatLiteral (0.4.0)
33
- ManualLayout (1.3.0)
4-
- ReusableKit (2.0.1):
5-
- ReusableKit/Core (= 2.0.1)
6-
- ReusableKit/Core (2.0.1)
7-
- RxCocoa (4.3.1):
4+
- ReusableKit (2.1.0):
5+
- ReusableKit/Core (= 2.1.0)
6+
- ReusableKit/Core (2.1.0)
7+
- RxAtomic (4.4.0)
8+
- RxCocoa (4.4.0):
89
- RxSwift (~> 4.0)
9-
- RxKeyboard (0.8.3):
10-
- RxCocoa (>= 4.3.0)
11-
- RxSwift (>= 4.3.0)
12-
- RxSwift (4.3.1)
13-
- SnapKit (4.0.1)
14-
- SwiftyColor (1.0.0)
15-
- SwiftyImage (1.2.0)
16-
- Then (2.3.0)
17-
- UITextView+Placeholder (1.2.1)
10+
- RxKeyboard (0.9.2):
11+
- RxCocoa (>= 4.4.0)
12+
- RxSwift (>= 4.4.0)
13+
- RxSwift (4.4.0):
14+
- RxAtomic (~> 4.4)
15+
- SnapKit (4.2.0)
16+
- SwiftyColor (1.1.0)
17+
- SwiftyImage (1.3.0)
18+
- Then (2.4.0)
19+
- "UITextView+Placeholder (1.2.1)"
1820

1921
DEPENDENCIES:
2022
- CGFloatLiteral
@@ -25,25 +27,40 @@ DEPENDENCIES:
2527
- SwiftyColor
2628
- SwiftyImage
2729
- Then
28-
- UITextView+Placeholder
30+
- "UITextView+Placeholder"
31+
32+
SPEC REPOS:
33+
https://github.com/cocoapods/specs.git:
34+
- CGFloatLiteral
35+
- ManualLayout
36+
- ReusableKit
37+
- RxAtomic
38+
- RxCocoa
39+
- RxSwift
40+
- SnapKit
41+
- SwiftyColor
42+
- SwiftyImage
43+
- Then
44+
- "UITextView+Placeholder"
2945

3046
EXTERNAL SOURCES:
3147
RxKeyboard:
32-
:path: ../
48+
:path: "../"
3349

3450
SPEC CHECKSUMS:
3551
CGFloatLiteral: 2ab558b74124b584dd023a35b7e41795a61d8140
3652
ManualLayout: 68ac8cfa6b5f656f7a9fadec3730208b95986880
37-
ReusableKit: 11b5bde14553a35bcf3979412dbfd1e690392f14
38-
RxCocoa: 78763c7b07d02455598d9fc3c1ad091a28b73635
39-
RxKeyboard: cdc73085509a6baa5795038372d86260bb683bed
40-
RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4
41-
SnapKit: 0de968a9fec17499afa29683b05d0c775b6d1c29
42-
SwiftyColor: 7fa09db14051bc5d7f539e1c4576665975225992
43-
SwiftyImage: ebaa7c7b6163cd4ad102f3bb05a8fb276d35b4f3
44-
Then: ee21c97b85ff6062b9b0080c9abb1eea46743345
45-
UITextView+Placeholder: 0c3efd97f37ea64bde7f34cc6e90fe02e87b3909
53+
ReusableKit: d0b040de03b293288b0ca27a78602691d3346d9b
54+
RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f
55+
RxCocoa: df63ebf7b9a70d6b4eeea407ed5dd4efc8979749
56+
RxKeyboard: cb7bc1897aaaa36e86d36556de62418548751b96
57+
RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973
58+
SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
59+
SwiftyColor: f2955e3a947f4faef07162a289d326ba0662d667
60+
SwiftyImage: 62a73a6d8cafb83d7ebbf98795c6d1ad8666bf02
61+
Then: 71866660c7af35a7343831f7668e7cd2b62ee0f2
62+
"UITextView+Placeholder": 0c3efd97f37ea64bde7f34cc6e90fe02e87b3909
4663

4764
PODFILE CHECKSUM: 49cf5def62bcfa2dfbe0c5118a9372a4162ec992
4865

49-
COCOAPODS: 1.3.1
66+
COCOAPODS: 1.5.3

Example/RxKeyboardExample.xcodeproj/project.pbxproj

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@
149149
03E8A71B1E35A95B00F7A3EC /* Frameworks */,
150150
03E8A71C1E35A95B00F7A3EC /* Resources */,
151151
E857CEA8F03D723AC93BD7A1 /* [CP] Embed Pods Frameworks */,
152-
2D555D8C90E50248DB41694D /* [CP] Copy Pods Resources */,
153152
);
154153
buildRules = (
155154
);
@@ -207,21 +206,6 @@
207206
/* End PBXResourcesBuildPhase section */
208207

209208
/* Begin PBXShellScriptBuildPhase section */
210-
2D555D8C90E50248DB41694D /* [CP] Copy Pods Resources */ = {
211-
isa = PBXShellScriptBuildPhase;
212-
buildActionMask = 2147483647;
213-
files = (
214-
);
215-
inputPaths = (
216-
);
217-
name = "[CP] Copy Pods Resources";
218-
outputPaths = (
219-
);
220-
runOnlyForDeploymentPostprocessing = 0;
221-
shellPath = /bin/sh;
222-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxKeyboardExample/Pods-RxKeyboardExample-resources.sh\"\n";
223-
showEnvVarsInLog = 0;
224-
};
225209
D103E37D22DD7DDCE369FBBB /* [CP] Check Pods Manifest.lock */ = {
226210
isa = PBXShellScriptBuildPhase;
227211
buildActionMask = 2147483647;
@@ -250,6 +234,7 @@
250234
"${BUILT_PRODUCTS_DIR}/CGFloatLiteral/CGFloatLiteral.framework",
251235
"${BUILT_PRODUCTS_DIR}/ManualLayout/ManualLayout.framework",
252236
"${BUILT_PRODUCTS_DIR}/ReusableKit/ReusableKit.framework",
237+
"${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework",
253238
"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
254239
"${BUILT_PRODUCTS_DIR}/RxKeyboard/RxKeyboard.framework",
255240
"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
@@ -264,6 +249,7 @@
264249
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CGFloatLiteral.framework",
265250
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ManualLayout.framework",
266251
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReusableKit.framework",
252+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework",
267253
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
268254
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxKeyboard.framework",
269255
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",

Gemfile.lock

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,73 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (2.3.5)
4+
CFPropertyList (3.0.0)
55
activesupport (4.2.10)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10+
atomos (0.1.3)
1011
claide (1.0.2)
11-
cocoapods (1.3.1)
12+
cocoapods (1.5.3)
1213
activesupport (>= 4.0.2, < 5)
1314
claide (>= 1.0.2, < 2.0)
14-
cocoapods-core (= 1.3.1)
15-
cocoapods-deintegrate (>= 1.0.1, < 2.0)
16-
cocoapods-downloader (>= 1.1.3, < 2.0)
15+
cocoapods-core (= 1.5.3)
16+
cocoapods-deintegrate (>= 1.0.2, < 2.0)
17+
cocoapods-downloader (>= 1.2.0, < 2.0)
1718
cocoapods-plugins (>= 1.0.0, < 2.0)
1819
cocoapods-search (>= 1.0.0, < 2.0)
1920
cocoapods-stats (>= 1.0.0, < 2.0)
20-
cocoapods-trunk (>= 1.2.0, < 2.0)
21+
cocoapods-trunk (>= 1.3.0, < 2.0)
2122
cocoapods-try (>= 1.1.0, < 2.0)
2223
colored2 (~> 3.1)
2324
escape (~> 0.0.4)
2425
fourflusher (~> 2.0.1)
2526
gh_inspector (~> 1.0)
26-
molinillo (~> 0.5.7)
27+
molinillo (~> 0.6.5)
2728
nap (~> 1.0)
2829
ruby-macho (~> 1.1)
29-
xcodeproj (>= 1.5.1, < 2.0)
30-
cocoapods-core (1.3.1)
30+
xcodeproj (>= 1.5.7, < 2.0)
31+
cocoapods-core (1.5.3)
3132
activesupport (>= 4.0.2, < 6)
3233
fuzzy_match (~> 2.0.4)
3334
nap (~> 1.0)
34-
cocoapods-deintegrate (1.0.1)
35-
cocoapods-downloader (1.1.3)
35+
cocoapods-deintegrate (1.0.2)
36+
cocoapods-downloader (1.2.2)
3637
cocoapods-plugins (1.0.0)
3738
nap
3839
cocoapods-search (1.0.0)
3940
cocoapods-stats (1.0.0)
40-
cocoapods-trunk (1.3.0)
41+
cocoapods-trunk (1.3.1)
4142
nap (>= 0.8, < 2.0)
4243
netrc (~> 0.11)
4344
cocoapods-try (1.1.0)
4445
colored2 (3.1.2)
45-
concurrent-ruby (1.0.5)
46+
concurrent-ruby (1.1.3)
4647
escape (0.0.4)
4748
fourflusher (2.0.1)
4849
fuzzy_match (2.0.4)
49-
gh_inspector (1.0.3)
50-
i18n (0.9.0)
50+
gh_inspector (1.1.3)
51+
i18n (0.9.5)
5152
concurrent-ruby (~> 1.0)
52-
minitest (5.10.3)
53-
molinillo (0.5.7)
54-
nanaimo (0.2.3)
53+
minitest (5.11.3)
54+
molinillo (0.6.6)
55+
nanaimo (0.2.6)
5556
nap (1.1.0)
5657
netrc (0.11.0)
57-
ruby-macho (1.1.0)
58+
ruby-macho (1.3.1)
5859
swiftproj (0.1.0)
5960
colored2 (>= 3.0)
6061
xcodeproj (>= 1.5)
6162
thread_safe (0.3.6)
62-
tzinfo (1.2.3)
63+
tzinfo (1.2.5)
6364
thread_safe (~> 0.1)
64-
xcodeproj (1.5.2)
65-
CFPropertyList (~> 2.3.3)
65+
xcodeproj (1.7.0)
66+
CFPropertyList (>= 2.3.3, < 4.0)
67+
atomos (~> 0.1.3)
6668
claide (>= 1.0.2, < 2.0)
6769
colored2 (~> 3.1)
68-
nanaimo (~> 0.2.3)
70+
nanaimo (~> 0.2.6)
6971

7072
PLATFORMS
7173
ruby
@@ -78,4 +80,4 @@ RUBY VERSION
7880
ruby 2.3.1p112
7981

8082
BUNDLED WITH
81-
1.15.3
83+
1.16.6

Package.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
77
"state": {
88
"branch": null,
9-
"revision": "0df62b4d562f8620d4b795b18e4adf0b631527a1",
10-
"version": "4.3.1"
9+
"revision": "e8aa1d892a0d8a153a28b74cbad25be534926f49",
10+
"version": "4.4.0"
1111
}
1212
}
1313
]

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let package = Package(
88
.library(name: "RxKeyboard", targets: ["RxKeyboard"]),
99
],
1010
dependencies: [
11-
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.3.0")),
11+
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.4.0")),
1212
],
1313
targets: [
1414
.target(name: "RxKeyboard", dependencies: ["RxSwift", "RxCocoa"]),

README.md

Lines changed: 6 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-4.1-orange.svg)
3+
![Swift](https://img.shields.io/badge/Swift-4.2-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,8 +93,8 @@ RxKeyboard.instance.frame
9393

9494
## Dependencies
9595

96-
- [RxSwift](https://github.com/ReactiveX/RxSwift) (>= 4.1.0)
97-
- [RxCocoa](https://github.com/ReactiveX/RxSwift) (>= 4.1.0)
96+
- [RxSwift](https://github.com/ReactiveX/RxSwift) (>= 4.4.0)
97+
- [RxCocoa](https://github.com/ReactiveX/RxSwift) (>= 4.4.0)
9898

9999
## Requirements
100100

@@ -124,7 +124,9 @@ $ swift package generate-xcodeproj
124124
```
125125

126126
⚠️ With Carthage, RxKeyboard only supports binary installation:
127-
127+
* 0.9.2
128+
* Xcode 10.1 (10B61)
129+
* Swift 4.2.1 (swiftlang-1000.11.42 clang-1000.11.45.1)
128130
* 0.9.0
129131
* Xcode 10 (10A255)
130132
* Swift 4.2 (swiftlang-1000.11.37.1 clang-1000.11.45.1)

RxKeyboard.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
"0.8.2": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.8.2/RxKeyboard.framework.zip",
77
"0.8.3": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.8.3/RxKeyboard.framework.zip",
88
"0.9.0": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.9.0/RxKeyboard.framework.zip",
9-
"0.9.1": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.9.1/RxKeyboard.framework.zip"
10-
}
9+
"0.9.1": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.9.1/RxKeyboard.framework.zip",
10+
"0.9.2": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.9.2/RxKeyboard.framework.zip"
11+
}

RxKeyboard.podspec

Lines changed: 3 additions & 3 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.9.1'
3+
s.version = '0.9.2'
44
s.summary = 'Reactive Keyboard in iOS'
55
s.homepage = 'https://github.com/RxSwiftCommunity/RxKeyboard'
66
s.license = { :type => 'MIT', :file => 'LICENSE' }
@@ -11,8 +11,8 @@ Pod::Spec.new do |s|
1111
s.frameworks = 'UIKit', 'Foundation'
1212
s.requires_arc = true
1313

14-
s.dependency 'RxSwift', '>= 4.3.1'
15-
s.dependency 'RxCocoa', '>= 4.3.1'
14+
s.dependency 'RxSwift', '>= 4.4.0'
15+
s.dependency 'RxCocoa', '>= 4.4.0'
1616

1717
s.ios.deployment_target = '8.0'
1818
end

0 commit comments

Comments
 (0)