Skip to content
This repository was archived by the owner on Aug 26, 2021. It is now read-only.

Commit 2dd315d

Browse files
author
Rogerio de Paula Assis
committed
Merge branch 'release/3.4.0'
2 parents ed5f778 + 3154509 commit 2dd315d

File tree

133 files changed

+4881
-3135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+4881
-3135
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
BUNDLE_PATH: vendor/bundle
77
FL_OUTPUT_DIR: output
88
macos:
9-
xcode: "9.4.1"
9+
xcode: "10.1.0"
1010
working_directory: ~/VimeoNetworking
1111
shell: /bin/bash --login -o pipefail
1212

@@ -26,7 +26,7 @@ jobs:
2626

2727
- run:
2828
name: Build and run iOS tests
29-
command: bundle exec fastlane scan
29+
command: bundle exec fastlane ios test
3030
environment:
3131
SCAN_DEVICE: iPhone 8
3232
SCAN_SCHEME: VimeoNetworkingExample-iOS
@@ -47,4 +47,4 @@ workflows:
4747
build:
4848
jobs:
4949
- build-and-test
50-
50+

.swiftlint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
whitelist_rules:
2525
- trailing_newline
2626
- trailing_whitespace
27+
- opening_brace
2728

2829
# Paths to include during linting.
2930
included:

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
source 'https://rubygems.org'
2-
gem 'fastlane', '2.42.0'
2+
gem 'fastlane', '2.108.0'
33
gem 'cocoapods', '1.5.2'
44
gem 'danger', '4.0.4'
55
gem 'xcode-install', '2.1.0'
66
gem 'xcpretty-json-formatter', '0.1.0'
77
gem 'danger-xcode_summary', '0.1.0'
8-
gem 'nokogiri', '1.6.0'
8+
gem 'nokogiri', '1.8.5'
99
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
1010
eval(File.read(plugins_path), binding) if File.exist?(plugins_path)

Gemfile.lock

