From c3de50014403b75107c4a40b987d883c98079eb6 Mon Sep 17 00:00:00 2001 From: Fabian Fett Date: Thu, 21 Apr 2022 09:03:33 +0200 Subject: [PATCH] Fix Package.swift symlink issues --- Package.swift | 15 ++------------- Package@swift-5.5.swift | 1 - ...age@swift-5.4.swift => Package@swift-5.6.swift | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 16 deletions(-) delete mode 120000 Package@swift-5.5.swift rename Package@swift-5.4.swift => Package@swift-5.6.swift (81%) diff --git a/Package.swift b/Package.swift index 9d6a9db3..90ace14b 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.6 +// swift-tools-version:5.4 import PackageDescription @@ -9,8 +9,6 @@ let package = Package( .library(name: "AWSLambdaRuntime", targets: ["AWSLambdaRuntime"]), // this has all the main functionality for lambda and it does not link Foundation .library(name: "AWSLambdaRuntimeCore", targets: ["AWSLambdaRuntimeCore"]), - // plugin to package the lambda, creating an archive that can be uploaded to AWS - .plugin(name: "AWSLambdaPackager", targets: ["AWSLambdaPackager"]), // for testing only .library(name: "AWSLambdaTesting", targets: ["AWSLambdaTesting"]), ], @@ -33,15 +31,6 @@ let package = Package( .product(name: "NIOConcurrencyHelpers", package: "swift-nio"), .product(name: "NIOPosix", package: "swift-nio"), ]), - .plugin( - name: "AWSLambdaPackager", - capability: .command( - intent: .custom( - verb: "archive", - description: "Archive the Lambda binary and prepare it for uploading to AWS. Requires docker on macOS." - ) - ) - ), .testTarget(name: "AWSLambdaRuntimeCoreTests", dependencies: [ .byName(name: "AWSLambdaRuntimeCore"), .product(name: "NIOTestUtils", package: "swift-nio"), @@ -58,7 +47,7 @@ let package = Package( ]), .testTarget(name: "AWSLambdaTestingTests", dependencies: ["AWSLambdaTesting"]), // for perf testing - .executableTarget(name: "MockServer", dependencies: [ + .target(name: "MockServer", dependencies: [ .product(name: "NIOHTTP1", package: "swift-nio"), .product(name: "NIO", package: "swift-nio"), ]), diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift deleted file mode 120000 index bd1da396..00000000 --- a/Package@swift-5.5.swift +++ /dev/null @@ -1 +0,0 @@ -Package@swift-5.4.swift \ No newline at end of file diff --git a/Package@swift-5.4.swift b/Package@swift-5.6.swift similarity index 81% rename from Package@swift-5.4.swift rename to Package@swift-5.6.swift index 90ace14b..9d6a9db3 100644 --- a/Package@swift-5.4.swift +++ b/Package@swift-5.6.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.4 +// swift-tools-version:5.6 import PackageDescription @@ -9,6 +9,8 @@ let package = Package( .library(name: "AWSLambdaRuntime", targets: ["AWSLambdaRuntime"]), // this has all the main functionality for lambda and it does not link Foundation .library(name: "AWSLambdaRuntimeCore", targets: ["AWSLambdaRuntimeCore"]), + // plugin to package the lambda, creating an archive that can be uploaded to AWS + .plugin(name: "AWSLambdaPackager", targets: ["AWSLambdaPackager"]), // for testing only .library(name: "AWSLambdaTesting", targets: ["AWSLambdaTesting"]), ], @@ -31,6 +33,15 @@ let package = Package( .product(name: "NIOConcurrencyHelpers", package: "swift-nio"), .product(name: "NIOPosix", package: "swift-nio"), ]), + .plugin( + name: "AWSLambdaPackager", + capability: .command( + intent: .custom( + verb: "archive", + description: "Archive the Lambda binary and prepare it for uploading to AWS. Requires docker on macOS." + ) + ) + ), .testTarget(name: "AWSLambdaRuntimeCoreTests", dependencies: [ .byName(name: "AWSLambdaRuntimeCore"), .product(name: "NIOTestUtils", package: "swift-nio"), @@ -47,7 +58,7 @@ let package = Package( ]), .testTarget(name: "AWSLambdaTestingTests", dependencies: ["AWSLambdaTesting"]), // for perf testing - .target(name: "MockServer", dependencies: [ + .executableTarget(name: "MockServer", dependencies: [ .product(name: "NIOHTTP1", package: "swift-nio"), .product(name: "NIO", package: "swift-nio"), ]),