Skip to content

Commit ef99e94

Browse files
fasskofassko
authored
Merge pull request #81 from RxSwiftCommunity/update_rxswift
Update RxSwift and gems
2 parents 288e2c6 + db09f94 commit ef99e94

6 files changed

Lines changed: 111 additions & 74 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
build-and-test:
44
macos:
5-
xcode: "10.3.0"
5+
xcode: "11.4.0"
66

77
steps:
88
- checkout
@@ -28,7 +28,7 @@ jobs:
2828
command: |
2929
cd Demo
3030
pod install
31-
xcodebuild -workspace 'Demo.xcworkspace' -scheme 'Demo' -configuration 'Debug' -sdk iphonesimulator -destination 'name=iPhone Xs' build test | xcpretty -c
31+
xcodebuild -workspace 'Demo.xcworkspace' -scheme 'Demo' -configuration 'Debug' -sdk iphonesimulator -destination 'name=iPhone 11 Pro' build test | xcpretty -c
3232
3333
- run:
3434
name: Pod lib lint

‎Changelog.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ Changelog
44
Current master
55
--------------
66

7+
5.1.0
8+
-----
9+
10+
- Update RxSwift
11+
712
5.0.3
813
-----
914

‎Demo/Podfile.lock‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PODS:
2-
- Nimble (8.0.2)
3-
- "NSObject+Rx (5.0.1)":
4-
- RxSwift (~> 5.0)
5-
- Quick (2.1.0)
6-
- RxSwift (5.0.0)
2+
- Nimble (8.0.7)
3+
- "NSObject+Rx (5.1.0)":
4+
- RxSwift (~> 5.1)
5+
- Quick (2.2.0)
6+
- RxSwift (5.1.1)
77

88
DEPENDENCIES:
99
- Nimble
@@ -12,7 +12,7 @@ DEPENDENCIES:
1212
- RxSwift
1313

1414
SPEC REPOS:
15-
https://github.com/cocoapods/specs.git:
15+
trunk:
1616
- Nimble
1717
- Quick
1818
- RxSwift
@@ -22,11 +22,11 @@ EXTERNAL SOURCES:
2222
:path: "../"
2323

2424
SPEC CHECKSUMS:
25-
Nimble: 622629381bda1dd5678162f21f1368cec7cbba60
26-
"NSObject+Rx": 1cc531f17bdb4e3aaac37874f1136c81091d2f6a
27-
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
28-
RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
25+
Nimble: a73af6ecd4c9106f434f3d55fc54570be3739e0b
26+
"NSObject+Rx": fa6bbcc1ab1faa06b01466bc09b1e0692bbc5946
27+
Quick: 7fb19e13be07b5dfb3b90d4f9824c855a11af40e
28+
RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178
2929

3030
PODFILE CHECKSUM: 4f420ecd33a82075e360098bbed0ccaadfeb1728
3131

32-
COCOAPODS: 1.7.5
32+
COCOAPODS: 1.9.1

‎Gemfile.lock‎

