Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove warnings from Package.swift #1469

Merged
merged 1 commit into from
Aug 9, 2022
Merged

Remove warnings from Package.swift #1469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,6 @@ let cgrpcZlibTargetName = cgrpcZlibProductName

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

#if swift(>=5.6)
// swift-argument-parser raised its minimum Swift version in 1.1.0 but
// also accidentally broke API. This was fixed in "1.1.1".
let argumentParserMinimumVersion: Version = "1.1.1"
#else
let argumentParserMinimumVersion: Version = "1.0.0"
#endif

// MARK: - Package Dependencies

let packageDependencies: [Package.Dependency] = [
Expand All @@ -55,7 +47,6 @@ let packageDependencies: [Package.Dependency] = [
from: "1.4.0"
),
.package(
name: "SwiftProtobuf",
url: "https://github.com/apple/swift-protobuf.git",
from: "1.19.0"
),
Expand All @@ -65,7 +56,9 @@ let packageDependencies: [Package.Dependency] = [
),
.package(
url: "https://github.com/apple/swift-argument-parser.git",
from: argumentParserMinimumVersion
// Version is higher than in other Package@swift manifests: 1.1.0 raised the minimum Swift
// version and indluded async support.
from: "1.1.1"
),
.package(
url: "https://github.com/apple/swift-docc-plugin",
Expand Down Expand Up @@ -121,10 +114,10 @@ extension Target.Dependency {
package: "swift-nio-transport-services"
)
static let logging: Self = .product(name: "Logging", package: "swift-log")
static let protobuf: Self = .product(name: "SwiftProtobuf", package: "SwiftProtobuf")
static let protobuf: Self = .product(name: "SwiftProtobuf", package: "swift-protobuf")
static let protobufPluginLibrary: Self = .product(
name: "SwiftProtobufPluginLibrary",
package: "SwiftProtobuf"
package: "swift-protobuf"
)
}

Expand Down
10 changes: 1 addition & 9 deletions [email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,6 @@ let cgrpcZlibTargetName = cgrpcZlibProductName

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

#if swift(>=5.6)
// swift-argument-parser raised its minimum Swift version in 1.1.0 but
// also accidentally broke API. This was fixed in "1.1.1".
let argumentParserMinimumVersion: Version = "1.1.1"
#else
let argumentParserMinimumVersion: Version = "1.0.0"
#endif

// MARK: - Package Dependencies

let packageDependencies: [Package.Dependency] = [
Expand Down Expand Up @@ -65,7 +57,7 @@ let packageDependencies: [Package.Dependency] = [
),
.package(
url: "https://github.com/apple/swift-argument-parser.git",
from: argumentParserMinimumVersion
from: "1.0.0"
),
].appending(
.package(
Expand Down
10 changes: 1 addition & 9 deletions [email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,6 @@ let cgrpcZlibTargetName = cgrpcZlibProductName

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

#if swift(>=5.6)
// swift-argument-parser raised its minimum Swift version in 1.1.0 but
// also accidentally broke API. This was fixed in "1.1.1".
let argumentParserMinimumVersion: Version = "1.1.1"
#else
let argumentParserMinimumVersion: Version = "1.0.0"
#endif

// MARK: - Package Dependencies

let packageDependencies: [Package.Dependency] = [
Expand Down Expand Up @@ -65,7 +57,7 @@ let packageDependencies: [Package.Dependency] = [
),
.package(
url: "https://github.com/apple/swift-argument-parser.git",
from: argumentParserMinimumVersion
from: "1.0.0"
),
].appending(
.package(
Expand Down