-
Notifications
You must be signed in to change notification settings - Fork 176
Updated RxSwift to 6.0 and ios.deployment_target #102
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 11 commits
21e5272
87a91e5
0d6f2f1
b573954
62d8fcc
d70c2d7
62e9c99
89a0830
29a2399
e7c9f8e
077ce96
0a8dfc1
fd41857
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,32 @@ | ||
.DS_Store | ||
# Xcode | ||
|
||
sourcekitten-output.json | ||
docs/ | ||
/.build | ||
/Packages | ||
/*.xcodeproj | ||
**/xcuserdata | ||
**/xcshareddata | ||
Pods/ | ||
Carthage/ | ||
Examples/**/Podfile.lock | ||
*.xcconfig | ||
*.framework.zip | ||
.idea/ | ||
|
||
# CocoaPods | ||
|
||
Pods/ | ||
Examples/**/Podfile.lock | ||
|
||
# Carthage | ||
|
||
Carthage/ | ||
|
||
# Various | ||
|
||
.DS_Store | ||
|
||
# Swift Package Manager | ||
|
||
.build/ | ||
Packages/ | ||
.swiftpm | ||
|
||
# AppCode | ||
|
||
.idea/ |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
github "ReactiveX/RxSwift" ~> 5.0.0 | ||
github "ReactiveX/RxSwift" ~> 6.0.0 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
github "ReactiveX/RxSwift" "5.0.1" | ||
github "ReactiveX/RxSwift" "6.0.0" |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
source 'https://rubygems.org' | ||
ruby '~> 2.3' | ||
|
||
gem 'cocoapods', '~> 1.6' | ||
gem 'cocoapods', '~> 1.10' | ||
gem 'swiftproj' |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,83 +1,97 @@ | ||
GEM | ||
remote: https://rubygems.org/ | ||
specs: | ||
CFPropertyList (3.0.0) | ||
activesupport (4.2.11.1) | ||
i18n (~> 0.7) | ||
CFPropertyList (3.0.3) | ||
activesupport (5.2.4.4) | ||
concurrent-ruby (~> 1.0, >= 1.0.2) | ||
i18n (>= 0.7, < 2) | ||
minitest (~> 5.1) | ||
thread_safe (~> 0.3, >= 0.3.4) | ||
tzinfo (~> 1.1) | ||
addressable (2.7.0) | ||
public_suffix (>= 2.0.2, < 5.0) | ||
algoliasearch (1.27.5) | ||
httpclient (~> 2.8, >= 2.8.3) | ||
json (>= 1.5.1) | ||
atomos (0.1.3) | ||
claide (1.0.2) | ||
cocoapods (1.6.2) | ||
activesupport (>= 4.0.2, < 5) | ||
claide (1.0.3) | ||
cocoapods (1.10.0) | ||
addressable (~> 2.6) | ||
claide (>= 1.0.2, < 2.0) | ||
cocoapods-core (= 1.6.2) | ||
cocoapods-deintegrate (>= 1.0.2, < 2.0) | ||
cocoapods-downloader (>= 1.2.2, < 2.0) | ||
cocoapods-core (= 1.10.0) | ||
cocoapods-deintegrate (>= 1.0.3, < 2.0) | ||
cocoapods-downloader (>= 1.4.0, < 2.0) | ||
cocoapods-plugins (>= 1.0.0, < 2.0) | ||
cocoapods-search (>= 1.0.0, < 2.0) | ||
cocoapods-stats (>= 1.0.0, < 2.0) | ||
cocoapods-trunk (>= 1.3.1, < 2.0) | ||
cocoapods-trunk (>= 1.4.0, < 2.0) | ||
cocoapods-try (>= 1.1.0, < 2.0) | ||
colored2 (~> 3.1) | ||
escape (~> 0.0.4) | ||
fourflusher (>= 2.2.0, < 3.0) | ||
fourflusher (>= 2.3.0, < 3.0) | ||
gh_inspector (~> 1.0) | ||
molinillo (~> 0.6.6) | ||
nap (~> 1.0) | ||
ruby-macho (~> 1.4) | ||
xcodeproj (>= 1.8.1, < 2.0) | ||
cocoapods-core (1.6.2) | ||
activesupport (>= 4.0.2, < 6) | ||
xcodeproj (>= 1.19.0, < 2.0) | ||
cocoapods-core (1.10.0) | ||
activesupport (> 5.0, < 6) | ||
addressable (~> 2.6) | ||
algoliasearch (~> 1.0) | ||
concurrent-ruby (~> 1.1) | ||
fuzzy_match (~> 2.0.4) | ||
nap (~> 1.0) | ||
netrc (~> 0.11) | ||
public_suffix | ||
typhoeus (~> 1.0) | ||
cocoapods-deintegrate (1.0.4) | ||
cocoapods-downloader (1.2.2) | ||
cocoapods-downloader (1.4.0) | ||
cocoapods-plugins (1.0.0) | ||
nap | ||
cocoapods-search (1.0.0) | ||
cocoapods-stats (1.1.0) | ||
cocoapods-trunk (1.3.1) | ||
cocoapods-trunk (1.5.0) | ||
nap (>= 0.8, < 2.0) | ||
netrc (~> 0.11) | ||
cocoapods-try (1.1.0) | ||
cocoapods-try (1.2.0) | ||
colored2 (3.1.2) | ||
concurrent-ruby (1.1.5) | ||
concurrent-ruby (1.1.7) | ||
escape (0.0.4) | ||
fourflusher (2.2.0) | ||
ethon (0.12.0) | ||
ffi (>= 1.3.0) | ||
ffi (1.14.2) | ||
fourflusher (2.3.1) | ||
fuzzy_match (2.0.4) | ||
gh_inspector (1.1.3) | ||
i18n (0.9.5) | ||
httpclient (2.8.3) | ||
i18n (1.8.6) | ||
concurrent-ruby (~> 1.0) | ||
minitest (5.11.3) | ||
json (2.5.1) | ||
minitest (5.14.2) | ||
molinillo (0.6.6) | ||
nanaimo (0.2.6) | ||
nanaimo (0.3.0) | ||
nap (1.1.0) | ||
netrc (0.11.0) | ||
public_suffix (4.0.6) | ||
ruby-macho (1.4.0) | ||
swiftproj (0.1.0) | ||
colored2 (>= 3.0) | ||
xcodeproj (>= 1.5) | ||
thread_safe (0.3.6) | ||
tzinfo (1.2.5) | ||
typhoeus (1.4.0) | ||
ethon (>= 0.9.0) | ||
tzinfo (1.2.9) | ||
thread_safe (~> 0.1) | ||
xcodeproj (1.9.0) | ||
xcodeproj (1.19.0) | ||
CFPropertyList (>= 2.3.3, < 4.0) | ||
atomos (~> 0.1.3) | ||
claide (>= 1.0.2, < 2.0) | ||
colored2 (~> 3.1) | ||
nanaimo (~> 0.2.6) | ||
nanaimo (~> 0.3.0) | ||
|
||
PLATFORMS | ||
ruby | ||
|
||
DEPENDENCIES | ||
cocoapods (~> 1.6) | ||
cocoapods (~> 1.10) | ||
swiftproj | ||
|
||
RUBY VERSION | ||
ruby 2.3.1p112 | ||
|
||
BUNDLED WITH | ||
1.17.3 | ||
2.2.4 |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,19 @@ | ||
Pod::Spec.new do |s| | ||
s.name = 'RxKeyboard' | ||
s.version = '1.0.0' | ||
s.version = '2.0.0' | ||
s.summary = 'Reactive Keyboard in iOS' | ||
s.homepage = 'https://github.com/RxSwiftCommunity/RxKeyboard' | ||
s.license = { :type => 'MIT', :file => 'LICENSE' } | ||
s.author = { 'Suyeol Jeon' => 'devxoul@gmail.com' } | ||
s.source = { :git => 'https://github.com/RxSwiftCommunity/RxKeyboard.git', | ||
:tag => s.version.to_s } | ||
s.source_files = 'Sources/**/*.swift' | ||
s.frameworks = 'UIKit', 'Foundation' | ||
s.frameworks = 'UIKit' | ||
s.requires_arc = true | ||
s.swift_version = "5.0" | ||
|
||
s.dependency 'RxSwift', '~> 5.0' | ||
s.dependency 'RxCocoa', '~> 5.0' | ||
s.dependency 'RxSwift', '~> 6.0' | ||
s.dependency 'RxCocoa', '~> 6.0' | ||
|
||
s.ios.deployment_target = '8.0' | ||
s.ios.deployment_target = '9.0' | ||
end |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -50,17 +50,10 @@ public class RxKeyboard: NSObject, RxKeyboardType { | |
// MARK: Initializing | ||
|
||
override init() { | ||
#if swift(>=4.2) | ||
let keyboardWillChangeFrame = UIResponder.keyboardWillChangeFrameNotification | ||
let keyboardWillHide = UIResponder.keyboardWillHideNotification | ||
let keyboardFrameEndKey = UIResponder.keyboardFrameEndUserInfoKey | ||
let applicationDidFinishLaunching = UIApplication.didFinishLaunchingNotification | ||
#else | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this change intentional? Why should we drop support for versions lower than 4.2? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In .podspec and package.swift files swift 5.0 is listed as minimal supported version, isn't it? |
||
let keyboardWillChangeFrame = NSNotification.Name.UIKeyboardWillChangeFrame | ||
let keyboardWillHide = NSNotification.Name.UIKeyboardWillHide | ||
let keyboardFrameEndKey = UIKeyboardFrameEndUserInfoKey | ||
let applicationDidFinishLaunching = NSNotification.Name.UIApplicationDidFinishLaunching | ||
#endif | ||
|
||
let keyboardWillChangeFrame = UIResponder.keyboardWillChangeFrameNotification | ||
let keyboardWillHide = UIResponder.keyboardWillHideNotification | ||
let keyboardFrameEndKey = UIResponder.keyboardFrameEndUserInfoKey | ||
|
||
let defaultFrame = CGRect( | ||
x: 0, | ||
|
@@ -131,9 +124,8 @@ public class RxKeyboard: NSObject, RxKeyboardType { | |
|
||
// gesture recognizer | ||
self.panRecognizer.delegate = self | ||
NotificationCenter.default.rx.notification(applicationDidFinishLaunching) | ||
.map { _ in Void() } | ||
.startWith(Void()) // when RxKeyboard is initialized before UIApplication.window is created | ||
|
||
UIApplication.rx.didFinishLaunching // when RxKeyboard is initialized before UIApplication.window is created | ||
.subscribe(onNext: { _ in | ||
UIApplication.shared.windows.first?.addGestureRecognizer(self.panRecognizer) | ||
}) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since RxSwift's Swift version is
5.1
, I think this needs to reflected too.