Skip to content

Commit 3a43041

Browse files
authored
Merge pull request Expensify#71401 from Expensify/revert-70917-snyk-fix-6e31816f2da0c72c7f5e75d0a2e5b536
Revert "[Snyk] Fix for 1 vulnerabilities"
2 parents 4e7c3a4 + c9346a8 commit 3a43041

2 files changed

Lines changed: 54 additions & 69 deletions

File tree

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ source "https://rubygems.org"
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 3.3.4"
55

6-
gem "cocoapods", "= 1.16.0"
6+
gem "cocoapods", "= 1.15.2"
77
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
8-
gem 'xcodeproj', '~> 1.26'
9-
gem "fastlane", "~> 2", ">= 2.227.2"
8+
gem 'xcodeproj', '< 1.26.0'
9+
gem "fastlane", "~> 2", ">= 2.227.1"
1010
gem "xcpretty", "~> 0"
1111

1212

Gemfile.lock

Lines changed: 51 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,11 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (7.2.2.2)
9-
base64
10-
benchmark (>= 0.3)
11-
bigdecimal
12-
concurrent-ruby (~> 1.0, >= 1.3.1)
13-
connection_pool (>= 2.2.5)
14-
drb
8+
activesupport (7.0.8.4)
9+
concurrent-ruby (~> 1.0, >= 1.0.2)
1510
i18n (>= 1.6, < 2)
16-
logger (>= 1.4.2)
1711
minitest (>= 5.1)
18-
securerandom (>= 0.3)
19-
tzinfo (~> 2.0, >= 2.0.5)
12+
tzinfo (~> 2.0)
2013
addressable (2.8.7)
2114
public_suffix (>= 2.0.2, < 7.0)
2215
algoliasearch (1.27.5)
@@ -26,34 +19,31 @@ GEM
2619
rubyzip (~> 2.0)
2720
artifactory (3.0.17)
2821
atomos (0.1.3)
29-
aws-eventstream (1.4.0)
30-
aws-partitions (1.1162.0)
31-
aws-sdk-core (3.232.0)
22+
aws-eventstream (1.3.0)
23+
aws-partitions (1.1001.0)
24+
aws-sdk-core (3.211.0)
3225
aws-eventstream (~> 1, >= 1.3.0)
3326
aws-partitions (~> 1, >= 1.992.0)
3427
aws-sigv4 (~> 1.9)
35-
base64
36-
bigdecimal
3728
jmespath (~> 1, >= 1.6.1)
38-
logger
39-
aws-sdk-kms (1.112.0)
40-
aws-sdk-core (~> 3, >= 3.231.0)
29+
aws-sdk-kms (1.95.0)
30+
aws-sdk-core (~> 3, >= 3.210.0)
4131
aws-sigv4 (~> 1.5)
42-
aws-sdk-s3 (1.199.0)
43-
aws-sdk-core (~> 3, >= 3.231.0)
32+
aws-sdk-s3 (1.169.0)
33+
aws-sdk-core (~> 3, >= 3.210.0)
4434
aws-sdk-kms (~> 1)
4535
aws-sigv4 (~> 1.5)
46-
aws-sigv4 (1.12.1)
36+
aws-sigv4 (1.10.1)
4737
aws-eventstream (~> 1, >= 1.0.2)
4838
babosa (1.0.4)
49-
base64 (0.3.0)
39+
base64 (0.2.0)
5040
benchmark (0.3.0)
5141
bigdecimal (3.1.5)
5242
claide (1.1.0)
53-
cocoapods (1.16.0)
43+
cocoapods (1.15.2)
5444
addressable (~> 2.8)
5545
claide (>= 1.0.2, < 2.0)
56-
cocoapods-core (= 1.16.0)
46+
cocoapods-core (= 1.15.2)
5747
cocoapods-deintegrate (>= 1.0.3, < 2.0)
5848
cocoapods-downloader (>= 2.1, < 3.0)
5949
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -67,8 +57,8 @@ GEM
6757
molinillo (~> 0.8.0)
6858
nap (~> 1.0)
6959
ruby-macho (>= 2.3.0, < 3.0)
70-
xcodeproj (>= 1.26.0, < 2.0)
71-
cocoapods-core (1.16.0)
60+
xcodeproj (>= 1.23.0, < 2.0)
61+
cocoapods-core (1.15.2)
7262
activesupport (>= 5.0, < 8)
7363
addressable (~> 2.8)
7464
algoliasearch (~> 1.0)
@@ -91,17 +81,15 @@ GEM
9181
colored2 (3.1.2)
9282
commander (4.6.0)
9383
highline (~> 2.0.0)
94-
concurrent-ruby (1.3.5)
95-
connection_pool (2.5.4)
84+
concurrent-ruby (1.3.3)
9685
declarative (0.0.20)
9786
digest-crc (0.7.0)
9887
rake (>= 12.0.0, < 14.0.0)
9988
domain_name (0.6.20240107)
10089
dotenv (2.8.1)
101-
drb (2.2.3)
10290
emoji_regex (3.2.3)
10391
escape (0.0.4)
104-
ethon (0.15.0)
92+
ethon (0.16.0)
10593
ffi (>= 1.15.0)
10694
excon (0.112.0)
10795
faraday (1.10.4)
@@ -120,11 +108,11 @@ GEM
120108
faraday (>= 0.8.0)
121109
http-cookie (~> 1.0.0)
122110
faraday-em_http (1.0.0)
123-
faraday-em_synchrony (1.0.1)
111+
faraday-em_synchrony (1.0.0)
124112
faraday-excon (1.1.0)
125113
faraday-httpclient (1.0.1)
126-
faraday-multipart (1.1.1)
127-
multipart-post (~> 2.0)
114+
faraday-multipart (1.0.4)
115+
multipart-post (~> 2)
128116
faraday-net_http (1.0.2)
129117
faraday-net_http_persistent (1.2.0)
130118
faraday-patron (1.0.0)
@@ -133,7 +121,7 @@ GEM
133121
faraday_middleware (1.2.1)
134122
faraday (~> 1.0)
135123
fastimage (2.4.0)
136-
fastlane (2.228.0)
124+
fastlane (2.227.1)
137125
CFPropertyList (>= 2.3, < 4.0.0)
138126
addressable (>= 2.8, < 3.0.0)
139127
artifactory (~> 3.0)
@@ -179,15 +167,15 @@ GEM
179167
apktools (~> 0.7)
180168
aws-sdk-s3 (~> 1)
181169
mime-types (~> 3.3)
182-
fastlane-plugin-firebase_app_distribution (0.10.1)
170+
fastlane-plugin-firebase_app_distribution (0.10.0)
183171
google-apis-firebaseappdistribution_v1 (~> 0.3.0)
184172
google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
185173
fastlane-sirp (1.0.0)
186174
sysrandom (~> 1.0)
187-
ffi (1.17.2)
188-
ffi (1.17.2-arm64-darwin)
189-
ffi (1.17.2-x86_64-darwin)
190-
ffi (1.17.2-x86_64-linux-gnu)
175+
ffi (1.17.0)
176+
ffi (1.17.0-arm64-darwin)
177+
ffi (1.17.0-x86_64-darwin)
178+
ffi (1.17.0-x86_64-linux)
191179
fourflusher (2.3.1)
192180
fuzzy_match (2.0.4)
193181
gh_inspector (1.1.3)
@@ -234,52 +222,49 @@ GEM
234222
highline (2.0.3)
235223
http-cookie (1.0.8)
236224
domain_name (~> 0.5)
237-
httpclient (2.9.0)
238-
mutex_m
239-
i18n (1.14.7)
225+
httpclient (2.8.3)
226+
i18n (1.14.5)
240227
concurrent-ruby (~> 1.0)
241228
jmespath (1.6.2)
242-
json (2.14.1)
243-
jwt (2.10.2)
229+
json (2.7.6)
230+
jwt (2.9.3)
244231
base64
245232
logger (1.6.0)
246-
mime-types (3.7.0)
247-
logger
248-
mime-types-data (~> 3.2025, >= 3.2025.0507)
249-
mime-types-data (3.2025.0924)
233+
mime-types (3.5.1)
234+
mime-types-data (~> 3.2015)
235+
mime-types-data (3.2023.1003)
250236
mini_magick (4.13.2)
251237
mini_mime (1.1.5)
252-
minitest (5.25.5)
238+
minitest (5.24.0)
253239
molinillo (0.8.0)
254-
multi_json (1.17.0)
240+
multi_json (1.15.0)
255241
multipart-post (2.4.1)
256242
mutex_m (0.2.0)
257-
nanaimo (0.4.0)
243+
nanaimo (0.3.0)
258244
nap (1.1.0)
259-
naturally (2.3.0)
245+
naturally (2.2.1)
260246
netrc (0.11.0)
261247
nkf (0.2.0)
262248
optparse (0.6.0)
263249
os (1.1.4)
264250
plist (3.7.2)
265251
public_suffix (4.0.7)
266-
rake (13.3.0)
252+
rake (13.2.1)
267253
representable (3.2.0)
268254
declarative (< 0.1.0)
269255
trailblazer-option (>= 0.1.1, < 0.2.0)
270256
uber (< 0.2.0)
271257
retriable (3.1.2)
272-
rexml (3.4.4)
258+
rexml (3.3.9)
273259
rouge (3.28.0)
274260
ruby-macho (2.5.1)
275261
ruby2_keywords (0.0.5)
276-
rubyzip (2.4.1)
277-
securerandom (0.4.1)
262+
rubyzip (2.3.2)
278263
security (0.1.5)
279-
signet (0.21.0)
264+
signet (0.19.0)
280265
addressable (~> 2.8)
281266
faraday (>= 0.17.5, < 3.a)
282-
jwt (>= 1.5, < 4.0)
267+
jwt (>= 1.5, < 3.0)
283268
multi_json (~> 1.10)
284269
simctl (1.6.10)
285270
CFPropertyList
@@ -293,19 +278,19 @@ GEM
293278
tty-screen (0.8.2)
294279
tty-spinner (0.9.3)
295280
tty-cursor (~> 0.7)
296-
typhoeus (1.5.0)
297-
ethon (>= 0.9.0, < 0.16.0)
281+
typhoeus (1.4.1)
282+
ethon (>= 0.9.0)
298283
tzinfo (2.0.6)
299284
concurrent-ruby (~> 1.0)
300285
uber (0.1.0)
301286
unicode-display_width (2.6.0)
302287
word_wrap (1.0.0)
303-
xcodeproj (1.27.0)
288+
xcodeproj (1.25.1)
304289
CFPropertyList (>= 2.3.3, < 4.0)
305290
atomos (~> 0.1.3)
306291
claide (>= 1.0.2, < 2.0)
307292
colored2 (~> 3.1)
308-
nanaimo (~> 0.4.0)
293+
nanaimo (~> 0.3.0)
309294
rexml (>= 3.3.6, < 4.0)
310295
xcpretty (0.4.1)
311296
rouge (~> 3.28.0)
@@ -323,17 +308,17 @@ DEPENDENCIES
323308
activesupport (>= 6.1.7.5, != 7.1.0)
324309
benchmark
325310
bigdecimal
326-
cocoapods (= 1.16.0)
327-
fastlane (~> 2, >= 2.227.2)
311+
cocoapods (= 1.15.2)
312+
fastlane (~> 2, >= 2.227.1)
328313
fastlane-plugin-aws_s3
329314
fastlane-plugin-firebase_app_distribution
330315
logger
331316
mutex_m
332-
xcodeproj (~> 1.26)
317+
xcodeproj (< 1.26.0)
333318
xcpretty (~> 0)
334319

335320
RUBY VERSION
336321
ruby 3.3.4p94
337322

338323
BUNDLED WITH
339-
2.5.22
324+
2.4.19

0 commit comments

Comments
 (0)