From 3c63938c1523f22e7caaf7da425318d8cde421fb Mon Sep 17 00:00:00 2001 From: Yoshimasa Niwa Date: Sun, 10 Jan 2021 13:58:53 -0800 Subject: [PATCH 1/2] Update Package.swift - Use `name:` for dependencies which causes errors on prior version of Swift Package Manager due to the bug. - Update package manager version to 5.2 (Distributed with Xcode 11.) - FIX: indent, trailing `,`. --- Package.swift | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/Package.swift b/Package.swift index 0b775c9..b78940e 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.1 +// swift-tools-version:5.2 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -7,16 +7,21 @@ let package = Package( name: "SwiftGraphQl", products: [ .executable( - name: "graphql-cli", - targets: ["GraphQlCLI"]), + name: "graphql-cli", + targets: ["GraphQlCLI"]), .library( name: "SwiftGraphQl", - targets: ["SwiftGraphQl"]), + targets: ["SwiftGraphQl"]) ], dependencies: [ - .package(url: "https://github.com/mgadda/swift-parse", Package.Dependency.Requirement.upToNextMinor(from: "0.4.0")) - // Uncomment for local development -// .package(path: "../swift-parse") + // Use `swift package config set-mirror` for local development. + // swift package config set-mirror \ + // --original-url 'https://github.com/mgadda/swift-parse' \ + // --mirror-url '../swift-parse' + .package( + name: "SwiftParse", + url: "https://github.com/mgadda/swift-parse", + .upToNextMinor(from: "0.4.0")) ], targets: [ .target( @@ -25,9 +30,11 @@ let package = Package( ), .target( name: "SwiftGraphQl", - dependencies: ["SwiftParse"]), + dependencies: [ + .product(name: "SwiftParse", package: "SwiftParse") + ]), .testTarget( name: "SwiftGraphQlTests", - dependencies: ["SwiftGraphQl"]), + dependencies: ["SwiftGraphQl"]) ] ) From 0d0c7449ab696b868b5ce22c66bd57d0e77a7132 Mon Sep 17 00:00:00 2001 From: Yoshimasa Niwa Date: Sun, 10 Jan 2021 14:24:31 -0800 Subject: [PATCH 2/2] Revert version to 5.1, remove `name:`. --- Package.swift | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Package.swift b/Package.swift index b78940e..32b53f2 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.2 +// swift-tools-version:5.1 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -19,20 +19,16 @@ let package = Package( // --original-url 'https://github.com/mgadda/swift-parse' \ // --mirror-url '../swift-parse' .package( - name: "SwiftParse", url: "https://github.com/mgadda/swift-parse", .upToNextMinor(from: "0.4.0")) ], targets: [ .target( name: "GraphQlCLI", - dependencies: ["SwiftGraphQl"] - ), + dependencies: ["SwiftGraphQl"]), .target( name: "SwiftGraphQl", - dependencies: [ - .product(name: "SwiftParse", package: "SwiftParse") - ]), + dependencies: ["SwiftParse"]), .testTarget( name: "SwiftGraphQlTests", dependencies: ["SwiftGraphQl"])