Lines changed: 63 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (2.3.6)
4+
CFPropertyList (3.0.0)
55
activesupport (4.2.10)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
1010
addressable (2.5.2)
1111
public_suffix (>= 2.0.2, < 4.0)
12-
atomos (0.1.2)
12+
atomos (0.1.3)
1313
babosa (1.0.2)
1414
claide (1.0.2)
1515
claide-plugins (0.9.2)
@@ -40,12 +40,12 @@ GEM
4040
fuzzy_match (~> 2.0.4)
4141
nap (~> 1.0)
4242
cocoapods-deintegrate (1.0.2)
43-
cocoapods-downloader (1.2.0)
43+
cocoapods-downloader (1.2.2)
4444
cocoapods-plugins (1.0.0)
4545
nap
4646
cocoapods-search (1.0.0)
4747
cocoapods-stats (1.0.0)
48-
cocoapods-trunk (1.3.0)
48+
cocoapods-trunk (1.3.1)
4949
nap (>= 0.8, < 2.0)
5050
netrc (~> 0.11)
5151
cocoapods-try (1.1.0)
@@ -54,7 +54,7 @@ GEM
5454
colorize (0.8.1)
5555
commander-fastlane (4.4.6)
5656
highline (~> 1.7.2)
57-
concurrent-ruby (1.0.5)
57+
concurrent-ruby (1.1.3)
5858
cork (0.3.0)
5959
colored2 (~> 3.1)
6060
danger (4.0.4)
@@ -76,10 +76,11 @@ GEM
7676
declarative-option (0.1.0)
7777
domain_name (0.5.20180417)
7878
unf (>= 0.0.5, < 1.0.0)
79-
dotenv (2.4.0)
79+
dotenv (2.5.0)
80+
emoji_regex (0.1.1)
8081
escape (0.0.4)
8182
excon (0.62.0)
82-
faraday (0.15.2)
83+
faraday (0.15.3)
8384
multipart-post (>= 1.2, < 3)
8485
faraday-cookie_jar (0.0.6)
8586
faraday (>= 0.7.4)
@@ -88,38 +89,42 @@ GEM
8889
faraday (~> 0.8)
8990
faraday_middleware (0.12.2)
9091
faraday (>= 0.7.4, < 1.0)
91-
fastimage (2.1.3)
92-
fastlane (2.42.0)
93-
CFPropertyList (>= 2.3, < 3.0.0)
92+
fastimage (2.1.4)
93+
fastlane (2.108.0)
94+
CFPropertyList (>= 2.3, < 4.0.0)
9495
addressable (>= 2.3, < 3.0.0)
9596
babosa (>= 1.0.2, < 2.0.0)
9697
bundler (>= 1.12.0, < 2.0.0)
9798
colored
98-
commander-fastlane (>= 4.4.0, < 5.0.0)
99+
commander-fastlane (>= 4.4.6, < 5.0.0)
99100
dotenv (>= 2.1.1, < 3.0.0)
101+
emoji_regex (~> 0.1)
100102
excon (>= 0.45.0, < 1.0.0)
101103
faraday (~> 0.9)
102104
faraday-cookie_jar (~> 0.0.6)
103105
faraday_middleware (~> 0.9)
104-
fastimage (>= 1.6)
105-
gh_inspector (>= 1.0.1, < 2.0.0)
106-
google-api-client (>= 0.12.0, < 0.13.0)
106+
fastimage (>= 2.1.0, < 3.0.0)
107+
gh_inspector (>= 1.1.2, < 2.0.0)
108+
google-api-client (>= 0.21.2, < 0.24.0)
107109
highline (>= 1.7.2, < 2.0.0)
108110
json (< 3.0.0)
109111
mini_magick (~> 4.5.1)
110112
multi_json
111113
multi_xml (~> 0.5)
112114
multipart-post (~> 2.0.0)
113115
plist (>= 3.1.0, < 4.0.0)
114-
rubyzip (>= 1.1.0, < 2.0.0)
116+
public_suffix (~> 2.0.0)
117+
rubyzip (>= 1.2.2, < 2.0.0)
115118
security (= 0.1.3)
116-
slack-notifier (>= 1.3, < 2.0.0)
119+
simctl (~> 1.6.3)
120+
slack-notifier (>= 2.0.0, < 3.0.0)
117121
terminal-notifier (>= 1.6.2, < 2.0.0)
118122
terminal-table (>= 1.4.5, < 2.0.0)
119-
tty-screen (~> 0.5.0)
123+
tty-screen (>= 0.6.3, < 1.0.0)
124+
tty-spinner (>= 0.8.0, < 1.0.0)
120125
word_wrap (~> 1.0.0)
121-
xcodeproj (>= 1.4.4, < 2.0.0)
122-
xcpretty (>= 0.2.4, < 1.0.0)
126+
xcodeproj (>= 1.6.0, < 2.0.0)
127+
xcpretty (~> 0.3.0)
123128
xcpretty-travis-formatter (>= 0.0.3)
124129
fastlane-plugin-pretty_junit (0.1.1)
125130
colorize
@@ -128,21 +133,21 @@ GEM
128133
fourflusher (2.0.1)
129134
fuzzy_match (2.0.4)
130135
gh_inspector (1.1.3)
131-
git (1.4.0)
132-
google-api-client (0.12.0)
136+
git (1.5.0)
137+
google-api-client (0.23.9)
133138
addressable (~> 2.5, >= 2.5.1)
134-
googleauth (~> 0.5)
139+
googleauth (>= 0.5, < 0.7.0)
135140
httpclient (>= 2.8.1, < 3.0)
136141
mime-types (~> 3.0)
137142
representable (~> 3.0)
138143
retriable (>= 2.0, < 4.0)
139-
googleauth (0.6.2)
144+
signet (~> 0.9)
145+
googleauth (0.6.7)
140146
faraday (~> 0.12)
141147
jwt (>= 1.4, < 3.0)
142-
logging (~> 2.0)
143-
memoist (~> 0.12)
148+
memoist (~> 0.16)
144149
multi_json (~> 1.11)
145-
os (~> 0.9)
150+
os (>= 0.9, < 2.0)
146151
signet (~> 0.7)
147152
highline (1.7.10)
148153
http-cookie (1.0.3)
@@ -152,74 +157,77 @@ GEM
152157
concurrent-ruby (~> 1.0)
153158
json (2.1.0)
154159
jwt (2.1.0)
155-
kramdown (1.16.2)
156-
little-plugger (1.1.4)
157-
logging (2.2.2)
158-
little-plugger (~> 1.1)
159-
multi_json (~> 1.10)
160+
kramdown (1.17.0)
160161
memoist (0.16.0)
161-
mime-types (3.1)
162+
mime-types (3.2.2)
162163
mime-types-data (~> 3.2015)
163-
mime-types-data (3.2016.0521)
164+
mime-types-data (3.2018.0812)
164165
mini_magick (4.5.1)
165-
mini_portile (0.5.3)
166+
mini_portile2 (2.3.0)
166167
minitest (5.11.3)
167-
molinillo (0.6.5)
168+
molinillo (0.6.6)
168169
multi_json (1.13.1)
169170
multi_xml (0.6.0)
170171
multipart-post (2.0.0)
171-
nanaimo (0.2.5)
172+
nanaimo (0.2.6)
172173
nap (1.1.0)
174+
naturally (2.2.0)
173175
netrc (0.11.0)
174-
nokogiri (1.6.0)
175-
mini_portile (~> 0.5.0)
176-
octokit (4.9.0)
176+
nokogiri (1.8.5)
177+
mini_portile2 (~> 2.3.0)
178+
octokit (4.13.0)
177179
sawyer (~> 0.8.0, >= 0.5.3)
178180
open4 (1.3.4)
179-
os (0.9.6)
181+
os (1.0.0)
180182
plist (3.4.0)
181-
public_suffix (3.0.2)
183+
public_suffix (2.0.5)
182184
representable (3.0.4)
183185
declarative (< 0.1.0)
184186
declarative-option (< 0.2.0)
185187
uber (< 0.2.0)
186-
retriable (3.1.1)
188+
retriable (3.1.2)
187189
rouge (2.0.7)
188-
ruby-macho (1.1.0)
189-
rubyzip (1.2.1)
190+
ruby-macho (1.3.1)
191+
rubyzip (1.2.2)
190192
sawyer (0.8.1)
191193
addressable (>= 2.3.5, < 2.6)
192194
faraday (~> 0.8, < 1.0)
193195
security (0.1.3)
194-
signet (0.8.1)
196+
signet (0.11.0)
195197
addressable (~> 2.3)
196198
faraday (~> 0.9)
197199
jwt (>= 1.5, < 3.0)
198200
multi_json (~> 1.10)
199-
slack-notifier (1.5.1)
201+
simctl (1.6.5)
202+
CFPropertyList
203+
naturally
204+
slack-notifier (2.3.2)
200205
terminal-notifier (1.8.0)
201206
terminal-table (1.8.0)
202207
unicode-display_width (~> 1.1, >= 1.1.1)
203208
thread_safe (0.3.6)
204-
tty-screen (0.5.1)
209+
tty-cursor (0.6.0)
210+
tty-screen (0.6.5)
211+
tty-spinner (0.8.0)
212+
tty-cursor (>= 0.5.0)
205213
tzinfo (1.2.5)
206214
thread_safe (~> 0.1)
207215
uber (0.1.0)
208216
unf (0.1.4)
209217
unf_ext
210218
unf_ext (0.0.7.5)
211-
unicode-display_width (1.3.2)
219+
unicode-display_width (1.4.0)
212220
word_wrap (1.0.0)
213221
xcode-install (2.1.0)
214222
claide (>= 0.9.1, < 1.1.0)
215223
fastlane (>= 2.1.1, < 3.0.0)
216-
xcodeproj (1.5.9)
224+
xcodeproj (1.7.0)
217225
CFPropertyList (>= 2.3.3, < 4.0)
218-
atomos (~> 0.1.2)
226+
atomos (~> 0.1.3)
219227
claide (>= 1.0.2, < 2.0)
220228
colored2 (~> 3.1)
221-
nanaimo (~> 0.2.5)
222-
xcpretty (0.2.8)
229+
nanaimo (~> 0.2.6)
230+
xcpretty (0.3.0)
223231
rouge (~> 2.0.7)
224232
xcpretty-json-formatter (0.1.0)
225233
xcpretty (~> 0.2, >= 0.0.7)
@@ -233,11 +241,11 @@ DEPENDENCIES
233241
cocoapods (= 1.5.2)
234242
danger (= 4.0.4)
235243
danger-xcode_summary (= 0.1.0)
236-
fastlane (= 2.42.0)
244+
fastlane (= 2.108.0)
237245
fastlane-plugin-pretty_junit
238-
nokogiri (= 1.6.0)
246+
nokogiri (= 1.8.5)
239247
xcode-install (= 2.1.0)
240248
xcpretty-json-formatter (= 0.1.0)
241249

242250
BUNDLED WITH
243-
1.15.3
251+
1.17.1

0 commit comments

Comments
 (0)