Skip to content

Commit 5d0be19

Browse files
authored
Merge branch 'development' into fastlaneIOS
2 parents b510c8c + 68a8040 commit 5d0be19

35 files changed

Lines changed: 368 additions & 158 deletions

File tree

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ gem "base64"
88
gem "mutex_m"
99
gem "bigdecimal"
1010

11-
gem "fastlane"
12-
gem "cocoapods"
11+
gem "fastlane", "2.232.2"
12+
gem "cocoapods", "~> 1.16"
1313

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

Gemfile.lock

Lines changed: 107 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,81 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.7)
5-
base64
6-
nkf
7-
rexml
4+
CFPropertyList (3.0.8)
85
abbrev (0.1.2)
9-
activesupport (5.2.8.1)
10-
concurrent-ruby (~> 1.0, >= 1.0.2)
11-
i18n (>= 0.7, < 2)
12-
minitest (~> 5.1)
13-
tzinfo (~> 1.1)
14-
addressable (2.8.7)
15-
public_suffix (>= 2.0.2, < 7.0)
6+
activesupport (7.2.3)
7+
base64
8+
benchmark (>= 0.3)
9+
bigdecimal
10+
concurrent-ruby (~> 1.0, >= 1.3.1)
11+
connection_pool (>= 2.2.5)
12+
drb
13+
i18n (>= 1.6, < 2)
14+
logger (>= 1.4.2)
15+
minitest (>= 5.1)
16+
securerandom (>= 0.3)
17+
tzinfo (~> 2.0, >= 2.0.5)
18+
addressable (2.8.9)
19+
public_suffix (>= 2.0.2, < 8.0)
1620
algoliasearch (1.27.5)
1721
httpclient (~> 2.8, >= 2.8.3)
1822
json (>= 1.5.1)
1923
artifactory (3.0.17)
2024
atomos (0.1.3)
2125
aws-eventstream (1.4.0)
22-
aws-partitions (1.1152.0)
23-
aws-sdk-core (3.232.0)
26+
aws-partitions (1.1228.0)
27+
aws-sdk-core (3.244.0)
2428
aws-eventstream (~> 1, >= 1.3.0)
2529
aws-partitions (~> 1, >= 1.992.0)
2630
aws-sigv4 (~> 1.9)
2731
base64
2832
bigdecimal
2933
jmespath (~> 1, >= 1.6.1)
3034
logger
31-
aws-sdk-kms (1.112.0)
32-
aws-sdk-core (~> 3, >= 3.231.0)
35+
aws-sdk-kms (1.123.0)
36+
aws-sdk-core (~> 3, >= 3.244.0)
3337
aws-sigv4 (~> 1.5)
34-
aws-sdk-s3 (1.198.0)
35-
aws-sdk-core (~> 3, >= 3.231.0)
38+
aws-sdk-s3 (1.217.0)
39+
aws-sdk-core (~> 3, >= 3.244.0)
3640
aws-sdk-kms (~> 1)
3741
aws-sigv4 (~> 1.5)
3842
aws-sigv4 (1.12.1)
3943
aws-eventstream (~> 1, >= 1.0.2)
4044
babosa (1.0.4)
41-
base64 (0.3.0)
42-
bigdecimal (3.2.2)
45+
base64 (0.2.0)
46+
benchmark (0.5.0)
47+
bigdecimal (4.0.1)
4348
claide (1.1.0)
44-
cocoapods (1.10.2)
45-
addressable (~> 2.6)
49+
cocoapods (1.16.2)
50+
addressable (~> 2.8)
4651
claide (>= 1.0.2, < 2.0)
47-
cocoapods-core (= 1.10.2)
52+
cocoapods-core (= 1.16.2)
4853
cocoapods-deintegrate (>= 1.0.3, < 2.0)
49-
cocoapods-downloader (>= 1.4.0, < 2.0)
54+
cocoapods-downloader (>= 2.1, < 3.0)
5055
cocoapods-plugins (>= 1.0.0, < 2.0)
5156
cocoapods-search (>= 1.0.0, < 2.0)
52-
cocoapods-trunk (>= 1.4.0, < 2.0)
57+
cocoapods-trunk (>= 1.6.0, < 2.0)
5358
cocoapods-try (>= 1.1.0, < 2.0)
5459
colored2 (~> 3.1)
5560
escape (~> 0.0.4)
5661
fourflusher (>= 2.3.0, < 3.0)
5762
gh_inspector (~> 1.0)
58-
molinillo (~> 0.6.6)
63+
molinillo (~> 0.8.0)
5964
nap (~> 1.0)
60-
ruby-macho (~> 1.4)
61-
xcodeproj (>= 1.19.0, < 2.0)
62-
cocoapods-core (1.10.2)
63-
activesupport (> 5.0, < 6)
64-
addressable (~> 2.6)
65+
ruby-macho (>= 2.3.0, < 3.0)
66+
xcodeproj (>= 1.27.0, < 2.0)
67+
cocoapods-core (1.16.2)
68+
activesupport (>= 5.0, < 8)
69+
addressable (~> 2.8)
6570
algoliasearch (~> 1.0)
6671
concurrent-ruby (~> 1.1)
6772
fuzzy_match (~> 2.0.4)
6873
nap (~> 1.0)
6974
netrc (~> 0.11)
70-
public_suffix
75+
public_suffix (~> 4.0)
7176
typhoeus (~> 1.0)
7277
cocoapods-deintegrate (1.0.5)
73-
cocoapods-downloader (1.6.3)
78+
cocoapods-downloader (2.1)
7479
cocoapods-plugins (1.0.0)
7580
nap
7681
cocoapods-search (1.0.1)
@@ -83,18 +88,21 @@ GEM
8388
commander (4.6.0)
8489
highline (~> 2.0.0)
8590
concurrent-ruby (1.3.6)
91+
connection_pool (3.0.2)
92+
csv (3.3.5)
8693
declarative (0.0.20)
8794
digest-crc (0.7.0)
8895
rake (>= 12.0.0, < 14.0.0)
8996
domain_name (0.6.20240107)
9097
dotenv (2.8.1)
98+
drb (2.2.3)
9199
emoji_regex (3.2.3)
92100
escape (0.0.4)
93101
ethon (0.18.0)
94102
ffi (>= 1.15.0)
95103
logger
96104
excon (0.112.0)
97-
faraday (1.10.4)
105+
faraday (1.10.5)
98106
faraday-em_http (~> 1.0)
99107
faraday-em_synchrony (~> 1.0)
100108
faraday-excon (~> 1.1)
@@ -106,32 +114,36 @@ GEM
106114
faraday-rack (~> 1.0)
107115
faraday-retry (~> 1.0)
108116
ruby2_keywords (>= 0.0.4)
109-
faraday-cookie_jar (0.0.7)
117+
faraday-cookie_jar (0.0.8)
110118
faraday (>= 0.8.0)
111-
http-cookie (~> 1.0.0)
119+
http-cookie (>= 1.0.0)
112120
faraday-em_http (1.0.0)
113121
faraday-em_synchrony (1.0.1)
114122
faraday-excon (1.1.0)
115123
faraday-httpclient (1.0.1)
116-
faraday-multipart (1.1.1)
124+
faraday-multipart (1.2.0)
117125
multipart-post (~> 2.0)
118126
faraday-net_http (1.0.2)
119127
faraday-net_http_persistent (1.2.0)
120128
faraday-patron (1.0.0)
121129
faraday-rack (1.0.0)
122-
faraday-retry (1.0.3)
130+
faraday-retry (1.0.4)
123131
faraday_middleware (1.2.1)
124132
faraday (~> 1.0)
125-
fastimage (2.4.0)
126-
fastlane (2.228.0)
133+
fastimage (2.4.1)
134+
fastlane (2.232.2)
127135
CFPropertyList (>= 2.3, < 4.0.0)
136+
abbrev (~> 0.1.2)
128137
addressable (>= 2.8, < 3.0.0)
129138
artifactory (~> 3.0)
130-
aws-sdk-s3 (~> 1.0)
139+
aws-sdk-s3 (~> 1.197)
131140
babosa (>= 1.0.3, < 2.0.0)
132-
bundler (>= 1.12.0, < 3.0.0)
141+
base64 (~> 0.2.0)
142+
benchmark (>= 0.1.0)
143+
bundler (>= 1.17.3, < 5.0.0)
133144
colored (~> 1.2)
134145
commander (~> 4.6)
146+
csv (~> 3.3)
135147
dotenv (>= 2.1.1, < 3.0.0)
136148
emoji_regex (>= 0.1, < 4.0)
137149
excon (>= 0.71.0, < 1.0.0)
@@ -143,16 +155,20 @@ GEM
143155
gh_inspector (>= 1.1.2, < 2.0.0)
144156
google-apis-androidpublisher_v3 (~> 0.3)
145157
google-apis-playcustomapp_v1 (~> 0.1)
146-
google-cloud-env (>= 1.6.0, < 2.0.0)
158+
google-cloud-env (>= 1.6.0, <= 2.1.1)
147159
google-cloud-storage (~> 1.31)
148160
highline (~> 2.0)
149161
http-cookie (~> 1.0.5)
150162
json (< 3.0.0)
151163
jwt (>= 2.1.0, < 3)
164+
logger (>= 1.6, < 2.0)
152165
mini_magick (>= 4.9.4, < 5.0.0)
153166
multipart-post (>= 2.0.0, < 3.0.0)
167+
mutex_m (~> 0.3.0)
154168
naturally (~> 2.2)
169+
nkf (~> 0.2.0)
155170
optparse (>= 0.1.1, < 1.0.0)
171+
ostruct (>= 0.1.0)
156172
plist (>= 3.1.0, < 4.0.0)
157173
rubyzip (>= 2.0.0, < 3.0.0)
158174
security (= 0.1.5)
@@ -165,9 +181,10 @@ GEM
165181
xcodeproj (>= 1.13.0, < 2.0.0)
166182
xcpretty (~> 0.4.1)
167183
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
168-
fastlane-plugin-firebase_app_distribution (0.10.1)
169-
google-apis-firebaseappdistribution_v1 (~> 0.3.0)
170-
google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
184+
fastlane-plugin-firebase_app_distribution (1.0.0)
185+
fastlane (>= 2.232.0)
186+
google-apis-firebaseappdistribution_v1 (>= 0.9.0)
187+
google-apis-firebaseappdistribution_v1alpha (>= 0.12.0)
171188
fastlane-plugin-increment_build_number (0.0.4)
172189
fastlane-sirp (1.0.0)
173190
sysrandom (~> 1.0)
@@ -176,42 +193,44 @@ GEM
176193
fourflusher (2.3.1)
177194
fuzzy_match (2.0.4)
178195
gh_inspector (1.1.3)
179-
google-apis-androidpublisher_v3 (0.54.0)
180-
google-apis-core (>= 0.11.0, < 2.a)
181-
google-apis-core (0.11.3)
196+
google-apis-androidpublisher_v3 (0.97.0)
197+
google-apis-core (>= 0.15.0, < 2.a)
198+
google-apis-core (0.18.0)
182199
addressable (~> 2.5, >= 2.5.1)
183-
googleauth (>= 0.16.2, < 2.a)
184-
httpclient (>= 2.8.1, < 3.a)
200+
googleauth (~> 1.9)
201+
httpclient (>= 2.8.3, < 3.a)
185202
mini_mime (~> 1.0)
203+
mutex_m
186204
representable (~> 3.0)
187205
retriable (>= 2.0, < 4.a)
188-
rexml
189-
google-apis-firebaseappdistribution_v1 (0.3.0)
190-
google-apis-core (>= 0.11.0, < 2.a)
191-
google-apis-firebaseappdistribution_v1alpha (0.2.0)
192-
google-apis-core (>= 0.11.0, < 2.a)
193-
google-apis-iamcredentials_v1 (0.17.0)
194-
google-apis-core (>= 0.11.0, < 2.a)
195-
google-apis-playcustomapp_v1 (0.13.0)
196-
google-apis-core (>= 0.11.0, < 2.a)
197-
google-apis-storage_v1 (0.31.0)
198-
google-apis-core (>= 0.11.0, < 2.a)
206+
google-apis-firebaseappdistribution_v1 (0.17.0)
207+
google-apis-core (>= 0.15.0, < 2.a)
208+
google-apis-firebaseappdistribution_v1alpha (0.26.0)
209+
google-apis-core (>= 0.15.0, < 2.a)
210+
google-apis-iamcredentials_v1 (0.26.0)
211+
google-apis-core (>= 0.15.0, < 2.a)
212+
google-apis-playcustomapp_v1 (0.17.0)
213+
google-apis-core (>= 0.15.0, < 2.a)
214+
google-apis-storage_v1 (0.61.0)
215+
google-apis-core (>= 0.15.0, < 2.a)
199216
google-cloud-core (1.8.0)
200217
google-cloud-env (>= 1.0, < 3.a)
201218
google-cloud-errors (~> 1.0)
202-
google-cloud-env (1.6.0)
203-
faraday (>= 0.17.3, < 3.0)
219+
google-cloud-env (2.1.1)
220+
faraday (>= 1.0, < 3.a)
204221
google-cloud-errors (1.5.0)
205-
google-cloud-storage (1.47.0)
222+
google-cloud-storage (1.58.0)
206223
addressable (~> 2.8)
207224
digest-crc (~> 0.4)
208-
google-apis-iamcredentials_v1 (~> 0.1)
209-
google-apis-storage_v1 (~> 0.31.0)
225+
google-apis-core (>= 0.18, < 2)
226+
google-apis-iamcredentials_v1 (~> 0.18)
227+
google-apis-storage_v1 (>= 0.42)
210228
google-cloud-core (~> 1.6)
211-
googleauth (>= 0.16.2, < 2.a)
229+
googleauth (~> 1.9)
212230
mini_mime (~> 1.0)
213-
googleauth (1.8.1)
214-
faraday (>= 0.17.3, < 3.a)
231+
googleauth (1.11.2)
232+
faraday (>= 1.0, < 3.a)
233+
google-cloud-env (~> 2.1)
215234
jwt (>= 1.4, < 3.0)
216235
multi_json (~> 1.11)
217236
os (>= 0.9, < 2.0)
@@ -224,37 +243,42 @@ GEM
224243
i18n (1.14.8)
225244
concurrent-ruby (~> 1.0)
226245
jmespath (1.6.2)
227-
json (2.13.2)
246+
json (2.19.2)
228247
jwt (2.10.2)
229248
base64
230249
logger (1.7.0)
231250
mini_magick (4.13.2)
232251
mini_mime (1.1.5)
233-
minitest (5.27.0)
234-
molinillo (0.6.6)
235-
multi_json (1.17.0)
252+
minitest (6.0.2)
253+
drb (~> 2.0)
254+
prism (~> 1.5)
255+
molinillo (0.8.0)
256+
multi_json (1.19.1)
236257
multipart-post (2.4.1)
237258
mutex_m (0.3.0)
238259
nanaimo (0.4.0)
239260
nap (1.1.0)
240261
naturally (2.3.0)
241262
netrc (0.11.0)
242263
nkf (0.2.0)
243-
optparse (0.6.0)
264+
optparse (0.8.1)
244265
os (1.1.4)
266+
ostruct (0.6.3)
245267
plist (3.7.2)
246-
public_suffix (6.0.2)
247-
rake (13.3.0)
268+
prism (1.9.0)
269+
public_suffix (4.0.7)
270+
rake (13.3.1)
248271
representable (3.2.0)
249272
declarative (< 0.1.0)
250273
trailblazer-option (>= 0.1.1, < 0.2.0)
251274
uber (< 0.2.0)
252-
retriable (3.1.2)
253-
rexml (3.4.2)
275+
retriable (3.4.1)
276+
rexml (3.4.4)
254277
rouge (3.28.0)
255-
ruby-macho (1.4.0)
278+
ruby-macho (2.5.1)
256279
ruby2_keywords (0.0.5)
257280
rubyzip (2.4.1)
281+
securerandom (0.4.1)
258282
security (0.1.5)
259283
signet (0.21.0)
260284
addressable (~> 2.8)
@@ -276,8 +300,8 @@ GEM
276300
tty-cursor (~> 0.7)
277301
typhoeus (1.6.0)
278302
ethon (>= 0.18.0)
279-
tzinfo (1.2.11)
280-
thread_safe (~> 0.1)
303+
tzinfo (2.0.6)
304+
concurrent-ruby (~> 1.0)
281305
uber (0.1.0)
282306
unicode-display_width (2.6.0)
283307
word_wrap (1.0.0)
@@ -301,8 +325,8 @@ DEPENDENCIES
301325
abbrev
302326
base64
303327
bigdecimal
304-
cocoapods
305-
fastlane
328+
cocoapods (~> 1.16)
329+
fastlane (= 2.232.2)
306330
fastlane-plugin-firebase_app_distribution
307331
fastlane-plugin-increment_build_number
308332
mutex_m

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import org.gradle.kotlin.dsl.libs
22

33
// Top-level build file where you can add configuration options common to all sub-projects/modules.
44
plugins {
5+
alias(libs.plugins.kotlinCocoapods) apply false
56
alias(libs.plugins.android.application) apply false
67
alias(libs.plugins.android.library) apply false
78
alias(libs.plugins.android.test) apply false

0 commit comments

Comments
 (0)