Lines changed: 89 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,46 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.1)
4+
CFPropertyList (3.0.2)
55
activesupport (4.2.11.1)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10-
addressable (2.6.0)
11-
public_suffix (>= 2.0.2, < 4.0)
10+
addressable (2.7.0)
11+
public_suffix (>= 2.0.2, < 5.0)
12+
algoliasearch (1.27.1)
13+
httpclient (~> 2.8, >= 2.8.3)
14+
json (>= 1.5.1)
1215
atomos (0.1.3)
13-
babosa (1.0.2)
16+
aws-eventstream (1.1.0)
17+
aws-partitions (1.296.0)
18+
aws-sdk-core (3.94.0)
19+
aws-eventstream (~> 1, >= 1.0.2)
20+
aws-partitions (~> 1, >= 1.239.0)
21+
aws-sigv4 (~> 1.1)
22+
jmespath (~> 1.0)
23+
aws-sdk-kms (1.30.0)
24+
aws-sdk-core (~> 3, >= 3.71.0)
25+
aws-sigv4 (~> 1.1)
26+
aws-sdk-s3 (1.61.2)
27+
aws-sdk-core (~> 3, >= 3.83.0)
28+
aws-sdk-kms (~> 1)
29+
aws-sigv4 (~> 1.1)
30+
aws-sigv4 (1.1.1)
31+
aws-eventstream (~> 1.0, >= 1.0.2)
32+
babosa (1.0.3)
1433
claide (1.0.3)
15-
cocoapods (1.7.5)
34+
cocoapods (1.9.1)
1635
activesupport (>= 4.0.2, < 5)
1736
claide (>= 1.0.2, < 2.0)
18-
cocoapods-core (= 1.7.5)
37+
cocoapods-core (= 1.9.1)
1938
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2039
cocoapods-downloader (>= 1.2.2, < 2.0)
2140
cocoapods-plugins (>= 1.0.0, < 2.0)
2241
cocoapods-search (>= 1.0.0, < 2.0)
2342
cocoapods-stats (>= 1.0.0, < 2.0)
24-
cocoapods-trunk (>= 1.3.1, < 2.0)
43+
cocoapods-trunk (>= 1.4.0, < 2.0)
2544
cocoapods-try (>= 1.1.0, < 2.0)
2645
colored2 (~> 3.1)
2746
escape (~> 0.0.4)
@@ -30,59 +49,66 @@ GEM
3049
molinillo (~> 0.6.6)
3150
nap (~> 1.0)
3251
ruby-macho (~> 1.4)
33-
xcodeproj (>= 1.10.0, < 2.0)
34-
cocoapods-core (1.7.5)
52+
xcodeproj (>= 1.14.0, < 2.0)
53+
cocoapods-core (1.9.1)
3554
activesupport (>= 4.0.2, < 6)
55+
algoliasearch (~> 1.0)
56+
concurrent-ruby (~> 1.1)
3657
fuzzy_match (~> 2.0.4)
3758
nap (~> 1.0)
59+
netrc (~> 0.11)
60+
typhoeus (~> 1.0)
3861
cocoapods-deintegrate (1.0.4)
39-
cocoapods-downloader (1.2.2)
62+
cocoapods-downloader (1.3.0)
4063
cocoapods-plugins (1.0.0)
4164
nap
4265
cocoapods-search (1.0.0)
4366
cocoapods-stats (1.1.0)
44-
cocoapods-trunk (1.4.0)
67+
cocoapods-trunk (1.4.1)
4568
nap (>= 0.8, < 2.0)
4669
netrc (~> 0.11)
4770
cocoapods-try (1.1.0)
4871
colored (1.2)
4972
colored2 (3.1.2)
5073
commander-fastlane (4.4.6)
5174
highline (~> 1.7.2)
52-
concurrent-ruby (1.1.5)
75+
concurrent-ruby (1.1.6)
5376
declarative (0.0.10)
5477
declarative-option (0.1.0)
55-
digest-crc (0.4.1)
78+
digest-crc (0.5.1)
5679
domain_name (0.5.20190701)
5780
unf (>= 0.0.5, < 1.0.0)
5881
dotenv (2.7.5)
5982
emoji_regex (1.0.1)
6083
escape (0.0.4)
61-
excon (0.66.0)
62-
faraday (0.15.4)
84+
ethon (0.12.0)
85+
ffi (>= 1.3.0)
86+
excon (0.73.0)
87+
faraday (0.17.3)
6388
multipart-post (>= 1.2, < 3)
6489
faraday-cookie_jar (0.0.6)
6590
faraday (>= 0.7.4)
6691
http-cookie (~> 1.0.0)
6792
faraday_middleware (0.13.1)
6893
faraday (>= 0.7.4, < 1.0)
69-
fastimage (2.1.5)
70-
fastlane (2.129.0)
94+
fastimage (2.1.7)
95+
fastlane (2.145.0)
7196
CFPropertyList (>= 2.3, < 4.0.0)
7297
addressable (>= 2.3, < 3.0.0)
98+
aws-sdk-s3 (~> 1.0)
7399
babosa (>= 1.0.2, < 2.0.0)
74100
bundler (>= 1.12.0, < 3.0.0)
75101
colored
76102
commander-fastlane (>= 4.4.6, < 5.0.0)
77103
dotenv (>= 2.1.1, < 3.0.0)
78104
emoji_regex (>= 0.1, < 2.0)
79-
excon (>= 0.45.0, < 1.0.0)
80-
faraday (~> 0.9)
105+
excon (>= 0.71.0, < 1.0.0)
106+
faraday (~> 0.17)
81107
faraday-cookie_jar (~> 0.0.6)
82-
faraday_middleware (~> 0.9)
108+
faraday_middleware (~> 0.13.1)
83109
fastimage (>= 2.1.0, < 3.0.0)
84110
gh_inspector (>= 1.1.2, < 2.0.0)
85-
google-api-client (>= 0.21.2, < 0.24.0)
111+
google-api-client (>= 0.29.2, < 0.37.0)
86112
google-cloud-storage (>= 1.15.0, < 2.0.0)
87113
highline (>= 1.7.2, < 2.0.0)
88114
json (< 3.0.0)
@@ -92,7 +118,7 @@ GEM
92118
multipart-post (~> 2.0.0)
93119
plist (>= 3.1.0, < 4.0.0)
94120
public_suffix (~> 2.0.0)
95-
rubyzip (>= 1.2.2, < 2.0.0)
121+
rubyzip (>= 1.3.0, < 2.0.0)
96122
security (= 0.1.3)
97123
simctl (~> 1.6.3)
98124
slack-notifier (>= 2.0.0, < 3.0.0)
@@ -101,59 +127,63 @@ GEM
101127
tty-screen (>= 0.6.3, < 1.0.0)
102128
tty-spinner (>= 0.8.0, < 1.0.0)
103129
word_wrap (~> 1.0.0)
104-
xcodeproj (>= 1.8.1, < 2.0.0)
130+
xcodeproj (>= 1.13.0, < 2.0.0)
105131
xcpretty (~> 0.3.0)
106132
xcpretty-travis-formatter (>= 0.0.3)
133+
ffi (1.12.2)
107134
fourflusher (2.3.1)
108135
fuzzy_match (2.0.4)
109136
gh_inspector (1.1.3)
110-
google-api-client (0.23.9)
137+
google-api-client (0.36.4)
111138
addressable (~> 2.5, >= 2.5.1)
112-
googleauth (>= 0.5, < 0.7.0)
139+
googleauth (~> 0.9)
113140
httpclient (>= 2.8.1, < 3.0)
114-
mime-types (~> 3.0)
141+
mini_mime (~> 1.0)
115142
representable (~> 3.0)
116143
retriable (>= 2.0, < 4.0)
117-
signet (~> 0.9)
118-
google-cloud-core (1.3.1)
144+
signet (~> 0.12)
145+
google-cloud-core (1.5.0)
119146
google-cloud-env (~> 1.0)
120-
google-cloud-env (1.2.1)
121-
faraday (~> 0.11)
122-
google-cloud-storage (1.16.0)
147+
google-cloud-errors (~> 1.0)
148+
google-cloud-env (1.3.1)
149+
faraday (>= 0.17.3, < 2.0)
150+
google-cloud-errors (1.0.0)
151+
google-cloud-storage (1.26.0)
152+
addressable (~> 2.5)
123153
digest-crc (~> 0.4)
124-
google-api-client (~> 0.23)
154+
google-api-client (~> 0.33)
125155
google-cloud-core (~> 1.2)
126-
googleauth (>= 0.6.2, < 0.10.0)
127-
googleauth (0.6.7)
128-
faraday (~> 0.12)
156+
googleauth (~> 0.9)
157+
mini_mime (~> 1.0)
158+
googleauth (0.11.0)
159+
faraday (>= 0.17.3, < 2.0)
129160
jwt (>= 1.4, < 3.0)
130161
memoist (~> 0.16)
131162
multi_json (~> 1.11)
132163
os (>= 0.9, < 2.0)
133-
signet (~> 0.7)
164+
signet (~> 0.12)
134165
highline (1.7.10)
135166
http-cookie (1.0.3)
136167
domain_name (~> 0.5)
137168
httpclient (2.8.3)
138169
i18n (0.9.5)
139170
concurrent-ruby (~> 1.0)
140-
json (2.2.0)
171+
jmespath (1.4.0)
172+
json (2.3.0)
141173
jwt (2.1.0)
142-
memoist (0.16.0)
143-
mime-types (3.2.2)
144-
mime-types-data (~> 3.2015)
145-
mime-types-data (3.2019.0331)
146-
mini_magick (4.9.5)
147-
minitest (5.11.3)
174+
memoist (0.16.2)
175+
mini_magick (4.10.1)
176+
mini_mime (1.0.2)
177+
minitest (5.14.0)
148178
molinillo (0.6.6)
149-
multi_json (1.13.1)
179+
multi_json (1.14.1)
150180
multi_xml (0.6.0)
151181
multipart-post (2.0.0)
152182
nanaimo (0.2.6)
153183
nap (1.1.0)
154184
naturally (2.2.0)
155185
netrc (0.11.0)
156-
os (1.0.1)
186+
os (1.1.0)
157187
plist (3.5.0)
158188
public_suffix (2.0.5)
159189
representable (3.0.4)
@@ -163,34 +193,36 @@ GEM
163193
retriable (3.1.2)
164194
rouge (2.0.7)
165195
ruby-macho (1.4.0)
166-
rubyzip (1.2.3)
196+
rubyzip (1.3.0)
167197
security (0.1.3)
168-
signet (0.11.0)
198+
signet (0.14.0)
169199
addressable (~> 2.3)
170-
faraday (~> 0.9)
200+
faraday (>= 0.17.3, < 2.0)
171201
jwt (>= 1.5, < 3.0)
172202
multi_json (~> 1.10)
173-
simctl (1.6.5)
203+
simctl (1.6.8)
174204
CFPropertyList
175205
naturally
176206
slack-notifier (2.3.2)
177207
terminal-notifier (2.0.0)
178208
terminal-table (1.8.0)
179209
unicode-display_width (~> 1.1, >= 1.1.1)
180210
thread_safe (0.3.6)
181-
tty-cursor (0.7.0)
182-
tty-screen (0.7.0)
183-
tty-spinner (0.9.1)
211+
tty-cursor (0.7.1)
212+
tty-screen (0.7.1)
213+
tty-spinner (0.9.3)
184214
tty-cursor (~> 0.7)
185-
tzinfo (1.2.5)
215+
typhoeus (1.3.1)
216+
ethon (>= 0.9.0)
217+
tzinfo (1.2.7)
186218
thread_safe (~> 0.1)
187219
uber (0.1.0)
188220
unf (0.1.4)
189221
unf_ext
190-
unf_ext (0.0.7.6)
191-
unicode-display_width (1.6.0)
222+
unf_ext (0.0.7.7)
223+
unicode-display_width (1.7.0)
192224
word_wrap (1.0.0)
193-
xcodeproj (1.12.0)
225+
xcodeproj (1.16.0)
194226
CFPropertyList (>= 2.3.3, < 4.0)
195227
atomos (~> 0.1.3)
196228
claide (>= 1.0.2, < 2.0)
@@ -209,4 +241,4 @@ DEPENDENCIES
209241
fastlane
210242

