Skip to content

Commit ed5940a

Browse files
devxoulfreak4pc
authored andcommitted
RxKeyboard for Swift 5 / RxSwift 5 (#90)
1 parent 4fee312 commit ed5940a

File tree

10 files changed

+47
-45
lines changed

10 files changed

+47
-45
lines changed

Cartfile

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

Cartfile.resolved

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

Example/Podfile.lock

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
PODS:
2-
- CGFloatLiteral (0.4.0)
2+
- CGFloatLiteral (0.5.0)
33
- ManualLayout (1.3.0)
44
- ReusableKit (2.1.0):
55
- ReusableKit/Core (= 2.1.0)
66
- ReusableKit/Core (2.1.0)
7-
- RxAtomic (4.4.0)
8-
- RxCocoa (4.4.0):
9-
- RxSwift (~> 4.0)
10-
- RxKeyboard (0.9.2):
11-
- RxCocoa (>= 4.4.0)
12-
- RxSwift (>= 4.4.0)
13-
- RxSwift (4.4.0):
14-
- RxAtomic (~> 4.4)
7+
- RxCocoa (5.0.0):
8+
- RxRelay (~> 5)
9+
- RxSwift (~> 5)
10+
- RxKeyboard (1.0.0):
11+
- RxCocoa (~> 5.0)
12+
- RxSwift (~> 5.0)
13+
- RxRelay (5.0.0):
14+
- RxSwift (~> 5)
15+
- RxSwift (5.0.0)
1516
- SnapKit (4.2.0)
16-
- SwiftyColor (1.1.0)
17-
- SwiftyImage (1.3.0)
17+
- SwiftyColor (1.2.0)
18+
- SwiftyImage (1.4.0)
1819
- Then (2.4.0)
1920
- "UITextView+Placeholder (1.2.1)"
2021

@@ -34,8 +35,8 @@ SPEC REPOS:
3435
- CGFloatLiteral
3536
- ManualLayout
3637
- ReusableKit
37-
- RxAtomic
3838
- RxCocoa
39+
- RxRelay
3940
- RxSwift
4041
- SnapKit
4142
- SwiftyColor
@@ -48,19 +49,19 @@ EXTERNAL SOURCES:
4849
:path: "../"
4950

5051
SPEC CHECKSUMS:
51-
CGFloatLiteral: 2ab558b74124b584dd023a35b7e41795a61d8140
52+
CGFloatLiteral: 0328648f666e3cb2263d5ee3972df9d320786d25
5253
ManualLayout: 68ac8cfa6b5f656f7a9fadec3730208b95986880
5354
ReusableKit: d0b040de03b293288b0ca27a78602691d3346d9b
54-
RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f
55-
RxCocoa: df63ebf7b9a70d6b4eeea407ed5dd4efc8979749
56-
RxKeyboard: cb7bc1897aaaa36e86d36556de62418548751b96
57-
RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973
55+
RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
56+
RxKeyboard: 6683c4344304a00f943c158bd8a43ce5469c82a7
57+
RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
58+
RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
5859
SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
59-
SwiftyColor: f2955e3a947f4faef07162a289d326ba0662d667
60-
SwiftyImage: 62a73a6d8cafb83d7ebbf98795c6d1ad8666bf02
60+
SwiftyColor: ac23e6c0b561838c1ef0f554ff170cceba14546b
61+
SwiftyImage: 03eda95ec96406846ee6f72a16897483bf8d4c4a
6162
Then: 71866660c7af35a7343831f7668e7cd2b62ee0f2
6263
"UITextView+Placeholder": 0c3efd97f37ea64bde7f34cc6e90fe02e87b3909
6364

6465
PODFILE CHECKSUM: 49cf5def62bcfa2dfbe0c5118a9372a4162ec992
6566

66-
COCOAPODS: 1.5.3
67+
COCOAPODS: 1.6.2

Example/RxKeyboardExample.xcodeproj/project.pbxproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
isa = PBXProject;
167167
attributes = {
168168
LastSwiftUpdateCheck = 0820;
169-
LastUpgradeCheck = 0940;
169+
LastUpgradeCheck = 1020;
170170
ORGANIZATIONNAME = "Suyeol Jeon";
171171
TargetAttributes = {
172172
03E8A71D1E35A95B00F7A3EC = {
@@ -177,7 +177,7 @@
177177
};
178178
buildConfigurationList = 03E8A7191E35A95B00F7A3EC /* Build configuration list for PBXProject "RxKeyboardExample" */;
179179
compatibilityVersion = "Xcode 3.2";
180-
developmentRegion = English;
180+
developmentRegion = en;
181181
hasScannedForEncodings = 0;
182182
knownRegions = (
183183
en,
@@ -230,13 +230,13 @@
230230
files = (
231231
);
232232
inputPaths = (
233-
"${SRCROOT}/Pods/Target Support Files/Pods-RxKeyboardExample/Pods-RxKeyboardExample-frameworks.sh",
233+
"${PODS_ROOT}/Target Support Files/Pods-RxKeyboardExample/Pods-RxKeyboardExample-frameworks.sh",
234234
"${BUILT_PRODUCTS_DIR}/CGFloatLiteral/CGFloatLiteral.framework",
235235
"${BUILT_PRODUCTS_DIR}/ManualLayout/ManualLayout.framework",
236236
"${BUILT_PRODUCTS_DIR}/ReusableKit/ReusableKit.framework",
237-
"${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework",
238237
"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
239238
"${BUILT_PRODUCTS_DIR}/RxKeyboard/RxKeyboard.framework",
239+
"${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework",
240240
"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
241241
"${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework",
242242
"${BUILT_PRODUCTS_DIR}/SwiftyColor/SwiftyColor.framework",
@@ -249,9 +249,9 @@
249249
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CGFloatLiteral.framework",
250250
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ManualLayout.framework",
251251
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReusableKit.framework",
252-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework",
253252
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
254253
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxKeyboard.framework",
254+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework",
255255
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
256256
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework",
257257
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyColor.framework",
@@ -261,7 +261,7 @@
261261
);
262262
runOnlyForDeploymentPostprocessing = 0;
263263
shellPath = /bin/sh;
264-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxKeyboardExample/Pods-RxKeyboardExample-frameworks.sh\"\n";
264+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RxKeyboardExample/Pods-RxKeyboardExample-frameworks.sh\"\n";
265265
showEnvVarsInLog = 0;
266266
};
267267
/* End PBXShellScriptBuildPhase section */
@@ -298,6 +298,7 @@
298298
isa = XCBuildConfiguration;
299299
buildSettings = {
300300
ALWAYS_SEARCH_USER_PATHS = NO;
301+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
301302
CLANG_ANALYZER_NONNULL = YES;
302303
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
303304
CLANG_CXX_LIBRARY = "libc++";
@@ -348,14 +349,15 @@
348349
SDKROOT = iphoneos;
349350
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
350351
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
351-
SWIFT_VERSION = 4.0;
352+
SWIFT_VERSION = 5.0;
352353
};
353354
name = Debug;
354355
};
355356
03E8A72F1E35A95B00F7A3EC /* Release */ = {
356357
isa = XCBuildConfiguration;
357358
buildSettings = {
358359
ALWAYS_SEARCH_USER_PATHS = NO;
360+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
359361
CLANG_ANALYZER_NONNULL = YES;
360362
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
361363
CLANG_CXX_LIBRARY = "libc++";
@@ -398,7 +400,7 @@
398400
MTL_ENABLE_DEBUG_INFO = NO;
399401
SDKROOT = iphoneos;
400402
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
401-
SWIFT_VERSION = 4.0;
403+
SWIFT_VERSION = 5.0;
402404
VALIDATE_PRODUCT = YES;
403405
};
404406
name = Release;
@@ -412,7 +414,6 @@
412414
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
413415
PRODUCT_BUNDLE_IDENTIFIER = kr.xoul.RxKeyboardExample;
414416
PRODUCT_NAME = RxKeyboardRxKeyboardExample;
415-
SWIFT_VERSION = 4.2;
416417
};
417418
name = Debug;
418419
};
@@ -425,7 +426,6 @@
425426
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
426427
PRODUCT_BUNDLE_IDENTIFIER = kr.xoul.RxKeyboardExample;
427428
PRODUCT_NAME = RxKeyboardRxKeyboardExample;
428-
SWIFT_VERSION = 4.2;
429429
};
430430
name = Release;
431431
};

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
22
ruby '~> 2.3'
33

