Skip to content

Commit ba46b6d

Browse files
cbaker6cbaker6
authoredJul 11, 2024··
feat: Conform to Sendable (#69)
* feat: Conform to Sendable * fix test due to improved option hashing
·
0.14.00.10.0
1 parent 3c8cc44 commit ba46b6d

File tree

5 files changed

+43
-43
lines changed

5 files changed

+43
-43
lines changed
 

‎Package.resolved

+36-36
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"kind" : "remoteSourceControl",
66
"location" : "https://github.com/swift-server/async-http-client.git",
77
"state" : {
8-
"revision" : "291438696abdd48d2a83b52465c176efbd94512b",
9-
"version" : "1.20.1"
8+
"revision" : "0ae99db85b2b9d1e79b362bd31fd1ffe492f7c47",
9+
"version" : "1.21.2"
1010
}
1111
},
1212
{
@@ -23,35 +23,35 @@
2323
"kind" : "remoteSourceControl",
2424
"location" : "https://github.com/vapor/console-kit.git",
2525
"state" : {
26-
"revision" : "a31f44ebfbd15a2cc0fda705279676773ac16355",
27-
"version" : "4.14.1"
26+
"revision" : "9f7932f22ab6f64aafadc14491e694179b7d0f6f",
27+
"version" : "4.14.3"
2828
}
2929
},
3030
{
3131
"identity" : "multipart-kit",
3232
"kind" : "remoteSourceControl",
3333
"location" : "https://github.com/vapor/multipart-kit.git",
3434
"state" : {
35-
"revision" : "12ee56f25bd3fc4c2d09c2aa16e69de61dc786e8",
36-
"version" : "4.6.0"
35+
"revision" : "a31236f24bfd2ea2f520a74575881f6731d7ae68",
36+
"version" : "4.7.0"
3737
}
3838
},
3939
{
4040
"identity" : "parse-swift",
4141
"kind" : "remoteSourceControl",
4242
"location" : "https://github.com/netreconlab/Parse-Swift.git",
4343
"state" : {
44-
"revision" : "5c3118cd5b50a5d8c0d0e97a75a32efafedfedda",
45-
"version" : "5.8.2"
44+
"revision" : "10ec67c29050cc7e9d69bc59dda787ec5a145e75",
45+
"version" : "5.10.0"
4646
}
4747
},
4848
{
4949
"identity" : "routing-kit",
5050
"kind" : "remoteSourceControl",
5151
"location" : "https://github.com/vapor/routing-kit.git",
5252
"state" : {
53-
"revision" : "2a92a7eac411a82fb3a03731be5e76773ebe1b3e",
54-
"version" : "4.9.0"
53+
"revision" : "8c9a227476555c55837e569be71944e02a056b72",
54+
"version" : "4.9.1"
5555
}
5656
},
5757
{
@@ -77,89 +77,89 @@
7777
"kind" : "remoteSourceControl",
7878
"location" : "https://github.com/apple/swift-collections.git",
7979
"state" : {
80-
"revision" : "d029d9d39c87bed85b1c50adee7c41795261a192",
81-
"version" : "1.0.6"
80+
"revision" : "3d2dc41a01f9e49d84f0a3925fb858bed64f702d",
81+
"version" : "1.1.2"
8282
}
8383
},
8484
{
8585
"identity" : "swift-crypto",
8686
"kind" : "remoteSourceControl",
8787
"location" : "https://github.com/apple/swift-crypto.git",
8888
"state" : {
89-
"revision" : "cc76b894169a3c86b71bac10c78a4db6beb7a9ad",
90-
"version" : "3.2.0"
89+
"revision" : "46072478ca365fe48370993833cb22de9b41567f",
90+
"version" : "3.5.2"
9191
}
9292
},
9393
{
9494
"identity" : "swift-http-types",
9595
"kind" : "remoteSourceControl",
9696
"location" : "https://github.com/apple/swift-http-types",
9797
"state" : {
98-
"revision" : "12358d55a3824bd5fed310b999ea8cf83a9a1a65",
99-
"version" : "1.0.3"
98+
"revision" : "1ddbea1ee34354a6a2532c60f98501c35ae8edfa",
99+
"version" : "1.2.0"
100100
}
101101
},
102102
{
103103
"identity" : "swift-log",
104104
"kind" : "remoteSourceControl",
105105
"location" : "https://github.com/apple/swift-log.git",
106106
"state" : {
107-
"revision" : "e97a6fcb1ab07462881ac165fdbb37f067e205d5",
108-
"version" : "1.5.4"
107+
"revision" : "9cb486020ebf03bfa5b5df985387a14a98744537",
108+
"version" : "1.6.1"
109109
}
110110
},
111111
{
112112
"identity" : "swift-metrics",
113113
"kind" : "remoteSourceControl",
114114
"location" : "https://github.com/apple/swift-metrics.git",
115115
"state" : {
116-
"revision" : "971ba26378ab69c43737ee7ba967a896cb74c0d1",
117-
"version" : "2.4.1"
116+
"revision" : "e0165b53d49b413dd987526b641e05e246782685",
117+
"version" : "2.5.0"
118118
}
119119
},
120120
{
121121
"identity" : "swift-nio",
122122
"kind" : "remoteSourceControl",
123123
"location" : "https://github.com/apple/swift-nio.git",
124124
"state" : {
125-
"revision" : "635b2589494c97e48c62514bc8b37ced762e0a62",
126-
"version" : "2.63.0"
125+
"revision" : "fc79798d5a150d61361a27ce0c51169b889e23de",
126+
"version" : "2.68.0"
127127
}
128128
},
129129
{
130130
"identity" : "swift-nio-extras",
131131
"kind" : "remoteSourceControl",
132132
"location" : "https://github.com/apple/swift-nio-extras.git",
133133
"state" : {
134-
"revision" : "363da63c1966405764f380c627409b2f9d9e710b",
135-
"version" : "1.21.0"
134+
"revision" : "05c36b57453d23ea63785d58a7dbc7b70ba1745e",
135+
"version" : "1.23.0"
136136
}
137137
},
138138
{
139139
"identity" : "swift-nio-http2",
140140
"kind" : "remoteSourceControl",
141141
"location" : "https://github.com/apple/swift-nio-http2.git",
142142
"state" : {
143-
"revision" : "0904bf0feb5122b7e5c3f15db7df0eabe623dd87",
144-
"version" : "1.30.0"
143+
"revision" : "a0224f3d20438635dd59c9fcc593520d80d131d0",
144+
"version" : "1.33.0"
145145
}
146146
},
147147
{
148148
"identity" : "swift-nio-ssl",
149149
"kind" : "remoteSourceControl",
150150
"location" : "https://github.com/apple/swift-nio-ssl.git",
151151
"state" : {
152-
"revision" : "7c381eb6083542b124a6c18fae742f55001dc2b5",
153-
"version" : "2.26.0"
152+
"revision" : "2b09805797f21c380f7dc9bedaab3157c5508efb",
153+
"version" : "2.27.0"
154154
}
155155
},
156156
{
157157
"identity" : "swift-nio-transport-services",
158158
"kind" : "remoteSourceControl",
159159
"location" : "https://github.com/apple/swift-nio-transport-services.git",
160160
"state" : {
161-
"revision" : "6cbe0ed2b394f21ab0d46b9f0c50c6be964968ce",
162-
"version" : "1.20.1"
161+
"revision" : "38ac8221dd20674682148d6451367f89c2652980",
162+
"version" : "1.21.0"
163163
}
164164
},
165165
{
@@ -176,26 +176,26 @@
176176
"kind" : "remoteSourceControl",
177177
"location" : "https://github.com/apple/swift-system.git",
178178
"state" : {
179-
"revision" : "025bcb1165deab2e20d4eaba79967ce73013f496",
180-
"version" : "1.2.1"
179+
"revision" : "6a9e38e7bd22a3b8ba80bddf395623cf68f57807",
180+
"version" : "1.3.1"
181181
}
182182
},
183183
{
184184
"identity" : "vapor",
185185
"kind" : "remoteSourceControl",
186186
"location" : "https://github.com/vapor/vapor.git",
187187
"state" : {
188-
"revision" : "4942d74e8493fc918ed6144c835c8a0e6affd4f4",
189-
"version" : "4.92.1"
188+
"revision" : "a823735db57b46100b0c61cdfc5a08525b1e7cad",
189+
"version" : "4.102.1"
190190
}
191191
},
192192
{
193193
"identity" : "websocket-kit",
194194
"kind" : "remoteSourceControl",
195195
"location" : "https://github.com/vapor/websocket-kit.git",
196196
"state" : {
197-
"revision" : "53fe0639a98903858d0196b699720decb42aee7b",
198-
"version" : "2.14.0"
197+
"revision" : "4232d34efa49f633ba61afde365d3896fc7f8740",
198+
"version" : "2.15.0"
199199
}
200200
}
201201
],

