Skip to content

Commit 4006ec1

Browse files
authored
Update to support Fastlane 2.148.1 (#126)
This solves a dependency clash issue between faraday and octokit.
2 parents 1105ba5 + 4f1c4bc commit 4006ec1

File tree

4 files changed

+82
-48
lines changed

4 files changed

+82
-48
lines changed

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
.DS_Store
22
/tmp
33

4+
# Ruby / Bundler
5+
.bundle/
6+
7+
# Fastlane
8+
fastlane/README.md
9+
fastlane/report.xml
10+
411
# Testing
512
/test_results
613
/coverage

Gemfile.lock

Lines changed: 67 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
PATH
22
remote: .
33
specs:
4-
fastlane-plugin-wpmreleasetoolkit (0.9.2)
4+
fastlane-plugin-wpmreleasetoolkit (0.9.5)
55
activesupport (~> 4)
66
chroma (= 0.2.0)
77
diffy (~> 3.3)
88
git (~> 1.3)
99
jsonlint
1010
nokogiri (>= 1.10.4)
11-
octokit (~> 4.13)
11+
octokit (~> 4.18)
1212
parallel (~> 1.14)
1313
progress_bar (~> 1.3)
1414
rake (~> 12.3)
@@ -17,8 +17,8 @@ PATH
1717
GEM
1818
remote: https://rubygems.org/
1919
specs:
20-
CFPropertyList (3.0.1)
21-
activesupport (4.2.11.1)
20+
CFPropertyList (3.0.2)
21+
activesupport (4.2.11.3)
2222
i18n (~> 0.7)
2323
minitest (~> 5.1)
2424
thread_safe (~> 0.3, >= 0.3.4)
@@ -27,6 +27,22 @@ GEM
2727
public_suffix (>= 2.0.2, < 5.0)
2828
ast (2.4.0)
2929
atomos (0.1.3)
30+
aws-eventstream (1.1.0)
31+
aws-partitions (1.322.0)
32+
aws-sdk-core (3.97.0)
33+
aws-eventstream (~> 1, >= 1.0.2)
34+
aws-partitions (~> 1, >= 1.239.0)
35+
aws-sigv4 (~> 1.1)
36+
jmespath (~> 1.0)
37+
aws-sdk-kms (1.32.0)
38+
aws-sdk-core (~> 3, >= 3.71.0)
39+
aws-sigv4 (~> 1.1)
40+
aws-sdk-s3 (1.67.0)
41+
aws-sdk-core (~> 3, >= 3.96.1)
42+
aws-sdk-kms (~> 1)
43+
aws-sigv4 (~> 1.1)
44+
aws-sigv4 (1.1.4)
45+
aws-eventstream (~> 1.0, >= 1.0.2)
3046
babosa (1.0.3)
3147
chroma (0.2.0)
3248
claide (1.0.3)
@@ -44,37 +60,38 @@ GEM
4460
declarative-option (0.1.0)
4561
diff-lcs (1.3)
4662
diffy (3.3.0)
47-
digest-crc (0.4.1)
63+
digest-crc (0.5.1)
4864
docile (1.3.1)
4965
domain_name (0.5.20190701)
5066
unf (>= 0.0.5, < 1.0.0)
5167
dotenv (2.7.5)
5268
emoji_regex (1.0.1)
53-
excon (0.71.0)
54-
faraday (0.15.4)
69+
excon (0.73.0)
70+
faraday (1.0.1)
5571
multipart-post (>= 1.2, < 3)
5672
faraday-cookie_jar (0.0.6)
5773
faraday (>= 0.7.4)
5874
http-cookie (~> 1.0.0)
59-
faraday_middleware (0.13.1)
60-
faraday (>= 0.7.4, < 1.0)
75+
faraday_middleware (1.0.0)
76+
faraday (~> 1.0)
6177
fastimage (2.1.7)
62-
fastlane (2.133.0)
78+
fastlane (2.148.1)
6379
CFPropertyList (>= 2.3, < 4.0.0)
6480
addressable (>= 2.3, < 3.0.0)
81+
aws-sdk-s3 (~> 1.0)
6582
babosa (>= 1.0.2, < 2.0.0)
6683
bundler (>= 1.12.0, < 3.0.0)
6784
colored
6885
commander-fastlane (>= 4.4.6, < 5.0.0)
6986
dotenv (>= 2.1.1, < 3.0.0)
7087
emoji_regex (>= 0.1, < 2.0)
71-
excon (>= 0.45.0, < 1.0.0)
72-
faraday (< 0.16.0)
88+
excon (>= 0.71.0, < 1.0.0)
89+
faraday (>= 0.17, < 2.0)
7390
faraday-cookie_jar (~> 0.0.6)
74-
faraday_middleware (< 0.16.0)
91+
faraday_middleware (>= 0.13.1, < 2.0)
7592
fastimage (>= 2.1.0, < 3.0.0)
7693
gh_inspector (>= 1.1.2, < 2.0.0)
77-
google-api-client (>= 0.21.2, < 0.24.0)
94+
google-api-client (>= 0.37.0, < 0.39.0)
7895
google-cloud-storage (>= 1.15.0, < 2.0.0)
7996
highline (>= 1.7.2, < 2.0.0)
8097
json (< 3.0.0)
@@ -93,57 +110,60 @@ GEM
93110
tty-screen (>= 0.6.3, < 1.0.0)
94111
tty-spinner (>= 0.8.0, < 1.0.0)
95112
word_wrap (~> 1.0.0)
96-
xcodeproj (>= 1.8.1, < 2.0.0)
113+
xcodeproj (>= 1.13.0, < 2.0.0)
97114
xcpretty (~> 0.3.0)
98115
xcpretty-travis-formatter (>= 0.0.3)
99116
gh_inspector (1.1.3)
100117
git (1.7.0)
101118
rchardet (~> 1.8)
102-
google-api-client (0.23.9)
119+
google-api-client (0.38.0)
103120
addressable (~> 2.5, >= 2.5.1)
104-
googleauth (>= 0.5, < 0.7.0)
121+
googleauth (~> 0.9)
105122
httpclient (>= 2.8.1, < 3.0)
106-
mime-types (~> 3.0)
123+
mini_mime (~> 1.0)
107124
representable (~> 3.0)
108125
retriable (>= 2.0, < 4.0)
109-
signet (~> 0.9)
110-
google-cloud-core (1.3.1)
126+
signet (~> 0.12)
127+
google-cloud-core (1.5.0)
111128
google-cloud-env (~> 1.0)
112-
google-cloud-env (1.2.1)
113-
faraday (~> 0.11)
114-
google-cloud-storage (1.16.0)
129+
google-cloud-errors (~> 1.0)
130+
google-cloud-env (1.3.2)
131+
faraday (>= 0.17.3, < 2.0)
132+
google-cloud-errors (1.0.1)
133+
google-cloud-storage (1.26.2)
134+
addressable (~> 2.5)
115135
digest-crc (~> 0.4)
116-
google-api-client (~> 0.23)
136+
google-api-client (~> 0.33)
117137
google-cloud-core (~> 1.2)
118-
googleauth (>= 0.6.2, < 0.10.0)
119-
googleauth (0.6.7)
120-
faraday (~> 0.12)
138+
googleauth (~> 0.9)
139+
mini_mime (~> 1.0)
140+
googleauth (0.12.0)
141+
faraday (>= 0.17.3, < 2.0)
121142
jwt (>= 1.4, < 3.0)
122143
memoist (~> 0.16)
123144
multi_json (~> 1.11)
124145
os (>= 0.9, < 2.0)
125-
signet (~> 0.7)
146+
signet (~> 0.14)
126147
highline (1.7.10)
127148
http-cookie (1.0.3)
128149
domain_name (~> 0.5)
129150
httpclient (2.8.3)
130151
i18n (0.9.5)
131152
concurrent-ruby (~> 1.0)
132153
jaro_winkler (1.5.3)
133-
json (2.2.0)
154+
jmespath (1.4.0)
155+
json (2.3.0)
134156
jsonlint (0.3.0)
135157
oj (~> 3)
136158
optimist (~> 3)
137159
jwt (2.1.0)
138-
memoist (0.16.0)
160+
memoist (0.16.2)
139161
method_source (0.9.2)
140-
mime-types (3.3)
141-
mime-types-data (~> 3.2015)
142-
mime-types-data (3.2019.0904)
143-
mini_magick (4.9.5)
162+
mini_magick (4.10.1)
163+
mini_mime (1.0.2)
144164
mini_portile2 (2.4.0)
145-
minitest (5.14.0)
146-
multi_json (1.13.1)
165+
minitest (5.14.1)
166+
multi_json (1.14.1)
147167
multi_xml (0.6.0)
148168
multipart-post (2.0.0)
149169
nanaimo (0.2.6)
@@ -156,8 +176,8 @@ GEM
156176
oj (3.10.6)
157177
optimist (3.0.1)
158178
options (2.3.2)
159-
os (1.0.1)
160-
parallel (1.17.0)
179+
os (1.1.0)
180+
parallel (1.19.1)
161181
parser (2.6.4.1)
162182
ast (~> 2.4.0)
163183
plist (3.5.0)
@@ -212,12 +232,12 @@ GEM
212232
addressable (>= 2.3.5)
213233
faraday (> 0.8, < 2.0)
214234
security (0.1.3)
215-
signet (0.11.0)
235+
signet (0.14.0)
216236
addressable (~> 2.3)
217-
faraday (~> 0.9)
237+
faraday (>= 0.17.3, < 2.0)
218238
jwt (>= 1.5, < 3.0)
219239
multi_json (~> 1.10)
220-
simctl (1.6.6)
240+
simctl (1.6.8)
221241
CFPropertyList
222242
naturally
223243
simplecov (0.16.1)
@@ -230,20 +250,20 @@ GEM
230250
terminal-table (1.8.0)
231251
unicode-display_width (~> 1.1, >= 1.1.1)
232252
thread_safe (0.3.6)
233-
tty-cursor (0.7.0)
234-
tty-screen (0.7.0)
235-
tty-spinner (0.9.1)
253+
tty-cursor (0.7.1)
254+
tty-screen (0.8.0)
255+
tty-spinner (0.9.3)
236256
tty-cursor (~> 0.7)
237257
tzinfo (1.2.7)
238258
thread_safe (~> 0.1)
239259
uber (0.1.0)
240260
unf (0.1.4)
241261
unf_ext
242-
unf_ext (0.0.7.6)
243-
unicode-display_width (1.6.0)
262+
unf_ext (0.0.7.7)
263+
unicode-display_width (1.6.1)
244264
url (0.3.2)
245265
word_wrap (1.0.0)
246-
xcodeproj (1.12.0)
266+
xcodeproj (1.16.0)
247267
CFPropertyList (>= 2.3.3, < 4.0)
248268
atomos (~> 0.1.3)
249269
claide (>= 1.0.2, < 2.0)

ext/drawText/.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Build/
2+
Logs
3+
Makefile
4+
ModuleCache.noindex/
5+
drawText.bundle
6+
info.plist
7+
mkmf.log

fastlane-plugin-wpmreleasetoolkit.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
3535
# spec.add_dependency 'your-dependency', '~> 1.0.0'
3636
spec.add_dependency 'diffy', '~> 3.3'
3737
spec.add_dependency 'nokogiri', '>= 1.10.4'
38-
spec.add_dependency 'octokit', '~> 4.13'
38+
spec.add_dependency 'octokit', '~> 4.18'
3939
spec.add_dependency 'git', '~> 1.3'
4040
spec.add_dependency 'jsonlint'
4141
spec.add_dependency('rake', '~> 12.3')

0 commit comments

Comments
 (0)