4-
gem 'cocoapods', '~> 1.1'
4+
gem 'cocoapods', '~> 1.6'
55
gem 'swiftproj'

Gemfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ GEM
99
tzinfo (~> 1.1)
1010
atomos (0.1.3)
1111
claide (1.0.2)
12-
cocoapods (1.6.1)
12+
cocoapods (1.6.2)
1313
activesupport (>= 4.0.2, < 5)
1414
claide (>= 1.0.2, < 2.0)
15-
cocoapods-core (= 1.6.1)
15+
cocoapods-core (= 1.6.2)
1616
cocoapods-deintegrate (>= 1.0.2, < 2.0)
1717
cocoapods-downloader (>= 1.2.2, < 2.0)
1818
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -28,7 +28,7 @@ GEM
2828
nap (~> 1.0)
2929
ruby-macho (~> 1.4)
3030
xcodeproj (>= 1.8.1, < 2.0)
31-
cocoapods-core (1.6.1)
31+
cocoapods-core (1.6.2)
3232
activesupport (>= 4.0.2, < 6)
3333
fuzzy_match (~> 2.0.4)
3434
nap (~> 1.0)
@@ -62,7 +62,7 @@ GEM
6262
thread_safe (0.3.6)
6363
tzinfo (1.2.5)
6464
thread_safe (~> 0.1)
65-
xcodeproj (1.8.2)
65+
xcodeproj (1.9.0)
6666
CFPropertyList (>= 2.3.3, < 4.0)
6767
atomos (~> 0.1.3)
6868
claide (>= 1.0.2, < 2.0)
@@ -73,7 +73,7 @@ PLATFORMS
7373
ruby
7474