‎Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ let package = Package(
2121
dependencies: [
2222
.package(
2323
url: "https://github.com/vapor/vapor.git",
24-
.upToNextMajor(from: "4.92.1")
24+
.upToNextMajor(from: "4.102.1")
2525
),
2626
.package(
2727
url: "https://github.com/netreconlab/Parse-Swift.git",
28-
.upToNextMajor(from: "5.8.2")
28+
.upToNextMajor(from: "5.10.0")
2929
)
3030
],
3131
targets: [

‎Sources/App/entrypoint.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ enum Entrypoint {
3434
var env = try Environment.detect()
3535
try LoggingSystem.bootstrap(from: &env)
3636

37-
let app = Application(env)
37+
let app = try await Application.make(env)
3838

3939
defer { app.shutdown() }
4040

‎Sources/ParseServerSwift/Parse.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func initializeServer(_ configuration: ParseServerConfiguration,
7373
try await checkServerHealth()
7474
} catch {
7575
await deleteHooks(app)
76-
app.shutdown()
76+
try await app.asyncShutdown()
7777
}
7878
} else {
7979
Parse.configuration = configuration

‎Tests/ParseServerSwiftTests/AppTests.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -195,16 +195,16 @@ final class AppTests: XCTestCase {
195195
from: encoded)
196196

197197
let options = hookRequest.options()
198-
let installationOption = options.first(where: { $0 == .installationId("") })
198+
let installationOption = options.first(where: { $0 == .installationId(installationId) })
199199
XCTAssertEqual(options.count, 1)
200200
XCTAssertTrue(installationOption.debugDescription.contains(installationId))
201201

202202
let uri = URI(stringLiteral: urlString)
203203
let request = Request(application: app, url: uri, on: app.eventLoopGroup.any())
204204
let options2 = try hookRequest.options(request,
205205
parseServerURLStrings: configuration.parseServerURLStrings)
206-
let installationOption2 = options2.first(where: { $0 == .installationId("") })
207-
let serverURLOption = options2.first(where: { $0 == .serverURL("") })
206+
let installationOption2 = options2.first(where: { $0 == .installationId(installationId) })
207+
let serverURLOption = options2.first(where: { $0 == .serverURL(urlString) })
208208
XCTAssertEqual(options2.count, 2)
209209
XCTAssertTrue(installationOption2.debugDescription.contains(installationId))
210210
XCTAssertTrue(serverURLOption.debugDescription.contains("\"\(urlString)\""))

0 commit comments

Comments
 (0)
Please sign in to comment.