Skip to content

Commit f3f757b

Browse files
authored
fix: remove webrick by updating dependencies (#39)
1 parent 5890546 commit f3f757b

File tree

6 files changed

+7224
-8122
lines changed

6 files changed

+7224
-8122
lines changed

Gemfile.lock

+105-74
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,54 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.6)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
6-
activesupport (7.0.7.2)
7-
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
activesupport (7.2.1)
9+
base64
10+
bigdecimal
11+
concurrent-ruby (~> 1.0, >= 1.3.1)
12+
connection_pool (>= 2.2.5)
13+
drb
814
i18n (>= 1.6, < 2)
15+
logger (>= 1.4.2)
916
minitest (>= 5.1)
10-
tzinfo (~> 2.0)
11-
addressable (2.8.5)
12-
public_suffix (>= 2.0.2, < 6.0)
17+
securerandom (>= 0.3)
18+
tzinfo (~> 2.0, >= 2.0.5)
19+
addressable (2.8.7)
20+
public_suffix (>= 2.0.2, < 7.0)
1321
algoliasearch (1.27.5)
1422
httpclient (~> 2.8, >= 2.8.3)
1523
json (>= 1.5.1)
16-
artifactory (3.0.15)
24+
artifactory (3.0.17)
1725
atomos (0.1.3)
18-
aws-eventstream (1.2.0)
19-
aws-partitions (1.829.0)
20-
aws-sdk-core (3.184.0)
21-
aws-eventstream (~> 1, >= 1.0.2)
26+
aws-eventstream (1.3.0)
27+
aws-partitions (1.977.0)
28+
aws-sdk-core (3.208.0)
29+
aws-eventstream (~> 1, >= 1.3.0)
2230
aws-partitions (~> 1, >= 1.651.0)
23-
aws-sigv4 (~> 1.5)
31+
aws-sigv4 (~> 1.9)
2432
jmespath (~> 1, >= 1.6.1)
25-
aws-sdk-kms (1.72.0)
26-
aws-sdk-core (~> 3, >= 3.184.0)
27-
aws-sigv4 (~> 1.1)
28-
aws-sdk-s3 (1.136.0)
29-
aws-sdk-core (~> 3, >= 3.181.0)
33+
aws-sdk-kms (1.93.0)
34+
aws-sdk-core (~> 3, >= 3.207.0)
35+
aws-sigv4 (~> 1.5)
36+
aws-sdk-s3 (1.165.0)
37+
aws-sdk-core (~> 3, >= 3.207.0)
3038
aws-sdk-kms (~> 1)
31-
aws-sigv4 (~> 1.6)
32-
aws-sigv4 (1.6.0)
39+
aws-sigv4 (~> 1.5)
40+
aws-sigv4 (1.10.0)
3341
aws-eventstream (~> 1, >= 1.0.2)
3442
babosa (1.0.4)
43+
base64 (0.2.0)
44+
bigdecimal (3.1.8)
3545
claide (1.1.0)
36-
cocoapods (1.12.1)
46+
cocoapods (1.15.2)
3747
addressable (~> 2.8)
3848
claide (>= 1.0.2, < 2.0)
39-
cocoapods-core (= 1.12.1)
49+
cocoapods-core (= 1.15.2)
4050
cocoapods-deintegrate (>= 1.0.3, < 2.0)
41-
cocoapods-downloader (>= 1.6.0, < 2.0)
51+
cocoapods-downloader (>= 2.1, < 3.0)
4252
cocoapods-plugins (>= 1.0.0, < 2.0)
4353
cocoapods-search (>= 1.0.0, < 2.0)
4454
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -50,8 +60,8 @@ GEM
5060
molinillo (~> 0.8.0)
5161
nap (~> 1.0)
5262
ruby-macho (>= 2.3.0, < 3.0)
53-
xcodeproj (>= 1.21.0, < 2.0)
54-
cocoapods-core (1.12.1)
63+
xcodeproj (>= 1.23.0, < 2.0)
64+
cocoapods-core (1.15.2)
5565
activesupport (>= 5.0, < 8)
5666
addressable (~> 2.8)
5767
algoliasearch (~> 1.0)
@@ -62,7 +72,7 @@ GEM
6272
public_suffix (~> 4.0)
6373
typhoeus (~> 1.0)
6474
cocoapods-deintegrate (1.0.5)
65-
cocoapods-downloader (1.6.3)
75+
cocoapods-downloader (2.1)
6676
cocoapods-plugins (1.0.0)
6777
nap
6878
cocoapods-search (1.0.1)
@@ -74,19 +84,20 @@ GEM
7484
colored2 (3.1.2)
7585
commander (4.6.0)
7686
highline (~> 2.0.0)
77-
concurrent-ruby (1.2.2)
87+
concurrent-ruby (1.3.4)
88+
connection_pool (2.4.1)
7889
declarative (0.0.20)
7990
digest-crc (0.6.5)
8091
rake (>= 12.0.0, < 14.0.0)
81-
domain_name (0.5.20190701)
82-
unf (>= 0.0.5, < 1.0.0)
92+
domain_name (0.6.20240107)
8393
dotenv (2.8.1)
94+
drb (2.2.1)
8495
emoji_regex (3.2.3)
8596
escape (0.0.4)
8697
ethon (0.16.0)
8798
ffi (>= 1.15.0)
88-
excon (0.103.0)
89-
faraday (1.10.3)
99+
excon (0.111.0)
100+
faraday (1.10.4)
90101
faraday-em_http (~> 1.0)
91102
faraday-em_synchrony (~> 1.0)
92103
faraday-excon (~> 1.1)
@@ -107,22 +118,22 @@ GEM
107118
faraday-httpclient (1.0.1)
108119
faraday-multipart (1.0.4)
109120
multipart-post (~> 2)
110-
faraday-net_http (1.0.1)
121+
faraday-net_http (1.0.2)
111122
faraday-net_http_persistent (1.2.0)
112123
faraday-patron (1.0.0)
113124
faraday-rack (1.0.0)
114125
faraday-retry (1.0.3)
115-
faraday_middleware (1.2.0)
126+
faraday_middleware (1.2.1)
116127
faraday (~> 1.0)
117-
fastimage (2.2.7)
118-
fastlane (2.216.0)
128+
fastimage (2.3.1)
129+
fastlane (2.222.0)
119130
CFPropertyList (>= 2.3, < 4.0.0)
120131
addressable (>= 2.8, < 3.0.0)
121132
artifactory (~> 3.0)
122133
aws-sdk-s3 (~> 1.0)
123134
babosa (>= 1.0.3, < 2.0.0)
124135
bundler (>= 1.12.0, < 3.0.0)
125-
colored
136+
colored (~> 1.2)
126137
commander (~> 4.6)
127138
dotenv (>= 2.1.1, < 3.0.0)
128139
emoji_regex (>= 0.1, < 4.0)
@@ -134,6 +145,7 @@ GEM
134145
gh_inspector (>= 1.1.2, < 2.0.0)
135146
google-apis-androidpublisher_v3 (~> 0.3)
136147
google-apis-playcustomapp_v1 (~> 0.1)
148+
google-cloud-env (>= 1.6.0, < 2.0.0)
137149
google-cloud-storage (~> 1.31)
138150
highline (~> 2.0)
139151
http-cookie (~> 1.0.5)
@@ -142,10 +154,10 @@ GEM
142154
mini_magick (>= 4.9.4, < 5.0.0)
143155
multipart-post (>= 2.0.0, < 3.0.0)
144156
naturally (~> 2.2)
145-
optparse (~> 0.1.1)
157+
optparse (>= 0.1.1, < 1.0.0)
146158
plist (>= 3.1.0, < 4.0.0)
147159
rubyzip (>= 2.0.0, < 3.0.0)
148-
security (= 0.1.3)
160+
security (= 0.1.5)
149161
simctl (~> 1.6.3)
150162
terminal-notifier (>= 2.0.0, < 3.0.0)
151163
terminal-table (~> 3)
@@ -154,39 +166,48 @@ GEM
154166
word_wrap (~> 1.0.0)
155167
xcodeproj (>= 1.13.0, < 2.0.0)
156168
xcpretty (~> 0.3.0)
157-
xcpretty-travis-formatter (>= 0.0.3)
158-
ffi (1.15.5)
169+
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
170+
ffi (1.17.0)
171+
ffi (1.17.0-aarch64-linux-gnu)
172+
ffi (1.17.0-aarch64-linux-musl)
173+
ffi (1.17.0-arm-linux-gnu)
174+
ffi (1.17.0-arm-linux-musl)
175+
ffi (1.17.0-arm64-darwin)
176+
ffi (1.17.0-x86-linux-gnu)
177+
ffi (1.17.0-x86-linux-musl)
178+
ffi (1.17.0-x86_64-darwin)
179+
ffi (1.17.0-x86_64-linux-gnu)
180+
ffi (1.17.0-x86_64-linux-musl)
159181
fourflusher (2.3.1)
160182
fuzzy_match (2.0.4)
161183
gh_inspector (1.1.3)
162-
google-apis-androidpublisher_v3 (0.50.0)
184+
google-apis-androidpublisher_v3 (0.54.0)
163185
google-apis-core (>= 0.11.0, < 2.a)
164-
google-apis-core (0.11.1)
186+
google-apis-core (0.11.3)
165187
addressable (~> 2.5, >= 2.5.1)
166188
googleauth (>= 0.16.2, < 2.a)
167189
httpclient (>= 2.8.1, < 3.a)
168190
mini_mime (~> 1.0)
169191
representable (~> 3.0)
170192
retriable (>= 2.0, < 4.a)
171193
rexml
172-
webrick
173194
google-apis-iamcredentials_v1 (0.17.0)
174195
google-apis-core (>= 0.11.0, < 2.a)
175196
google-apis-playcustomapp_v1 (0.13.0)
176197
google-apis-core (>= 0.11.0, < 2.a)
177-
google-apis-storage_v1 (0.19.0)
178-
google-apis-core (>= 0.9.0, < 2.a)
179-
google-cloud-core (1.6.0)
180-
google-cloud-env (~> 1.0)
198+
google-apis-storage_v1 (0.31.0)
199+
google-apis-core (>= 0.11.0, < 2.a)
200+
google-cloud-core (1.7.1)
201+
google-cloud-env (>= 1.0, < 3.a)
181202
google-cloud-errors (~> 1.0)
182203
google-cloud-env (1.6.0)
183204
faraday (>= 0.17.3, < 3.0)
184-
google-cloud-errors (1.3.1)
185-
google-cloud-storage (1.44.0)
205+
google-cloud-errors (1.4.0)
206+
google-cloud-storage (1.47.0)
186207
addressable (~> 2.8)
187208
digest-crc (~> 0.4)
188209
google-apis-iamcredentials_v1 (~> 0.1)
189-
google-apis-storage_v1 (~> 0.19.0)
210+
google-apis-storage_v1 (~> 0.31.0)
190211
google-cloud-core (~> 1.6)
191212
googleauth (>= 0.16.2, < 2.a)
192213
mini_mime (~> 1.0)
@@ -197,41 +218,45 @@ GEM
197218
os (>= 0.9, < 2.0)
198219
signet (>= 0.16, < 2.a)
199220
highline (2.0.3)
200-
http-cookie (1.0.5)
221+
http-cookie (1.0.7)
201222
domain_name (~> 0.5)
202223
httpclient (2.8.3)
203-
i18n (1.14.1)
224+
i18n (1.14.6)
204225
concurrent-ruby (~> 1.0)
205226
jmespath (1.6.2)
206-
json (2.6.3)
207-
jwt (2.7.1)
208-
mini_magick (4.12.0)
227+
json (2.7.2)
228+
jwt (2.9.1)
229+
base64
230+
logger (1.6.1)
231+
mini_magick (4.13.2)
209232
mini_mime (1.1.5)
210-
minitest (5.19.0)
233+
minitest (5.25.1)
211234
molinillo (0.8.0)
212235
multi_json (1.15.0)
213-
multipart-post (2.3.0)
236+
multipart-post (2.4.1)
214237
nanaimo (0.3.0)
215238
nap (1.1.0)
216239
naturally (2.2.1)
217240
netrc (0.11.0)
218-
optparse (0.1.1)
241+
nkf (0.2.0)
242+
optparse (0.5.0)
219243
os (1.1.4)
220-
plist (3.7.0)
244+
plist (3.7.1)
221245
public_suffix (4.0.7)
222-
rake (13.0.6)
246+
rake (13.2.1)
223247
representable (3.2.0)
224248
declarative (< 0.1.0)
225249
trailblazer-option (>= 0.1.1, < 0.2.0)
226250
uber (< 0.2.0)
227251
retriable (3.1.2)
228-
rexml (3.2.6)
252+
rexml (3.3.7)
229253
rouge (2.0.7)
230254
ruby-macho (2.5.1)
231255
ruby2_keywords (0.0.5)
232256
rubyzip (2.3.2)
233-
security (0.1.3)
234-
signet (0.18.0)
257+
securerandom (0.3.1)
258+
security (0.1.5)
259+
signet (0.19.0)
235260
addressable (~> 2.8)
236261
faraday (>= 0.17.5, < 3.a)
237262
jwt (>= 1.5, < 3.0)
@@ -245,27 +270,23 @@ GEM
245270
unicode-display_width (>= 1.1.1, < 3)
246271
trailblazer-option (0.1.2)
247272
tty-cursor (0.7.1)
248-
tty-screen (0.8.1)
273+
tty-screen (0.8.2)
249274
tty-spinner (0.9.3)
250275
tty-cursor (~> 0.7)
251-
typhoeus (1.4.0)
276+
typhoeus (1.4.1)
252277
ethon (>= 0.9.0)
253278
tzinfo (2.0.6)
254279
concurrent-ruby (~> 1.0)
255280
uber (0.1.0)
256-
unf (0.1.4)
257-
unf_ext
258-
unf_ext (0.0.8.2)
259-
unicode-display_width (2.4.2)
260-
webrick (1.8.1)
281+
unicode-display_width (2.6.0)
261282
word_wrap (1.0.0)
262-
xcodeproj (1.23.0)
283+
xcodeproj (1.25.0)
263284
CFPropertyList (>= 2.3.3, < 4.0)
264285
atomos (~> 0.1.3)
265286
claide (>= 1.0.2, < 2.0)
266287
colored2 (~> 3.1)
267288
nanaimo (~> 0.3.0)
268-
rexml (~> 3.2.4)
289+
rexml (>= 3.3.2, < 4.0)
269290
xcov (1.8.1)
270291
fastlane (>= 2.141.0, < 3.0.0)
271292
multipart-post
@@ -277,15 +298,25 @@ GEM
277298
rouge (~> 2.0.7)
278299
xcpretty-travis-formatter (1.0.1)
279300
xcpretty (~> 0.2, >= 0.0.7)
280-
xcresult (0.2.1)
301+
xcresult (0.2.2)
281302

