Skip to content

Commit 373ffd5

Browse files
authored
Remove required platforms from SPM (#761)
Motivation: We recently specified which platforms we supported in Package.swift based on what SwiftNIO supported. These minimum versions recently decreased making the platform requirement specification in Package.swift unnecessary. Modifications: - Remove platforms from Package.swift - Fix #file passed to function argument Result: - Dependents of gRPC Swift don't require their Package.swift to declare their supported platforms
1 parent abc32f7 commit 373ffd5

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

Package.resolved

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"pins": [
44
{
55
"package": "swift-log",
6-
"repositoryURL": "https://github.com/apple/swift-log",
6+
"repositoryURL": "https://github.com/apple/swift-log.git",
77
"state": {
88
"branch": null,
99
"revision": "74d7b91ceebc85daf387ebb206003f78813f71aa",
@@ -15,26 +15,26 @@
1515
"repositoryURL": "https://github.com/apple/swift-nio.git",
1616
"state": {
1717
"branch": null,
18-
"revision": "16ab4d657e1ad4e77bd5f8b94af8538561643053",
19-
"version": "2.14.0"
18+
"revision": "a27a07719ca785bcaca019a5b9fe1814b981b4a2",
19+
"version": "2.15.0"
2020
}
2121
},
2222
{
2323
"package": "swift-nio-http2",
2424
"repositoryURL": "https://github.com/apple/swift-nio-http2.git",
2525
"state": {
2626
"branch": null,
27-
"revision": "c1bfb7ce3f201e41ff60ef38fa63e67e0eb66a24",
28-
"version": "1.9.0"
27+
"revision": "82eb3fa0974b838358ee46bc6c5381e5ae5de6b9",
28+
"version": "1.11.0"
2929
}
3030
},
3131
{
3232
"package": "swift-nio-ssl",
3333
"repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
3434
"state": {
3535
"branch": null,
36-
"revision": "af46d9b58fafbb76f9b01177568d435a1b024f99",
37-
"version": "2.6.2"
36+
"revision": "584c0d06c46233d3e1759695e5eff495b12edcd2",
37+
"version": "2.7.0"
3838
}
3939
},
4040
{

Package.swift

-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ import Foundation
1919

2020
let package = Package(
2121
name: "grpc-swift",
22-
platforms: [
23-
// We can't use `.watchOS(.v6)` since it isn't available with `swift-tools-version:5.0`.
24-
.macOS(.v10_12), .iOS(.v10), .tvOS(.v10), .watchOS("6.0")
25-
],
2622
products: [
2723
.library(name: "GRPC", targets: ["GRPC"]),
2824
.executable(name: "protoc-gen-grpc-swift", targets: ["protoc-gen-grpc-swift"]),

Sources/GRPC/GRPCError.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ extension GRPCErrorProtocol {
291291
internal func captureContext(
292292
file: StaticString = #file,
293293
line: Int = #line,
294-
function: StaticString = #file
294+
function: StaticString = #function
295295
) -> GRPCError.WithContext {
296296
return GRPCError.WithContext(self, file: file, line: line, function: function)
297297
}

0 commit comments

Comments
 (0)