Skip to content

Commit 31edb6f

Browse files
marionbarkerdnzxy
marionbarker
and
dnzxy
authored
Hotfix to main: Use a special version of fastlane to enable Add Identifiers (nightscout#685)
* add PR 29596 to fastlane_2.228.0 * modify configure_bundle_id * Bump version to 0.2.7 --------- Co-Authored-By: dnzxy <dnzxy@users.noreply.github.com>
1 parent d8a5d1e commit 31edb6f

File tree

4 files changed

+77
-63
lines changed

4 files changed

+77
-63
lines changed

‎Config.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
APP_DISPLAY_NAME = Trio
2-
APP_VERSION = 0.2.6
2+
APP_VERSION = 0.2.7
33
APP_BUILD_NUMBER = 1
44
COPYRIGHT_NOTICE =
55
DEVELOPER_TEAM = ##TEAM_ID##

‎Gemfile‎

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

3-
gem "fastlane"
3+
# gem "fastlane"
4+
5+
# This branch uses fastlane 2.228.0 plus pr 29596
6+
gem "fastlane", git: "https://github.com/loopandlearn/fastlane.git", ref: "a670d4b092b274d58ebb5497126e47fc6a84f533"

‎Gemfile.lock‎

Lines changed: 63 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,51 @@
1+
GIT
2+
remote: https://github.com/loopandlearn/fastlane.git
3+
revision: a670d4b092b274d58ebb5497126e47fc6a84f533
4+
ref: a670d4b092b274d58ebb5497126e47fc6a84f533
5+
specs:
6+
fastlane (2.228.0)
7+
CFPropertyList (>= 2.3, < 4.0.0)
8+
addressable (>= 2.8, < 3.0.0)
9+
artifactory (~> 3.0)
10+
aws-sdk-s3 (~> 1.0)
11+
babosa (>= 1.0.3, < 2.0.0)
12+
bundler (>= 1.12.0, < 3.0.0)
13+
colored (~> 1.2)
14+
commander (~> 4.6)
15+
dotenv (>= 2.1.1, < 3.0.0)
16+
emoji_regex (>= 0.1, < 4.0)
17+
excon (>= 0.71.0, < 1.0.0)
18+
faraday (~> 1.0)
19+
faraday-cookie_jar (~> 0.0.6)
20+
faraday_middleware (~> 1.0)
21+
fastimage (>= 2.1.0, < 3.0.0)
22+
fastlane-sirp (>= 1.0.0)
23+
gh_inspector (>= 1.1.2, < 2.0.0)
24+
google-apis-androidpublisher_v3 (~> 0.3)
25+
google-apis-playcustomapp_v1 (~> 0.1)
26+
google-cloud-env (>= 1.6.0, < 2.0.0)
27+
google-cloud-storage (~> 1.31)
28+
highline (~> 2.0)
29+
http-cookie (~> 1.0.5)
30+
json (< 3.0.0)
31+
jwt (>= 2.1.0, < 3)
32+
mini_magick (>= 4.9.4, < 5.0.0)
33+
multipart-post (>= 2.0.0, < 3.0.0)
34+
naturally (~> 2.2)
35+
optparse (>= 0.1.1, < 1.0.0)
36+
plist (>= 3.1.0, < 4.0.0)
37+
rubyzip (>= 2.0.0, < 3.0.0)
38+
security (= 0.1.5)
39+
simctl (~> 1.6.3)
40+
terminal-notifier (>= 2.0.0, < 3.0.0)
41+
terminal-table (~> 3)
42+
tty-screen (>= 0.6.3, < 1.0.0)
43+
tty-spinner (>= 0.8.0, < 1.0.0)
44+
word_wrap (~> 1.0.0)
45+
xcodeproj (>= 1.13.0, < 2.0.0)
46+
xcpretty (~> 0.4.1)
47+
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
48+
149
GEM
250
remote: https://rubygems.org/
351
specs:
@@ -9,26 +57,26 @@ GEM
957
public_suffix (>= 2.0.2, < 7.0)
1058
artifactory (3.0.17)
1159
atomos (0.1.3)
12-
aws-eventstream (1.3.2)
13-
aws-partitions (1.1086.0)
14-
aws-sdk-core (3.222.1)
60+
aws-eventstream (1.4.0)
61+
aws-partitions (1.1116.0)
62+
aws-sdk-core (3.225.2)
1563
aws-eventstream (~> 1, >= 1.3.0)
1664
aws-partitions (~> 1, >= 1.992.0)
1765
aws-sigv4 (~> 1.9)
1866
base64
1967
jmespath (~> 1, >= 1.6.1)
2068
logger
21-
aws-sdk-kms (1.99.0)
22-
aws-sdk-core (~> 3, >= 3.216.0)
69+
aws-sdk-kms (1.105.0)
70+
aws-sdk-core (~> 3, >= 3.225.0)
2371
aws-sigv4 (~> 1.5)
24-
aws-sdk-s3 (1.183.0)
25-
aws-sdk-core (~> 3, >= 3.216.0)
72+
aws-sdk-s3 (1.189.1)
73+
aws-sdk-core (~> 3, >= 3.225.0)
2674
aws-sdk-kms (~> 1)
2775
aws-sigv4 (~> 1.5)
28-
aws-sigv4 (1.11.0)
76+
aws-sigv4 (1.12.1)
2977
aws-eventstream (~> 1, >= 1.0.2)
3078
babosa (1.0.4)
31-
base64 (0.2.0)
79+
base64 (0.3.0)
3280
claide (1.1.0)
3381
colored (1.2)
3482
colored2 (3.1.2)
@@ -70,48 +118,6 @@ GEM
70118
faraday_middleware (1.2.1)
71119
faraday (~> 1.0)
72120
fastimage (2.4.0)
73-
fastlane (2.227.1)
74-
CFPropertyList (>= 2.3, < 4.0.0)
75-
addressable (>= 2.8, < 3.0.0)
76-
artifactory (~> 3.0)
77-
aws-sdk-s3 (~> 1.0)
78-
babosa (>= 1.0.3, < 2.0.0)
79-
bundler (>= 1.12.0, < 3.0.0)
80-
colored (~> 1.2)
81-
commander (~> 4.6)
82-
dotenv (>= 2.1.1, < 3.0.0)
83-
emoji_regex (>= 0.1, < 4.0)
84-
excon (>= 0.71.0, < 1.0.0)
85-
faraday (~> 1.0)
86-
faraday-cookie_jar (~> 0.0.6)
87-
faraday_middleware (~> 1.0)
88-
fastimage (>= 2.1.0, < 3.0.0)
89-
fastlane-sirp (>= 1.0.0)
90-
gh_inspector (>= 1.1.2, < 2.0.0)
91-
google-apis-androidpublisher_v3 (~> 0.3)
92-
google-apis-playcustomapp_v1 (~> 0.1)
93-
google-cloud-env (>= 1.6.0, < 2.0.0)
94-
google-cloud-storage (~> 1.31)
95-
highline (~> 2.0)
96-
http-cookie (~> 1.0.5)
97-
json (< 3.0.0)
98-
jwt (>= 2.1.0, < 3)
99-
mini_magick (>= 4.9.4, < 5.0.0)
100-
multipart-post (>= 2.0.0, < 3.0.0)
101-
naturally (~> 2.2)
102-
optparse (>= 0.1.1, < 1.0.0)
103-
plist (>= 3.1.0, < 4.0.0)
104-
rubyzip (>= 2.0.0, < 3.0.0)
105-
security (= 0.1.5)
106-
simctl (~> 1.6.3)
107-
terminal-notifier (>= 2.0.0, < 3.0.0)
108-
terminal-table (~> 3)
109-
tty-screen (>= 0.6.3, < 1.0.0)
110-
tty-spinner (>= 0.8.0, < 1.0.0)
111-
word_wrap (~> 1.0.0)
112-
xcodeproj (>= 1.13.0, < 2.0.0)
113-
xcpretty (~> 0.4.1)
114-
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
115121
fastlane-sirp (1.0.0)
116122
sysrandom (~> 1.0)
117123
gh_inspector (1.1.3)
@@ -157,7 +163,7 @@ GEM
157163
httpclient (2.9.0)
158164
mutex_m
159165
jmespath (1.6.2)
160-
json (2.10.2)
166+
json (2.12.2)
161167
jwt (2.10.1)
162168
base64
163169
logger (1.7.0)
@@ -167,13 +173,13 @@ GEM
167173
multipart-post (2.4.1)
168174
mutex_m (0.3.0)
169175
nanaimo (0.4.0)
170-
naturally (2.2.1)
176+
naturally (2.3.0)
171177
nkf (0.2.0)
172178
optparse (0.6.0)
173179
os (1.1.4)
174180
plist (3.7.2)
175-
public_suffix (6.0.1)
176-
rake (13.2.1)
181+
public_suffix (6.0.2)
182+
rake (13.3.0)
177183
representable (3.2.0)
178184
declarative (< 0.1.0)
179185
trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -184,7 +190,7 @@ GEM
184190
ruby2_keywords (0.0.5)
185191
rubyzip (2.4.1)
186192
security (0.1.5)
187-
signet (0.19.0)
193+
signet (0.20.0)
188194
addressable (~> 2.8)
189195
faraday (>= 0.17.5, < 3.a)
190196
jwt (>= 1.5, < 3.0)
@@ -226,7 +232,7 @@ PLATFORMS
226232
x86_64-linux
227233

228234
DEPENDENCIES
229-
fastlane
235+
fastlane!
230236

231237
BUNDLED WITH
232238
2.6.2

‎fastlane/Fastfile‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,15 @@ platform :ios do
178178
)
179179

180180
def configure_bundle_id(name, identifier, capabilities)
181-
bundle_id = Spaceship::ConnectAPI::BundleId.find(identifier) || Spaceship::ConnectAPI::BundleId.create(name: name, identifier: identifier)
182-
capabilities.each { |capability|
183-
bundle_id.create_capability(capability)
184-
}
181+
bundle_id = Spaceship::ConnectAPI::BundleId.find(identifier) || Spaceship::ConnectAPI::BundleId.create(
182+
name: name,
183+
identifier: identifier,
184+
platform: "IOS"
185+
)
186+
existing = bundle_id.get_capabilities.map(&:capability_type)
187+
capabilities.reject { |c| existing.include?(c) }.each do |cap|
188+
bundle_id.create_capability(cap)
189+
end
185190
end
186191

187192
configure_bundle_id("Trio", "#{BUNDLE_ID}", [

0 commit comments

Comments
 (0)