282303
PLATFORMS
283-
x86_64-darwin-22
304+
aarch64-linux-gnu
305+
aarch64-linux-musl
306+
arm-linux-gnu
307+
arm-linux-musl
308+
arm64-darwin
309+
ruby
310+
x86-linux-gnu
311+
x86-linux-musl
312+
x86_64-darwin
313+
x86_64-linux-gnu
314+
x86_64-linux-musl
284315

285316
DEPENDENCIES
286317
cocoapods (~> 1.12)
287318
fastlane (~> 2.214)
288319
xcov (~> 1.8)
289320

290321
BUNDLED WITH
291-
2.4.19
322+
2.5.11

Sources/PayPalMessages/Utils/Log.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func log(_ level: LogLevel, _ message: String, with data: Data? = nil, for envir
2121
options: .prettyPrinted
2222
) else { return }
2323
message += "\n"
24-
message += String(decoding: jsonData, as: UTF8.self)
24+
message += String(data: jsonData, encoding: .utf8) ?? ""
2525
}
2626

2727
print(message)

Tests/PayPalMessagesTests/PayPalMessageLoggerTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,8 @@ final class PayPalMessageLoggerTests: XCTestCase {
542542
withJSONObject: expected,
543543
options: .prettyPrinted
544544
) {
545-
let payloadString = String(decoding: payloadData, as: UTF8.self)
546-
let expectedString = String(decoding: expectedData, as: UTF8.self)
545+
let payloadString = String(data: payloadData, encoding: .utf8) ?? ""
546+
let expectedString = String(data: expectedData, encoding: .utf8) ?? ""
547547

548548
print("Expected:\n\(expectedString)\n\nReceived:\n\(payloadString)")
549549
}

Tests/PayPalMessagesTests/PayPalMessageResponseTests.swift

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import XCTest
55
final class MessageResponseTests: XCTestCase {
66

77
func testDecodeMessageResponse() throws {
8-
let json = """
8+
let json = Data("""
99
{
1010
"meta": {
1111
"credit_product_group": "PAY_LATER",
@@ -53,9 +53,7 @@ final class MessageResponseTests: XCTestCase {
5353
}
5454
}
5555
}
56-
"""
57-
// swiftlint:disable force_unwrapping
58-
.data(using: .utf8)!
56+
""".utf8)
5957

6058
let decoder = JSONDecoder()
6159
let messageResponse = try decoder.decode(MessageResponse.self, from: json)

0 commit comments

Comments
 (0)