Skip to content

Commit

Permalink
RxKeyboard for Swift 5 / RxSwift 5 (#90)
Browse files Browse the repository at this point in the history
  • Loading branch information
devxoul authored and freak4pc committed May 27, 2019
1 parent 4fee312 commit ed5940a
Show file tree
Hide file tree
Showing 10 changed files with 47 additions and 45 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" ~> 4.4.0
github "ReactiveX/RxSwift" ~> 5.0.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" "4.4.0"
github "ReactiveX/RxSwift" "5.0.1"
41 changes: 21 additions & 20 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
PODS:
- CGFloatLiteral (0.4.0)
- CGFloatLiteral (0.5.0)
- ManualLayout (1.3.0)
- ReusableKit (2.1.0):
- ReusableKit/Core (= 2.1.0)
- ReusableKit/Core (2.1.0)
- RxAtomic (4.4.0)
- RxCocoa (4.4.0):
- RxSwift (~> 4.0)
- RxKeyboard (0.9.2):
- RxCocoa (>= 4.4.0)
- RxSwift (>= 4.4.0)
- RxSwift (4.4.0):
- RxAtomic (~> 4.4)
- RxCocoa (5.0.0):
- RxRelay (~> 5)
- RxSwift (~> 5)
- RxKeyboard (1.0.0):
- RxCocoa (~> 5.0)
- RxSwift (~> 5.0)
- RxRelay (5.0.0):
- RxSwift (~> 5)
- RxSwift (5.0.0)
- SnapKit (4.2.0)
- SwiftyColor (1.1.0)
- SwiftyImage (1.3.0)
- SwiftyColor (1.2.0)
- SwiftyImage (1.4.0)
- Then (2.4.0)
- "UITextView+Placeholder (1.2.1)"

Expand All @@ -34,8 +35,8 @@ SPEC REPOS:
- CGFloatLiteral
- ManualLayout
- ReusableKit
- RxAtomic
- RxCocoa
- RxRelay
- RxSwift
- SnapKit
- SwiftyColor
Expand All @@ -48,19 +49,19 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
CGFloatLiteral: 2ab558b74124b584dd023a35b7e41795a61d8140
CGFloatLiteral: 0328648f666e3cb2263d5ee3972df9d320786d25
ManualLayout: 68ac8cfa6b5f656f7a9fadec3730208b95986880
ReusableKit: d0b040de03b293288b0ca27a78602691d3346d9b
RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f
RxCocoa: df63ebf7b9a70d6b4eeea407ed5dd4efc8979749
RxKeyboard: cb7bc1897aaaa36e86d36556de62418548751b96
RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973
RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
RxKeyboard: 6683c4344304a00f943c158bd8a43ce5469c82a7
RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
SwiftyColor: f2955e3a947f4faef07162a289d326ba0662d667
SwiftyImage: 62a73a6d8cafb83d7ebbf98795c6d1ad8666bf02
SwiftyColor: ac23e6c0b561838c1ef0f554ff170cceba14546b
SwiftyImage: 03eda95ec96406846ee6f72a16897483bf8d4c4a
Then: 71866660c7af35a7343831f7668e7cd2b62ee0f2
"UITextView+Placeholder": 0c3efd97f37ea64bde7f34cc6e90fe02e87b3909

PODFILE CHECKSUM: 49cf5def62bcfa2dfbe0c5118a9372a4162ec992

COCOAPODS: 1.5.3
COCOAPODS: 1.6.2
20 changes: 10 additions & 10 deletions Example/RxKeyboardExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0820;
LastUpgradeCheck = 0940;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = "Suyeol Jeon";
TargetAttributes = {
03E8A71D1E35A95B00F7A3EC = {
Expand All @@ -177,7 +177,7 @@
};
buildConfigurationList = 03E8A7191E35A95B00F7A3EC /* Build configuration list for PBXProject "RxKeyboardExample" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -230,13 +230,13 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-RxKeyboardExample/Pods-RxKeyboardExample-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-RxKeyboardExample/Pods-RxKeyboardExample-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/CGFloatLiteral/CGFloatLiteral.framework",
"${BUILT_PRODUCTS_DIR}/ManualLayout/ManualLayout.framework",
"${BUILT_PRODUCTS_DIR}/ReusableKit/ReusableKit.framework",
"${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework",
"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
"${BUILT_PRODUCTS_DIR}/RxKeyboard/RxKeyboard.framework",
"${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework",
"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
"${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework",
"${BUILT_PRODUCTS_DIR}/SwiftyColor/SwiftyColor.framework",
Expand All @@ -249,9 +249,9 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CGFloatLiteral.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ManualLayout.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReusableKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxKeyboard.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyColor.framework",
Expand All @@ -261,7 +261,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxKeyboardExample/Pods-RxKeyboardExample-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RxKeyboardExample/Pods-RxKeyboardExample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -298,6 +298,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -348,14 +349,15 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
03E8A72F1E35A95B00F7A3EC /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -398,7 +400,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -412,7 +414,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = kr.xoul.RxKeyboardExample;
PRODUCT_NAME = RxKeyboardRxKeyboardExample;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -425,7 +426,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = kr.xoul.RxKeyboardExample;
PRODUCT_NAME = RxKeyboardRxKeyboardExample;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
ruby '~> 2.3'

gem 'cocoapods', '~> 1.1'
gem 'cocoapods', '~> 1.6'
gem 'swiftproj'
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ GEM
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.6.1)
cocoapods (1.6.2)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.6.1)
cocoapods-core (= 1.6.2)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -28,7 +28,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.8.1, < 2.0)
cocoapods-core (1.6.1)
cocoapods-core (1.6.2)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
Expand Down Expand Up @@ -62,7 +62,7 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
xcodeproj (1.8.2)
xcodeproj (1.9.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -73,7 +73,7 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.1)
cocoapods (~> 1.6)
swiftproj

RUBY VERSION
Expand Down
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
"state": {
"branch": null,
"revision": "e8aa1d892a0d8a153a28b74cbad25be534926f49",
"version": "4.4.0"
"revision": "b3e888b4972d9bc76495dd74d30a8c7fad4b9395",
"version": "5.0.1"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let package = Package(
.library(name: "RxKeyboard", targets: ["RxKeyboard"]),
],
dependencies: [
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.4.0")),
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.0.0")),
],
targets: [
.target(name: "RxKeyboard", dependencies: ["RxSwift", "RxCocoa"]),
Expand Down
3 changes: 2 additions & 1 deletion RxKeyboard.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
"0.8.3": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.8.3/RxKeyboard.framework.zip",
"0.9.0": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.9.0/RxKeyboard.framework.zip",
"0.9.1": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.9.1/RxKeyboard.framework.zip",
"0.9.2": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.9.2/RxKeyboard.framework.zip"
"0.9.2": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.9.2/RxKeyboard.framework.zip",
"1.0.0": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/1.0.0/RxKeyboard.framework.zip"
}
6 changes: 3 additions & 3 deletions 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.9.2'
s.version = '1.0.0'
s.summary = 'Reactive Keyboard in iOS'
s.homepage = 'https://github.com/RxSwiftCommunity/RxKeyboard'
s.license = { :type => 'MIT', :file => 'LICENSE' }
Expand All @@ -12,8 +12,8 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.swift_version = "5.0"

s.dependency 'RxSwift', '>= 4.4.0'
s.dependency 'RxCocoa', '>= 4.4.0'
s.dependency 'RxSwift', '~> 5.0'
s.dependency 'RxCocoa', '~> 5.0'

s.ios.deployment_target = '8.0'
end

0 comments on commit ed5940a

Please sign in to comment.