211243
BUNDLED WITH
212-
1.17.3
244+
2.1.4

‎NSObject+Rx.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 = "NSObject+Rx"
3-
s.version = "5.0.3"
3+
s.version = "5.1.0"
44
s.summary = "Handy RxSwift extensions on NSObject."
55
s.description = <<-DESC
66
Right now, we just have a `rx_disposeBag` property, but we're open to PRs!
@@ -15,9 +15,9 @@ Pod::Spec.new do |s|
1515
s.watchos.deployment_target = '3.0'
1616
s.tvos.deployment_target = '9.0'
1717

18-
s.swift_version = '5.0'
18+
s.swift_version = '5.2'
1919
s.source = { :git => "https://github.com/RxSwiftCommunity/NSObject-Rx.git", :tag => s.version }
2020
s.source_files = %w(NSObject+Rx.swift HasDisposeBag.swift)
2121
s.frameworks = "Foundation"
22-
s.dependency 'RxSwift', '~> 5.0'
22+
s.dependency 'RxSwift', '~> 5.1'
2323
end

‎Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ let package = Package(
1111
.library(name: "NSObject-Rx", targets: ["NSObject-Rx"]),
1212
],
1313
dependencies: [
14-
.package(url: "https://github.com/ReactiveX/RxSwift", from: "5.0.1"),
14+
.package(url: "https://github.com/ReactiveX/RxSwift", from: "5.1.1"),
1515
],
1616
targets: [
1717
.target(

0 commit comments

Comments
 (0)