Skip to content

Commit 2e55538

Browse files
authored
Release 11.5: Address Apple Development certificate update (#2220)
1 parent 3d063d6 commit 2e55538

File tree

3 files changed

+67
-56
lines changed

3 files changed

+67
-56
lines changed

.fastlane/Fastfile

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,19 @@ platform :ios do
2222
match(type: "appstore")
2323
end
2424

25+
private_lane :api_key_if_needed do
26+
# We recommend to have api key on local machines to improve sign-in experience
27+
# While on the CI we will use api key components for the authentication
28+
# You can setup the api key by following the guide: https://github.com/mapbox/apple-internal/blob/master/guides/Modern%20authentification.md
29+
file_path = ENV['APP_STORE_CONNECT_API_KEY_PATH']
30+
31+
if file_path.nil? || !File.exist?(file_path)
32+
app_store_connect_api_key
33+
end
34+
end
35+
2536
lane :build_examples_tests do
26-
app_store_connect_api_key
37+
api_key_if_needed
2738
setup_circle_ci
2839
sync_code_signing
2940
update_code_signing_settings(
@@ -32,15 +43,15 @@ platform :ios do
3243
team_id: "GJZR2MEM28", # Developer Portal Team ID,
3344
profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["mapbox.ExamplesUITests.xctrunner"],
3445
targets: ["ExamplesUITests"],
35-
code_sign_identity: "Apple Development: Machiney McMachineface",
46+
code_sign_identity: "Apple Development: Created via API",
3647
)
3748
update_code_signing_settings(
3849
use_automatic_signing: false,
3950
path: "Apps/Examples/Examples.xcodeproj",
4051
team_id: "GJZR2MEM28", # Developer Portal Team ID,
4152
profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["com.mapbox.examples"],
4253
targets: ["Examples"],
43-
code_sign_identity: "Apple Development: Machiney McMachineface",
54+
code_sign_identity: "Apple Development: Created via API",
4455
)
4556
run_tests(
4657
workspace: 'Apps/Apps.xcworkspace',
@@ -85,7 +96,7 @@ platform :ios do
8596
end
8697

8798
lane :beta do
88-
app_store_connect_api_key # Generate API Token
99+
api_key_if_needed # Generate API Token
89100
increment_build_number(
90101
build_number: latest_testflight_build_number + 1,
91102
xcodeproj: 'Apps/Examples/Examples.xcodeproj'
@@ -104,7 +115,7 @@ platform :ios do
104115
team_id: "GJZR2MEM28", # Developer Portal Team ID,
105116
profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["com.mapbox.examples"],
106117
targets: ["Examples"],
107-
code_sign_identity: "Apple Development: Machiney McMachineface",
118+
code_sign_identity: "Apple Development: Created via API",
108119
entitlements_file_path: "Examples/Examples_CarPlay.entitlements"
109120
)
110121
sync_code_signing(type: "appstore")
@@ -123,7 +134,7 @@ platform :ios do
123134

124135
lane :build_tests do
125136
sh("cd .. && xcodegen")
126-
app_store_connect_api_key # Generate API Token
137+
api_key_if_needed # Generate API Token
127138
setup_circle_ci
128139
sync_code_signing(app_identifier: "com.mapbox.MapboxMapsTestHost")
129140
update_code_signing_settings(
@@ -132,7 +143,7 @@ platform :ios do
132143
team_id: "GJZR2MEM28", # Developer Portal Team ID,
133144
profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["com.mapbox.MapboxMapsTestHost"],
134145
targets: ["MapboxTestHost"],
135-
code_sign_identity: "Apple Development: Machiney McMachineface",
146+
code_sign_identity: "Apple Development: Created via API",
136147
)
137148
run_tests(
138149
project: 'MapboxMaps.xcodeproj',

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
source "https://rubygems.org"
22

3-
gem "fastlane", '>=2.219.0'
3+
# Fastlane 2.220.0 introduced a new crypto algo for Match, which is not compatible with the pre-existed versions
4+
gem "fastlane", '= 2.219.0'
45

56
plugins_path = File.join(File.dirname(__FILE__), '.fastlane', 'Pluginfile')
67
eval_gemfile(plugins_path) if File.exist?(plugins_path)

Gemfile.lock

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ GEM
1818
base64
1919
nkf
2020
rexml
21-
addressable (2.8.1)
22-
public_suffix (>= 2.0.2, < 6.0)
23-
artifactory (3.0.15)
21+
addressable (2.8.7)
22+
public_suffix (>= 2.0.2, < 7.0)
23+
artifactory (3.0.17)
2424
atomos (0.1.3)
2525
aws-eventstream (1.3.0)
26-
aws-partitions (1.894.0)
27-
aws-sdk-core (3.191.3)
26+
aws-partitions (1.955.0)
27+
aws-sdk-core (3.201.1)
2828
aws-eventstream (~> 1, >= 1.3.0)
2929
aws-partitions (~> 1, >= 1.651.0)
3030
aws-sigv4 (~> 1.8)
3131
jmespath (~> 1, >= 1.6.1)
32-
aws-sdk-kms (1.77.0)
33-
aws-sdk-core (~> 3, >= 3.191.0)
34-
aws-sigv4 (~> 1.1)
35-
aws-sdk-s3 (1.143.0)
36-
aws-sdk-core (~> 3, >= 3.191.0)
32+
aws-sdk-kms (1.88.0)
33+
aws-sdk-core (~> 3, >= 3.201.0)
34+
aws-sigv4 (~> 1.5)
35+
aws-sdk-s3 (1.156.0)
36+
aws-sdk-core (~> 3, >= 3.201.0)
3737
aws-sdk-kms (~> 1)
38-
aws-sigv4 (~> 1.8)
38+
aws-sigv4 (~> 1.5)
3939
aws-sigv4 (1.8.0)
4040
aws-eventstream (~> 1, >= 1.0.2)
4141
babosa (1.0.4)
@@ -46,13 +46,13 @@ GEM
4646
commander (4.6.0)
4747
highline (~> 2.0.0)
4848
declarative (0.0.20)
49-
digest-crc (0.6.4)
49+
digest-crc (0.6.5)
5050
rake (>= 12.0.0, < 14.0.0)
5151
domain_name (0.6.20240107)
5252
dotenv (2.8.1)
5353
emoji_regex (3.2.3)
54-
excon (0.109.0)
55-
faraday (1.10.2)
54+
excon (0.111.0)
55+
faraday (1.10.3)
5656
faraday-em_http (~> 1.0)
5757
faraday-em_synchrony (~> 1.0)
5858
faraday-excon (~> 1.1)
@@ -80,7 +80,7 @@ GEM
8080
faraday-retry (1.0.3)
8181
faraday_middleware (1.2.0)
8282
faraday (~> 1.0)
83-
fastimage (2.3.0)
83+
fastimage (2.3.1)
8484
fastlane (2.219.0)
8585
CFPropertyList (>= 2.3, < 4.0.0)
8686
addressable (>= 2.8, < 3.0.0)
@@ -123,82 +123,82 @@ GEM
123123
xcpretty (~> 0.3.0)
124124
xcpretty-travis-formatter (>= 0.0.3)
125125
gh_inspector (1.1.3)
126-
google-apis-androidpublisher_v3 (0.34.0)
127-
google-apis-core (>= 0.9.1, < 2.a)
128-
google-apis-core (0.9.5)
126+
google-apis-androidpublisher_v3 (0.54.0)
127+
google-apis-core (>= 0.11.0, < 2.a)
128+
google-apis-core (0.11.3)
129129
addressable (~> 2.5, >= 2.5.1)
130130
googleauth (>= 0.16.2, < 2.a)
131131
httpclient (>= 2.8.1, < 3.a)
132132
mini_mime (~> 1.0)
133133
representable (~> 3.0)
134134
retriable (>= 2.0, < 4.a)
135135
rexml
136-
webrick
137-
google-apis-iamcredentials_v1 (0.16.0)
138-
google-apis-core (>= 0.9.1, < 2.a)
139-
google-apis-playcustomapp_v1 (0.12.0)
140-
google-apis-core (>= 0.9.1, < 2.a)
141-
google-apis-storage_v1 (0.19.0)
142-
google-apis-core (>= 0.9.0, < 2.a)
143-
google-cloud-core (1.6.0)
144-
google-cloud-env (~> 1.0)
136+
google-apis-iamcredentials_v1 (0.17.0)
137+
google-apis-core (>= 0.11.0, < 2.a)
138+
google-apis-playcustomapp_v1 (0.13.0)
139+
google-apis-core (>= 0.11.0, < 2.a)
140+
google-apis-storage_v1 (0.31.0)
141+
google-apis-core (>= 0.11.0, < 2.a)
142+
google-cloud-core (1.7.0)
143+
google-cloud-env (>= 1.0, < 3.a)
145144
google-cloud-errors (~> 1.0)
146145
google-cloud-env (1.6.0)
147146
faraday (>= 0.17.3, < 3.0)
148-
google-cloud-errors (1.3.0)
149-
google-cloud-storage (1.44.0)
147+
google-cloud-errors (1.4.0)
148+
google-cloud-storage (1.47.0)
150149
addressable (~> 2.8)
151150
digest-crc (~> 0.4)
152151
google-apis-iamcredentials_v1 (~> 0.1)
153-
google-apis-storage_v1 (~> 0.19.0)
152+
google-apis-storage_v1 (~> 0.31.0)
154153
google-cloud-core (~> 1.6)
155154
googleauth (>= 0.16.2, < 2.a)
156155
mini_mime (~> 1.0)
157-
googleauth (1.3.0)
156+
googleauth (1.8.1)
158157
faraday (>= 0.17.3, < 3.a)
159158
jwt (>= 1.4, < 3.0)
160-
memoist (~> 0.16)
161159
multi_json (~> 1.11)
162160
os (>= 0.9, < 2.0)
163161
signet (>= 0.16, < 2.a)
164162
highline (2.0.3)
165-
http-cookie (1.0.5)
163+
http-cookie (1.0.6)
166164
domain_name (~> 0.5)
167165
httpclient (2.8.3)
168166
jmespath (1.6.2)
169-
json (2.7.1)
170-
jwt (2.6.0)
171-
memoist (0.16.2)
172-
mini_magick (4.12.0)
173-
mini_mime (1.1.2)
167+
json (2.7.2)
168+
jwt (2.8.2)
169+
base64
170+
mini_magick (4.13.2)
171+
mini_mime (1.1.5)
174172
multi_json (1.15.0)
175-
multipart-post (2.0.0)
173+
multipart-post (2.4.1)
176174
nanaimo (0.3.0)
177175
naturally (2.2.1)
178176
nkf (0.2.0)
179-
optparse (0.4.0)
177+
optparse (0.5.0)
180178
os (1.1.4)
181-
plist (3.6.0)
182-
public_suffix (5.0.1)
183-
rake (13.0.6)
179+
plist (3.7.1)
180+
public_suffix (6.0.0)
181+
rake (13.2.1)
184182
representable (3.2.0)
185183
declarative (< 0.1.0)
186184
trailblazer-option (>= 0.1.1, < 0.2.0)
187185
uber (< 0.2.0)
188186
retriable (3.1.2)
189-
rexml (3.2.5)
187+
rexml (3.2.9)
188+
strscan
190189
rouge (2.0.7)
191190
ruby2_keywords (0.0.5)
192191
rubyzip (2.3.2)
193192
security (0.1.3)
194-
signet (0.17.0)
193+
signet (0.19.0)
195194
addressable (~> 2.8)
196195
faraday (>= 0.17.5, < 3.a)
197196
jwt (>= 1.5, < 3.0)
198197
multi_json (~> 1.10)
199198
simctl (1.6.10)
200199
CFPropertyList
201200
naturally
201+
strscan (3.1.0)
202202
terminal-notifier (2.0.0)
203203
terminal-table (3.0.2)
204204
unicode-display_width (>= 1.1.1, < 3)
@@ -209,7 +209,6 @@ GEM
209209
tty-cursor (~> 0.7)
210210
uber (0.1.0)
211211
unicode-display_width (2.5.0)
212-
webrick (1.7.0)
213212
word_wrap (1.0.0)
214213
xcodeproj (1.24.0)
215214
CFPropertyList (>= 2.3.3, < 4.0)
@@ -229,8 +228,8 @@ PLATFORMS
229228
arm64-darwin-23
230229

231230
DEPENDENCIES
232-
fastlane (>= 2.219.0)
231+
fastlane (= 2.219.0)
233232
fastlane-plugin-firebase_test_lab!
234233

235234
BUNDLED WITH
236-
2.4.3
235+
2.5.4

0 commit comments

Comments
 (0)