Skip to content

Commit 3e7074d

Browse files
committed
Update RxSwift dependency version
1 parent 23acf9b commit 3e7074d

File tree

3 files changed

+52
-14
lines changed

3 files changed

+52
-14
lines changed

Gemfile.lock

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4+
CFPropertyList (2.3.4)
45
activesupport (4.2.7.1)
56
i18n (~> 0.7)
67
json (~> 1.7, >= 1.7.7)
@@ -31,12 +32,12 @@ GEM
3132
fuzzy_match (~> 2.0.4)
3233
nap (~> 1.0)
3334
cocoapods-deintegrate (1.0.1)
34-
cocoapods-downloader (1.1.2)
35+
cocoapods-downloader (1.1.3)
3536
cocoapods-plugins (1.0.0)
3637
nap
3738
cocoapods-search (1.0.0)
3839
cocoapods-stats (1.0.0)
39-
cocoapods-trunk (1.1.1)
40+
cocoapods-trunk (1.1.2)
4041
nap (>= 0.8, < 2.0)
4142
netrc (= 0.7.8)
4243
cocoapods-try (1.1.0)
@@ -47,17 +48,20 @@ GEM
4748
gh_inspector (1.0.2)
4849
i18n (0.7.0)
4950
json (1.8.3)
50-
minitest (5.9.1)
51-
molinillo (0.5.2)
51+
minitest (5.10.1)
52+
molinillo (0.5.5)
53+
nanaimo (0.2.3)
5254
nap (1.1.0)
5355
netrc (0.7.8)
5456
thread_safe (0.3.5)
5557
tzinfo (1.2.2)
5658
thread_safe (~> 0.1)
57-
xcodeproj (1.3.3)
59+
xcodeproj (1.4.2)
60+
CFPropertyList (~> 2.3.3)
5861
activesupport (>= 3)
5962
claide (>= 1.0.1, < 2.0)
6063
colored (~> 1.2)
64+
nanaimo (~> 0.2.3)
6165

6266
PLATFORMS
6367
ruby

Podfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
PODS:
2-
- RxCocoa (3.0.0):
3-
- RxSwift (~> 3.0)
4-
- RxSwift (3.0.0)
5-
- Then (2.0.0)
2+
- RxCocoa (3.1.0):
3+
- RxSwift (~> 3.1)
4+
- RxSwift (3.1.0)
5+
- Then (2.1.0)
66
- UITextView+Placeholder (1.2.0)
77

88
DEPENDENCIES:
@@ -12,11 +12,11 @@ DEPENDENCIES:
1212
- UITextView+Placeholder (~> 1.2)
1313

1414
SPEC CHECKSUMS:
15-
RxCocoa: 0a2f3ae381cf16f4021a4cee7a4420f83058a965
16-
RxSwift: a930cd662f5b4a7ca9dc3518585dba91dadf497c
17-
Then: 460074ffe907de3536d5e88f189dac5ef7cf0869
15+
RxCocoa: 50d7564866da9299161e86a263ce12a0873904d8
16+
RxSwift: 83ff553e7593fdfdcb2562933a64c0284dffdadc
17+
Then: 8496793c8fcac95482b943909b440724c7d8d82c
1818
UITextView+Placeholder: 77680995fcdd07c3f52ec92fe1150874a2ac89ff
1919

2020
PODFILE CHECKSUM: 1e89b190ef8aa8b8b99971927895315e490fd802
2121

22-
COCOAPODS: 1.0.1
22+
COCOAPODS: 1.1.1

RxKeyboard.xcodeproj/project.pbxproj

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
035F28D61DA95C580060CE31 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 035F28CB1DA95C050060CE31 /* AppDelegate.swift */; };
2020
035F28D71DA95C5B0060CE31 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 035F28CD1DA95C050060CE31 /* ViewController.swift */; };
2121
198DAF5A87143EF56B410376 /* Pods_RxKeyboard_RxKeyboardDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FD6156651B6B63C23AC292E /* Pods_RxKeyboard_RxKeyboardDemo.framework */; };
22+
641FB273609F21EA14F6095F /* Pods_RxKeyboard.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 387849BCC512BDBC37A69346 /* Pods_RxKeyboard.framework */; };
2223
/* End PBXBuildFile section */
2324

2425
/* Begin PBXContainerItemProxy section */
@@ -90,6 +91,7 @@
9091
files = (
9192
034E7CA71DAD548900CFC398 /* RxCocoa.framework in Frameworks */,
9293
034E7CA81DAD548900CFC398 /* RxSwift.framework in Frameworks */,
94+
641FB273609F21EA14F6095F /* Pods_RxKeyboard.framework in Frameworks */,
9395
);
9496
runOnlyForDeploymentPostprocessing = 0;
9597
};
@@ -256,10 +258,12 @@
256258
isa = PBXNativeTarget;
257259
buildConfigurationList = 03A258D31DA94EC50035A85B /* Build configuration list for PBXNativeTarget "RxKeyboard" */;
258260
buildPhases = (
261+
BE606DDA4B61A0A93A63B295 /* [CP] Check Pods Manifest.lock */,
259262
03A258C61DA94EC50035A85B /* Sources */,
260263
03A258C71DA94EC50035A85B /* Frameworks */,
261264
03A258C81DA94EC50035A85B /* Headers */,
262265
03A258C91DA94EC50035A85B /* Resources */,
266+
D4203A7C88F4012FC8BC79F0 /* [CP] Copy Pods Resources */,
263267
);
264268
buildRules = (
265269
);
@@ -360,7 +364,7 @@
360364
);
361365
runOnlyForDeploymentPostprocessing = 0;
362366
shellPath = /bin/sh;
363-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
367+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
364368
showEnvVarsInLog = 0;
365369
};
366370
9656CB0F46CF53436628B86B /* [CP] Embed Pods Frameworks */ = {
@@ -378,6 +382,36 @@
378382
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxKeyboard-RxKeyboardDemo/Pods-RxKeyboard-RxKeyboardDemo-frameworks.sh\"\n";
379383
showEnvVarsInLog = 0;
380384
};
385+
BE606DDA4B61A0A93A63B295 /* [CP] Check Pods Manifest.lock */ = {
386+
isa = PBXShellScriptBuildPhase;
387+
buildActionMask = 2147483647;
388+
files = (
389+
);
390+
inputPaths = (
391+
);
392+
name = "[CP] Check Pods Manifest.lock";
393+
outputPaths = (
394+
);
395+
runOnlyForDeploymentPostprocessing = 0;
396+
shellPath = /bin/sh;
397+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
398+
showEnvVarsInLog = 0;
399+
};
400+
D4203A7C88F4012FC8BC79F0 /* [CP] Copy Pods Resources */ = {
401+
isa = PBXShellScriptBuildPhase;
402+
buildActionMask = 2147483647;
403+
files = (
404+
);
405+
inputPaths = (
406+
);
407+
name = "[CP] Copy Pods Resources";
408+
outputPaths = (
409+
);
410+
runOnlyForDeploymentPostprocessing = 0;
411+
shellPath = /bin/sh;
412+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxKeyboard/Pods-RxKeyboard-resources.sh\"\n";
413+
showEnvVarsInLog = 0;
414+
};
381415
/* End PBXShellScriptBuildPhase section */
382416

383417
/* Begin PBXSourcesBuildPhase section */

0 commit comments

Comments
 (0)