Skip to content

Commit 87a91e5

Browse files
committed
Updated RxSwift to 6.0
1 parent 21e5272 commit 87a91e5

File tree

10 files changed

+95
-87
lines changed

10 files changed

+95
-87
lines changed

Cartfile

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

Cartfile.resolved

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

Example/Podfile.lock

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
PODS:
22
- CGFloatLiteral (0.5.0)
33
- ManualLayout (1.3.0)
4-
- ReusableKit (2.1.0):
5-
- ReusableKit/Core (= 2.1.0)
6-
- ReusableKit/Core (2.1.0)
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)
16-
- SnapKit (5.0.0)
17-
- SwiftyColor (1.2.0)
18-
- SwiftyImage (1.5.0)
19-
- Then (2.4.0)
20-
- "UITextView+Placeholder (1.2.1)"
4+
- ReusableKit (3.0.0):
5+
- ReusableKit/Core (= 3.0.0)
6+
- ReusableKit/Core (3.0.0)
7+
- RxCocoa (6.0.0):
8+
- RxRelay (= 6.0.0)
9+
- RxSwift (= 6.0.0)
10+
- RxKeyboard (2.0.0):
11+
- RxCocoa (~> 6.0)
12+
- RxSwift (~> 6.0)
13+
- RxRelay (6.0.0):
14+
- RxSwift (= 6.0.0)
15+
- RxSwift (6.0.0)
16+
- SnapKit (5.0.1)
17+
- SwiftyColor (1.2.1)
18+
- SwiftyImage (1.6.0)
19+
- Then (2.7.0)
20+
- "UITextView+Placeholder (1.4.0)"
2121

2222
DEPENDENCIES:
2323
- CGFloatLiteral
@@ -31,7 +31,7 @@ DEPENDENCIES:
3131
- "UITextView+Placeholder"
3232

3333
SPEC REPOS:
34-
https://github.com/cocoapods/specs.git:
34+
trunk:
3535
- CGFloatLiteral
3636
- ManualLayout
3737
- ReusableKit
@@ -51,17 +51,17 @@ EXTERNAL SOURCES:
5151
SPEC CHECKSUMS:
5252
CGFloatLiteral: 0328648f666e3cb2263d5ee3972df9d320786d25
5353
ManualLayout: 68ac8cfa6b5f656f7a9fadec3730208b95986880
54-
ReusableKit: d0b040de03b293288b0ca27a78602691d3346d9b
55-
RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
56-
RxKeyboard: 6683c4344304a00f943c158bd8a43ce5469c82a7
57-
RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
58-
RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
59-
SnapKit: fd22d10eb9aff484d79a8724eab922c1ddf89bcf
60-
SwiftyColor: ac23e6c0b561838c1ef0f554ff170cceba14546b
61-
SwiftyImage: b4f0523c4a775c79c45dd328f42ed9b3111d5898
62-
Then: 71866660c7af35a7343831f7668e7cd2b62ee0f2
63-
"UITextView+Placeholder": 0c3efd97f37ea64bde7f34cc6e90fe02e87b3909
54+
ReusableKit: e5f853ad4652e411f96b6119b2488afa12929be6
55+
RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e
56+
RxKeyboard: 268e4ed61c03b730c8ca71aa1cb2de40a7848b21
57+
RxRelay: 8d593be109c06ea850df027351beba614b012ffb
58+
RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295
59+
SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
60+
SwiftyColor: a2f468071c1b96be1ba41a0be7cf70d645cd7dcc
61+
SwiftyImage: 65c71a147f417fc0fe137d17b135aaa666279a09
62+
Then: acfe0be7e98221c6204e12f8161459606d5d822d
63+
"UITextView+Placeholder": d7b0c400921f66523f3a85d74f774512e14f6502
6464

6565
PODFILE CHECKSUM: 217b0b1c7b2faddc54272a5bde63843c54f48190
6666

67-
COCOAPODS: 1.6.1
67+
COCOAPODS: 1.10.0

Gemfile

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

4-
gem 'cocoapods', '~> 1.6'
3+
gem 'cocoapods', '~> 1.10'
54
gem 'swiftproj'

