Skip to content

Commit 6639e45

Browse files
authored
Remove warnings from Package.swift (#1469)
Motivation: In #1467 different Package.swift versions were added. Raising the tools version to 5.6 in 'Package.swift' highlighted use of deprecated SPM APIs. Modifications: - Stop using the deprecated API in Package.swift - Remove the code conditionalised on the Swift version Result: Fewer warnings
1 parent f624b00 commit 6639e45

File tree

3 files changed

+7
-30
lines changed

3 files changed

+7
-30
lines changed

Package.swift

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,6 @@ let cgrpcZlibTargetName = cgrpcZlibProductName
2727

2828
let includeNIOSSL = ProcessInfo.processInfo.environment["GRPC_NO_NIO_SSL"] == nil
2929

30-
#if swift(>=5.6)
31-
// swift-argument-parser raised its minimum Swift version in 1.1.0 but
32-
// also accidentally broke API. This was fixed in "1.1.1".
33-
let argumentParserMinimumVersion: Version = "1.1.1"
34-
#else
35-
let argumentParserMinimumVersion: Version = "1.0.0"
36-
#endif
37-
3830
// MARK: - Package Dependencies
3931

4032
let packageDependencies: [Package.Dependency] = [
@@ -55,7 +47,6 @@ let packageDependencies: [Package.Dependency] = [
5547
from: "1.4.0"
5648
),
5749
.package(
58-
name: "SwiftProtobuf",
5950
url: "https://github.com/apple/swift-protobuf.git",
6051
from: "1.19.0"
6152
),
@@ -65,7 +56,9 @@ let packageDependencies: [Package.Dependency] = [
6556
),
6657
.package(
6758
url: "https://github.com/apple/swift-argument-parser.git",
68-
from: argumentParserMinimumVersion
59+
// Version is higher than in other Package@swift manifests: 1.1.0 raised the minimum Swift
60+
// version and indluded async support.
61+
from: "1.1.1"
6962
),
7063
.package(
7164
url: "https://github.com/apple/swift-docc-plugin",
@@ -121,10 +114,10 @@ extension Target.Dependency {
121114
package: "swift-nio-transport-services"
122115
)
123116
static let logging: Self = .product(name: "Logging", package: "swift-log")
124-
static let protobuf: Self = .product(name: "SwiftProtobuf", package: "SwiftProtobuf")
117+
static let protobuf: Self = .product(name: "SwiftProtobuf", package: "swift-protobuf")
125118
static let protobufPluginLibrary: Self = .product(
126119
name: "SwiftProtobufPluginLibrary",
127-
package: "SwiftProtobuf"
120+
package: "swift-protobuf"
128121
)
129122
}
130123

[email protected]

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,6 @@ let cgrpcZlibTargetName = cgrpcZlibProductName
2727

2828
let includeNIOSSL = ProcessInfo.processInfo.environment["GRPC_NO_NIO_SSL"] == nil
2929

30-
#if swift(>=5.6)
31-
// swift-argument-parser raised its minimum Swift version in 1.1.0 but
32-
// also accidentally broke API. This was fixed in "1.1.1".
33-
let argumentParserMinimumVersion: Version = "1.1.1"
34-
#else
35-
let argumentParserMinimumVersion: Version = "1.0.0"
36-
#endif
37-
3830
// MARK: - Package Dependencies
3931

4032
let packageDependencies: [Package.Dependency] = [
@@ -65,7 +57,7 @@ let packageDependencies: [Package.Dependency] = [
6557
),
6658
.package(
6759
url: "https://github.com/apple/swift-argument-parser.git",
68-
from: argumentParserMinimumVersion
60+
from: "1.0.0"
6961
),
7062
].appending(
7163
.package(

[email protected]

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,6 @@ let cgrpcZlibTargetName = cgrpcZlibProductName
2727

2828
let includeNIOSSL = ProcessInfo.processInfo.environment["GRPC_NO_NIO_SSL"] == nil
2929

30-
#if swift(>=5.6)
31-
// swift-argument-parser raised its minimum Swift version in 1.1.0 but
32-
// also accidentally broke API. This was fixed in "1.1.1".
33-
let argumentParserMinimumVersion: Version = "1.1.1"
34-
#else
35-
let argumentParserMinimumVersion: Version = "1.0.0"
36-
#endif
37-
3830
// MARK: - Package Dependencies
3931

4032
let packageDependencies: [Package.Dependency] = [
@@ -65,7 +57,7 @@ let packageDependencies: [Package.Dependency] = [
6557
),
6658
.package(
6759
url: "https://github.com/apple/swift-argument-parser.git",
68-
from: argumentParserMinimumVersion
60+
from: "1.0.0"
6961
),
7062
].appending(
7163
.package(

0 commit comments

Comments
 (0)