Skip to content

Commit ce05061

Browse files
m-waynem-wayne
authored
Merge pull request #9 from scribd/mwayne/rebase-with-upstream
Mwayne/rebase with upstream
2 parents 399fa76 + c09738c commit ce05061

File tree

88 files changed

+511
-267
lines changed

Some content is hidden

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

88 files changed

+511
-267
lines changed

‎CHANGELOG.latest.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
* [spaceship] Add support for Enterprise Program API (#22215) via GevaZeichner (@GevaZeichner)
2-
* Make test pass standalone (#22268) via Jerome Lacoste (@lacostej)
3-
* Add missing require 'ostruct' in erb_template_helper.rb to solve uninitialized constant Fastlane::OpenStruct (NameError) (#21950) via Nicolas G (@nicgodoy)
4-
* [Fastlane.Swift] Allow overriding LaneFileProtocol lifecycles when subclassing LaneFile (#20563) via Sven Tiigi (@SvenTiigi)
5-
* [Match][S3] Only download (and decrypt) files in the subfolder of the provided TeamID (#22199) via Olivier Halligon (@AliSoftware)
1+
This version has a required fix for authenticating with Apple via Apple ID. Apple started using their own variant of SRP (Secure Remote Password) using SHA-256 and 2048 bit hashing in the sign in flow. Any previous _fastlane_ versions will likely response a "503 Service Temporarily Unavailable" when authenicating with an Apple ID.
2+
3+
* [spaceship] New AppleID Auth with SRP (#26415) via Josh Holtz (@snatchev and @joshdholtz)

‎Gemfile.lock

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
fastlane (2.224.0)
4+
fastlane (2.225.0)
55
CFPropertyList (>= 2.3, < 4.0.0)
66
addressable (>= 2.8, < 3.0.0)
77
artifactory (~> 3.0)
@@ -17,6 +17,7 @@ PATH
1717
faraday-cookie_jar (~> 0.0.6)
1818
faraday_middleware (~> 1.0)
1919
fastimage (>= 2.1.0, < 3.0.0)
20+
fastlane-sirp (>= 1.0.0)
2021
gh_inspector (>= 1.1.2, < 2.0.0)
2122
google-apis-androidpublisher_v3 (~> 0.3)
2223
google-apis-playcustomapp_v1 (~> 0.1)
@@ -48,8 +49,8 @@ GEM
4849
specs:
4950
CFPropertyList (3.0.6)
5051
rexml
51-
addressable (2.8.5)
52-
public_suffix (>= 2.0.2, < 6.0)
52+
addressable (2.8.7)
53+
public_suffix (>= 2.0.2, < 7.0)
5354
artifactory (3.0.15)
5455
ast (2.4.2)
5556
atomos (0.1.3)
@@ -70,6 +71,7 @@ GEM
7071
aws-sigv4 (1.8.0)
7172
aws-eventstream (~> 1, >= 1.0.2)
7273
babosa (1.0.4)
74+
bigdecimal (3.1.8)
7375
binding_of_caller (0.8.0)
7476
debug_inspector (>= 0.0.1)
7577
byebug (11.1.3)
@@ -92,7 +94,8 @@ GEM
9294
term-ansicolor (~> 1.3)
9395
thor (>= 0.19.4, < 2.0)
9496
tins (~> 1.6)
95-
crack (0.4.5)
97+
crack (1.0.0)
98+
bigdecimal
9699
rexml
97100
danger (8.6.1)
98101
claide (~> 1.0)
@@ -141,6 +144,8 @@ GEM
141144
fastlane-plugin-clubmate (0.1.0)
142145
fastlane-plugin-ruby (0.1.3)
143146
fastlane-plugin-slack_train (0.2.0)
147+
fastlane-sirp (1.0.0)
148+
sysrandom (~> 1.0)
144149
gh_inspector (1.1.3)
145150
git (1.18.0)
146151
addressable (~> 2.8)
@@ -182,7 +187,7 @@ GEM
182187
multi_json (~> 1.11)
183188
os (>= 0.9, < 2.0)
184189
signet (>= 0.16, < 2.a)
185-
hashdiff (1.0.1)
190+
hashdiff (1.1.1)
186191
highline (2.0.3)
187192
http-cookie (1.0.5)
188193
domain_name (~> 0.5)
@@ -233,7 +238,7 @@ GEM
233238
pry-stack_explorer (0.4.12)
234239
binding_of_caller (~> 0.7)
235240
pry (~> 0.13)
236-
public_suffix (5.0.4)
241+
public_suffix (6.0.1)
237242
racc (1.7.1)
238243
rack (2.2.8)
239244
rack-protection (2.2.4)
@@ -248,7 +253,8 @@ GEM
248253
trailblazer-option (>= 0.1.1, < 0.2.0)
249254
uber (< 0.2.0)
250255
retriable (3.1.2)
251-
rexml (3.2.6)
256+
rexml (3.2.9)
257+
strscan
252258
rouge (2.0.7)
253259
rspec (3.12.0)
254260
rspec-core (~> 3.12.0)
@@ -308,7 +314,9 @@ GEM
308314
rack-protection (= 2.2.4)
309315
tilt (~> 2.0)
310316
slack-notifier (2.3.2)
317+
strscan (3.1.0)
311318
sync (0.5.0)
319+
sysrandom (1.0.5)
312320
term-ansicolor (1.7.1)
313321
tins (~> 1.0)
314322
terminal-notifier (2.0.0)
@@ -325,7 +333,7 @@ GEM
325333
tty-cursor (~> 0.7)
326334
uber (0.1.0)
327335
unicode-display_width (2.4.2)
328-
webmock (3.18.1)
336+
webmock (3.24.0)
329337
addressable (>= 2.8.0)
330338
crack (>= 0.3.2)
331339
hashdiff (>= 0.4.0, < 2.0.0)

‎README.md

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -35,49 +35,81 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
3535
<!-- This table is regenerated and resorted on each release -->
3636
<table id='team'>
3737
<tr>
38-
<td id='manu-wallner'>
39-
<a href='https://github.com/milch'>
40-
<img src='https://github.com/milch.png' width='140px;'>
41-
</a>
42-
<h4 align='center'><a href='https://twitter.com/acrooow'>Manu Wallner</a></h4>
43-
</td>
44-
<td id='helmut-januschka'>
45-
<a href='https://github.com/hjanuschka'>
46-
<img src='https://github.com/hjanuschka.png' width='140px;'>
47-
</a>
48-
<h4 align='center'><a href='https://twitter.com/hjanuschka'>Helmut Januschka</a></h4>
49-
</td>
50-
<td id='max-ott'>
51-
<a href='https://github.com/max-ott'>
52-
<img src='https://github.com/max-ott.png' width='140px;'>
53-
</a>
54-
<h4 align='center'><a href='https://twitter.com/ott_max'>Max Ott</a></h4>
55-
</td>
5638
<td id='olivier-halligon'>
5739
<a href='https://github.com/AliSoftware'>
5840
<img src='https://github.com/AliSoftware.png' width='140px;'>
5941
</a>
6042
<h4 align='center'><a href='https://twitter.com/aligatr'>Olivier Halligon</a></h4>
6143
</td>
44+
<td id='stefan-natchev'>
45+
<a href='https://github.com/snatchev'>
46+
<img src='https://github.com/snatchev.png' width='140px;'>
47+
</a>
48+
<h4 align='center'><a href='https://twitter.com/snatchev'>Stefan Natchev</a></h4>
49+
</td>
6250
<td id='felix-krause'>
6351
<a href='https://github.com/KrauseFx'>
6452
<img src='https://github.com/KrauseFx.png' width='140px;'>
6553
</a>
6654
<h4 align='center'><a href='https://twitter.com/KrauseFx'>Felix Krause</a></h4>
6755
</td>
56+
<td id='kohki-miki'>
57+
<a href='https://github.com/giginet'>
58+
<img src='https://github.com/giginet.png' width='140px;'>
59+
</a>
60+
<h4 align='center'><a href='https://twitter.com/giginet'>Kohki Miki</a></h4>
61+
</td>
62+
<td id='luka-mirosevic'>
63+
<a href='https://github.com/lmirosevic'>
64+
<img src='https://github.com/lmirosevic.png' width='140px;'>
65+
</a>
66+
<h4 align='center'><a href='https://twitter.com/lmirosevic'>Luka Mirosevic</a></h4>
67+
</td>
6868
</tr>
6969
<tr>
70-
<td id='danielle-tomlinson'>
71-
<a href='https://github.com/endocrimes'>
72-
<img src='https://github.com/endocrimes.png' width='140px;'>
70+
<td id='matthew-ellis'>
71+
<a href='https://github.com/matthewellis'>
72+
<img src='https://github.com/matthewellis.png' width='140px;'>
7373
</a>
74-
<h4 align='center'><a href='https://twitter.com/endocrimes'>Danielle Tomlinson</a></h4>
74+
<h4 align='center'><a href='https://twitter.com/mellis1995'>Matthew Ellis</a></h4>
7575
</td>
76-
<td id='andrew-mcburney'>
77-
<a href='https://github.com/armcburney'>
78-
<img src='https://github.com/armcburney.png' width='140px;'>
76+
<td id='iulian-onofrei'>
77+
<a href='https://github.com/revolter'>
78+
<img src='https://github.com/revolter.png' width='140px;'>
7979
</a>
80-
<h4 align='center'><a href='https://twitter.com/armcburney'>Andrew McBurney</a></h4>
80+
<h4 align='center'><a href='https://twitter.com/Revolt666'>Iulian Onofrei</a></h4>
81+
</td>
82+
<td id='jérôme-lacoste'>
83+
<a href='https://github.com/lacostej'>
84+
<img src='https://github.com/lacostej.png' width='140px;'>
85+
</a>
86+
<h4 align='center'><a href='https://twitter.com/lacostej'>Jérôme Lacoste</a></h4>
87+
</td>
88+
<td id='fumiya-nakamura'>
89+
<a href='https://github.com/nafu'>
90+
<img src='https://github.com/nafu.png' width='140px;'>
91+
</a>
92+
<h4 align='center'><a href='https://twitter.com/nafu003'>Fumiya Nakamura</a></h4>
93+
</td>
94+
<td id='maksym-grebenets'>
95+
<a href='https://github.com/mgrebenets'>
96+
<img src='https://github.com/mgrebenets.png' width='140px;'>
97+
</a>
98+
<h4 align='center'><a href='https://twitter.com/mgrebenets'>Maksym Grebenets</a></h4>
99+
</td>
100+
</tr>
101+
<tr>
102+
<td id='jimmy-dee'>
103+
<a href='https://github.com/jdee'>
104+
<img src='https://github.com/jdee.png' width='140px;'>
105+
</a>
106+
<h4 align='center'>Jimmy Dee</h4>
107+
</td>
108+
<td id='manu-wallner'>
109+
<a href='https://github.com/milch'>
110+
<img src='https://github.com/milch.png' width='140px;'>
111+
</a>
112+
<h4 align='center'><a href='https://twitter.com/acrooow'>Manu Wallner</a></h4>
81113
</td>
82114
<td id='josh-holtz'>
83115
<a href='https://github.com/joshdholtz'>
@@ -91,57 +123,31 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
91123
</a>
92124
<h4 align='center'><a href='https://twitter.com/taquitos'>Joshua Liebowitz</a></h4>
93125
</td>
94-
<td id='fumiya-nakamura'>
95-
<a href='https://github.com/nafu'>
96-
<img src='https://github.com/nafu.png' width='140px;'>
97-
</a>
98-
<h4 align='center'><a href='https://twitter.com/nafu003'>Fumiya Nakamura</a></h4>
99-
</td>
100-
</tr>
101-
<tr>
102126
<td id='jorge-revuelta-h'>
103127
<a href='https://github.com/minuscorp'>
104128
<img src='https://github.com/minuscorp.png' width='140px;'>
105129
</a>
106130
<h4 align='center'><a href='https://twitter.com/minuscorp'>Jorge Revuelta H</a></h4>
107131
</td>
108-
<td id='roger-oba'>
109-
<a href='https://github.com/rogerluan'>
110-
<img src='https://github.com/rogerluan.png' width='140px;'>
132+
</tr>
133+
<tr>
134+
<td id='jan-piotrowski'>
135+
<a href='https://github.com/janpio'>
136+
<img src='https://github.com/janpio.png' width='140px;'>
111137
</a>
112-
<h4 align='center'><a href='https://twitter.com/rogerluan_'>Roger Oba</a></h4>
138+
<h4 align='center'><a href='https://twitter.com/Sujan'>Jan Piotrowski</a></h4>
113139
</td>
114140
<td id='satoshi-namai'>
115141
<a href='https://github.com/ainame'>
116142
<img src='https://github.com/ainame.png' width='140px;'>
117143
</a>
118144
<h4 align='center'><a href='https://twitter.com/ainame'>Satoshi Namai</a></h4>
119145
</td>
120-
<td id='matthew-ellis'>
121-
<a href='https://github.com/matthewellis'>
122-
<img src='https://github.com/matthewellis.png' width='140px;'>
123-
</a>
124-
<h4 align='center'><a href='https://twitter.com/mellis1995'>Matthew Ellis</a></h4>
125-
</td>
126-
<td id='kohki-miki'>
127-
<a href='https://github.com/giginet'>
128-
<img src='https://github.com/giginet.png' width='140px;'>
129-
</a>
130-
<h4 align='center'><a href='https://twitter.com/giginet'>Kohki Miki</a></h4>
131-
</td>
132-
</tr>
133-
<tr>
134-
<td id='jimmy-dee'>
135-
<a href='https://github.com/jdee'>
136-
<img src='https://github.com/jdee.png' width='140px;'>
137-
</a>
138-
<h4 align='center'>Jimmy Dee</h4>
139-
</td>
140-
<td id='stefan-natchev'>
141-
<a href='https://github.com/snatchev'>
142-
<img src='https://github.com/snatchev.png' width='140px;'>
146+
<td id='helmut-januschka'>
147+
<a href='https://github.com/hjanuschka'>
148+
<img src='https://github.com/hjanuschka.png' width='140px;'>
143149
</a>
144-
<h4 align='center'><a href='https://twitter.com/snatchev'>Stefan Natchev</a></h4>
150+
<h4 align='center'><a href='https://twitter.com/hjanuschka'>Helmut Januschka</a></h4>
145151
</td>
146152
<td id='manish-rathi'>
147153
<a href='https://github.com/crazymanish'>
@@ -155,51 +161,45 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
155161
</a>
156162
<h4 align='center'><a href='https://twitter.com/mollyIV'>Daniel Jankowski</a></h4>
157163
</td>
158-
<td id='luka-mirosevic'>
159-
<a href='https://github.com/lmirosevic'>
160-
<img src='https://github.com/lmirosevic.png' width='140px;'>
161-
</a>
162-
<h4 align='center'><a href='https://twitter.com/lmirosevic'>Luka Mirosevic</a></h4>
163-
</td>
164164
</tr>
165165
<tr>
166-
<td id='jérôme-lacoste'>
167-
<a href='https://github.com/lacostej'>
168-
<img src='https://github.com/lacostej.png' width='140px;'>
169-
</a>
170-
<h4 align='center'><a href='https://twitter.com/lacostej'>Jérôme Lacoste</a></h4>
171-
</td>
172-
<td id='łukasz-grabowski'>
173-
<a href='https://github.com/lucgrabowski'>
174-
<img src='https://github.com/lucgrabowski.png' width='140px;'>
175-
</a>
176-
<h4 align='center'>Łukasz Grabowski</h4>
177-
</td>
178166
<td id='aaron-brager'>
179167
<a href='https://github.com/getaaron'>
180168
<img src='https://github.com/getaaron.png' width='140px;'>
181169
</a>
182170
<h4 align='center'><a href='https://twitter.com/getaaron'>Aaron Brager</a></h4>
183171
</td>
184-
<td id='jan-piotrowski'>
185-
<a href='https://github.com/janpio'>
186-
<img src='https://github.com/janpio.png' width='140px;'>
172+
<td id='danielle-tomlinson'>
173+
<a href='https://github.com/endocrimes'>
174+
<img src='https://github.com/endocrimes.png' width='140px;'>
187175
</a>
188-
<h4 align='center'><a href='https://twitter.com/Sujan'>Jan Piotrowski</a></h4>
176+
<h4 align='center'><a href='https://twitter.com/endocrimes'>Danielle Tomlinson</a></h4>
189177
</td>
190-
<td id='iulian-onofrei'>
191-
<a href='https://github.com/revolter'>
192-
<img src='https://github.com/revolter.png' width='140px;'>
178+
<td id='roger-oba'>
179+
<a href='https://github.com/rogerluan'>
180+
<img src='https://github.com/rogerluan.png' width='140px;'>
193181
</a>
194-
<h4 align='center'><a href='https://twitter.com/Revolt666'>Iulian Onofrei</a></h4>
182+
<h4 align='center'><a href='https://twitter.com/rogerluan_'>Roger Oba</a></h4>
183+
</td>
184+
<td id='łukasz-grabowski'>
185+
<a href='https://github.com/lucgrabowski'>
186+
<img src='https://github.com/lucgrabowski.png' width='140px;'>
187+
</a>
188+
<h4 align='center'>Łukasz Grabowski</h4>
189+
</td>
190+
<td id='andrew-mcburney'>
191+
<a href='https://github.com/armcburney'>
192+
<img src='https://github.com/armcburney.png' width='140px;'>
193+
</a>
194+
<h4 align='center'><a href='https://twitter.com/armcburney'>Andrew McBurney</a></h4>
195195
</td>
196196
</tr>
197197
<tr>
198-
<td id='maksym-grebenets'>
199-
<a href='https://github.com/mgrebenets'>
200-
<img src='https://github.com/mgrebenets.png' width='140px;'>
198+
<td id='max-ott'>
199+
<a href='https://github.com/max-ott'>
200+
<img src='https://github.com/max-ott.png' width='140px;'>
201201
</a>
202-
<h4 align='center'><a href='https://twitter.com/mgrebenets'>Maksym Grebenets</a></h4>
202+
<h4 align='center'><a href='https://twitter.com/ott_max'>Max Ott</a></h4>
203203
</td>
204204
</table>
205205

0 commit comments

Comments
 (0)