Gemfile.lock

Lines changed: 48 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,97 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.0)
5-
activesupport (4.2.11.1)
6-
i18n (~> 0.7)
4+
CFPropertyList (3.0.3)
5+
activesupport (5.2.4.4)
6+
concurrent-ruby (~> 1.0, >= 1.0.2)
7+
i18n (>= 0.7, < 2)
78
minitest (~> 5.1)
8-
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10+
addressable (2.7.0)
11+
public_suffix (>= 2.0.2, < 5.0)
12+
algoliasearch (1.27.5)
13+
httpclient (~> 2.8, >= 2.8.3)
14+
json (>= 1.5.1)
1015
atomos (0.1.3)
11-
claide (1.0.2)
12-
cocoapods (1.6.2)
13-
activesupport (>= 4.0.2, < 5)
16+
claide (1.0.3)
17+
cocoapods (1.10.0)
18+
addressable (~> 2.6)
1419
claide (>= 1.0.2, < 2.0)
15-
cocoapods-core (= 1.6.2)
16-
cocoapods-deintegrate (>= 1.0.2, < 2.0)
17-
cocoapods-downloader (>= 1.2.2, < 2.0)
20+
cocoapods-core (= 1.10.0)
21+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
22+
cocoapods-downloader (>= 1.4.0, < 2.0)
1823
cocoapods-plugins (>= 1.0.0, < 2.0)
1924
cocoapods-search (>= 1.0.0, < 2.0)
20-
cocoapods-stats (>= 1.0.0, < 2.0)
21-
cocoapods-trunk (>= 1.3.1, < 2.0)
25+
cocoapods-trunk (>= 1.4.0, < 2.0)
2226
cocoapods-try (>= 1.1.0, < 2.0)
2327
colored2 (~> 3.1)
2428
escape (~> 0.0.4)
25-
fourflusher (>= 2.2.0, < 3.0)
29+
fourflusher (>= 2.3.0, < 3.0)
2630
gh_inspector (~> 1.0)
2731
molinillo (~> 0.6.6)
2832
nap (~> 1.0)
2933
ruby-macho (~> 1.4)
30-
xcodeproj (>= 1.8.1, < 2.0)
31-
cocoapods-core (1.6.2)
32-
activesupport (>= 4.0.2, < 6)
34+
xcodeproj (>= 1.19.0, < 2.0)
35+
cocoapods-core (1.10.0)
36+
activesupport (> 5.0, < 6)
37+
addressable (~> 2.6)
38+
algoliasearch (~> 1.0)
39+
concurrent-ruby (~> 1.1)
3340
fuzzy_match (~> 2.0.4)
3441
nap (~> 1.0)
42+
netrc (~> 0.11)
43+
public_suffix
44+
typhoeus (~> 1.0)
3545
cocoapods-deintegrate (1.0.4)
36-
cocoapods-downloader (1.2.2)
46+
cocoapods-downloader (1.4.0)
3747
cocoapods-plugins (1.0.0)
3848
nap
3949
cocoapods-search (1.0.0)
40-
cocoapods-stats (1.1.0)
41-
cocoapods-trunk (1.3.1)
50+
cocoapods-trunk (1.5.0)
4251
nap (>= 0.8, < 2.0)
4352
netrc (~> 0.11)
44-
cocoapods-try (1.1.0)
53+
cocoapods-try (1.2.0)
4554
colored2 (3.1.2)
46-
concurrent-ruby (1.1.5)
55+
concurrent-ruby (1.1.7)
4756
escape (0.0.4)
48-
fourflusher (2.2.0)
57+
ethon (0.12.0)
58+
ffi (>= 1.3.0)
59+
ffi (1.14.2)
60+
fourflusher (2.3.1)
4961
fuzzy_match (2.0.4)
5062
gh_inspector (1.1.3)
51-
i18n (0.9.5)
63+
httpclient (2.8.3)
64+
i18n (1.8.6)
5265
concurrent-ruby (~> 1.0)
53-
minitest (5.11.3)
66+
json (2.5.1)
67+
minitest (5.14.2)
5468
molinillo (0.6.6)
55-
nanaimo (0.2.6)
69+
nanaimo (0.3.0)
5670
nap (1.1.0)
5771
netrc (0.11.0)
72+
public_suffix (4.0.6)
5873
ruby-macho (1.4.0)
5974
swiftproj (0.1.0)
6075
colored2 (>= 3.0)
6176
xcodeproj (>= 1.5)
6277
thread_safe (0.3.6)
63-
tzinfo (1.2.5)
78+
typhoeus (1.4.0)
79+
ethon (>= 0.9.0)
80+
tzinfo (1.2.9)
6481
thread_safe (~> 0.1)
65-
xcodeproj (1.9.0)
82+
xcodeproj (1.19.0)
6683
CFPropertyList (>= 2.3.3, < 4.0)
6784
atomos (~> 0.1.3)
6885
claide (>= 1.0.2, < 2.0)
6986
colored2 (~> 3.1)
70-
nanaimo (~> 0.2.6)
87+
nanaimo (~> 0.3.0)
7188