7575
DEPENDENCIES
76-
cocoapods (~> 1.1)
76+
cocoapods (~> 1.6)
7777
swiftproj
7878

7979
RUBY VERSION

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": "e8aa1d892a0d8a153a28b74cbad25be534926f49",
10-
"version": "4.4.0"
9+
"revision": "b3e888b4972d9bc76495dd74d30a8c7fad4b9395",
10+
"version": "5.0.1"
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.4.0")),
11+
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.0.0")),
1212
],
1313
targets: [
1414
.target(name: "RxKeyboard", dependencies: ["RxSwift", "RxCocoa"]),

RxKeyboard.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
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",
99
"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"
10+
"0.9.2": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.9.2/RxKeyboard.framework.zip",
11+
"1.0.0": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/1.0.0/RxKeyboard.framework.zip"
1112
}

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.2'
3+
s.version = '1.0.0'
44
s.summary = 'Reactive Keyboard in iOS'
55
s.homepage = 'https://github.com/RxSwiftCommunity/RxKeyboard'
66
s.license = { :type => 'MIT', :file => 'LICENSE' }
@@ -12,8 +12,8 @@ Pod::Spec.new do |s|
1212
s.requires_arc = true
1313
s.swift_version = "5.0"
1414

15-
s.dependency 'RxSwift', '>= 4.4.0'
16-
s.dependency 'RxCocoa', '>= 4.4.0'
15+
s.dependency 'RxSwift', '~> 5.0'
16+
s.dependency 'RxCocoa', '~> 5.0'
1717

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

0 commit comments

Comments
 (0)