7289
PLATFORMS
73-
ruby
90+
universal-darwin-19
7491

7592
DEPENDENCIES
76-
cocoapods (~> 1.6)
93+
cocoapods (~> 1.10)
7794
swiftproj
7895

79-
RUBY VERSION
80-
ruby 2.3.1p112
81-
8296
BUNDLED WITH
83-
1.17.3
97+
2.2.4

Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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: "5.0.0")),
11+
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.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
@@ -8,5 +8,6 @@
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",
1010
"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"
11+
"1.0.0": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/1.0.0/RxKeyboard.framework.zip",
12+
"2.0.0": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/2.0.0/RxKeyboard.framework.zip",
1213
}

RxKeyboard.podspec

Lines changed: 4 additions & 4 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 = '1.0.0'
3+
s.version = '2.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', '~> 5.0'
16-
s.dependency 'RxCocoa', '~> 5.0'
15+
s.dependency 'RxSwift', '~> 6.0'
16+
s.dependency 'RxCocoa', '~> 6.0'
1717

18-
s.ios.deployment_target = '8.0'
18+
s.ios.deployment_target = '9.0'
1919
end

Sources/RxKeyboard/RxKeyboard.swift

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,10 @@ public class RxKeyboard: NSObject, RxKeyboardType {
5050
// MARK: Initializing
5151

5252
override init() {
53-
#if swift(>=4.2)
54-
let keyboardWillChangeFrame = UIResponder.keyboardWillChangeFrameNotification
55-
let keyboardWillHide = UIResponder.keyboardWillHideNotification
56-
let keyboardFrameEndKey = UIResponder.keyboardFrameEndUserInfoKey
57-
let applicationDidFinishLaunching = UIApplication.didFinishLaunchingNotification
58-
#else
59-
let keyboardWillChangeFrame = NSNotification.Name.UIKeyboardWillChangeFrame
60-
let keyboardWillHide = NSNotification.Name.UIKeyboardWillHide
61-
let keyboardFrameEndKey = UIKeyboardFrameEndUserInfoKey
62-
let applicationDidFinishLaunching = NSNotification.Name.UIApplicationDidFinishLaunching
63-
#endif
53+
54+
let keyboardWillChangeFrame = UIResponder.keyboardWillChangeFrameNotification
55+
let keyboardWillHide = UIResponder.keyboardWillHideNotification
56+
let keyboardFrameEndKey = UIResponder.keyboardFrameEndUserInfoKey
6457

6558
let defaultFrame = CGRect(
6659
x: 0,
@@ -131,7 +124,8 @@ public class RxKeyboard: NSObject, RxKeyboardType {
131124

132125
// gesture recognizer
133126
self.panRecognizer.delegate = self
134-
NotificationCenter.default.rx.notification(applicationDidFinishLaunching)
127+
128+
UIApplication.rx.didFinishLaunching
135129
.map { _ in Void() }
136130
.startWith(Void()) // when RxKeyboard is initialized before UIApplication.window is created
137131
.subscribe(onNext: { _ in

0 commit comments

Comments
 (0)