Use package traits when using Swift 6.1 (#490)

Author: fabianfett

.github/workflows/integration_tests.yml

@@ -39,7 +39,7 @@ on:
       matrix_linux_swift_container_image:
         type: string
         description: "Container image for the matrix job. Defaults to matching latest Swift Ubuntu image."
-        default: "swift:amazonlinux2"
+        default: "swiftlang/swift:nightly-6.1-jammy"
 
 ## We are cancelling previously triggered workflow runs
 concurrency:

.github/workflows/pull_request.yml

@@ -12,9 +12,9 @@ jobs:
       license_header_check_project_name: "SwiftAWSLambdaRuntime"
       shell_check_enabled: true
       python_lint_check_enabled: true
-      api_breakage_check_container_image: "swift:6.0-noble"
+      api_breakage_check_container_image: "swiftlang/swift:nightly-6.1-jammy"
       docs_check_container_image: "swift:6.0-noble"
-      format_check_container_image: "swiftlang/swift:nightly-6.0-jammy"
+      format_check_container_image: "swiftlang/swift:nightly-6.1-jammy"
       yamllint_check_enabled: true
 
   unit-tests:

.spi.yml

@@ -1,4 +1,4 @@
 version: 1
 builder:
   configs:
-    - documentation_targets: [AWSLambdaRuntimeCore, AWSLambdaRuntime]
+    - documentation_targets: [AWSLambdaRuntime]

Examples/HelloJSON/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.1
 
 import PackageDescription
 
@@ -13,7 +13,13 @@ let package = Package(
     ],
     dependencies: [
         // during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
-        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", branch: "main")
+        .package(
+            url: "https://github.com/swift-server/swift-aws-lambda-runtime.git",
+            branch: "ff-package-traits",
+            traits: [
+                .trait(name: "FoundationJSONSupport")
+            ]
+        )
     ],
     targets: [
         .executableTarget(

Package.swift

@@ -1,42 +1,50 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.1
 
 import PackageDescription
 
 let package = Package(
     name: "swift-aws-lambda-runtime",
     platforms: [.macOS(.v15)],
     products: [
-        // this library exports `AWSLambdaRuntimeCore` and adds Foundation convenience methods
         .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
         // requires Linux or at least macOS v15
         .plugin(name: "AWSLambdaPackager", targets: ["AWSLambdaPackager"]),
         // for testing only
         .library(name: "AWSLambdaTesting", targets: ["AWSLambdaTesting"]),
     ],
+    traits: [
+        "FoundationJSONSupport",
+        "ServiceLifecycleSupport",
+        "LocalServerSupport",
+        .default(
+            enabledTraits: [
+                "FoundationJSONSupport",
+                "ServiceLifecycleSupport",
+                "LocalServerSupport",
+            ]
+        ),
+    ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.81.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"),
         .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.4"),
+        .package(url: "https://github.com/swift-server/swift-service-lifecycle.git", from: "2.6.3"),
     ],
     targets: [
         .target(
             name: "AWSLambdaRuntime",
             dependencies: [
-                .byName(name: "AWSLambdaRuntimeCore"),
                 .product(name: "NIOCore", package: "swift-nio"),
-            ]
-        ),
-        .target(
-            name: "AWSLambdaRuntimeCore",
-            dependencies: [
                 .product(name: "DequeModule", package: "swift-collections"),
                 .product(name: "Logging", package: "swift-log"),
                 .product(name: "NIOHTTP1", package: "swift-nio"),
-                .product(name: "NIOCore", package: "swift-nio"),
                 .product(name: "NIOPosix", package: "swift-nio"),
+                .product(
+                    name: "ServiceLifecycle",
+                    package: "swift-service-lifecycle",
+                    condition: .when(traits: ["ServiceLifecycleSupport"])
+                ),
             ]
         ),
         .plugin(
@@ -58,16 +66,15 @@ let package = Package(
         .testTarget(
             name: "AWSLambdaRuntimeCoreTests",
             dependencies: [
-                .byName(name: "AWSLambdaRuntimeCore"),
+                .byName(name: "AWSLambdaRuntime"),
                 .product(name: "NIOTestUtils", package: "swift-nio"),
                 .product(name: "NIOFoundationCompat", package: "swift-nio"),
             ]
         ),
         .testTarget(
             name: "AWSLambdaRuntimeTests",
             dependencies: [
-                .byName(name: "AWSLambdaRuntimeCore"),
-                .byName(name: "AWSLambdaRuntime"),
+                .byName(name: "AWSLambdaRuntime")
             ]
         ),
         // testing helper

[email protected]

@@ -0,0 +1,95 @@
+// swift-tools-version:6.0
+
+import PackageDescription
+
+let package = Package(
+    name: "swift-aws-lambda-runtime",
+    platforms: [.macOS(.v15)],
+    products: [
+        .library(name: "AWSLambdaRuntime", targets: ["AWSLambdaRuntime"]),
+        // plugin to package the lambda, creating an archive that can be uploaded to AWS
+        // requires Linux or at least macOS v15
+        .plugin(name: "AWSLambdaPackager", targets: ["AWSLambdaPackager"]),
+        // for testing only
+        .library(name: "AWSLambdaTesting", targets: ["AWSLambdaTesting"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/apple/swift-nio.git", from: "2.81.0"),
+        .package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"),
+        .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.4"),
+        .package(url: "https://github.com/swift-server/swift-service-lifecycle.git", from: "2.6.3"),
+    ],
+    targets: [
+        .target(
+            name: "AWSLambdaRuntime",
+            dependencies: [
+                .product(name: "NIOCore", package: "swift-nio"),
+                .product(name: "DequeModule", package: "swift-collections"),
+                .product(name: "Logging", package: "swift-log"),
+                .product(name: "NIOHTTP1", package: "swift-nio"),
+                .product(name: "NIOPosix", package: "swift-nio"),
+                .product(name: "ServiceLifecycle", package: "swift-service-lifecycle"),
+            ],
+            swiftSettings: [
+                .define("FoundationJSONSupport"),
+                .define("ServiceLifecycleSupport"),
+                .define("LocalServerSupport"),
+            ]
+        ),
+        .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 or non Amazonlinux 2 distributions."
+                ),
+                permissions: [
+                    .allowNetworkConnections(
+                        scope: .docker,
+                        reason: "This plugin uses Docker to create the AWS Lambda ZIP package."
+                    )
+                ]
+            )
+        ),
+        .testTarget(
+            name: "AWSLambdaRuntimeCoreTests",
+            dependencies: [
+                .byName(name: "AWSLambdaRuntime"),
+                .product(name: "NIOTestUtils", package: "swift-nio"),
+                .product(name: "NIOFoundationCompat", package: "swift-nio"),
+            ]
+        ),
+        .testTarget(
+            name: "AWSLambdaRuntimeTests",
+            dependencies: [
+                .byName(name: "AWSLambdaRuntime")
+            ]
+        ),
+        // testing helper
+        .target(
+            name: "AWSLambdaTesting",
+            dependencies: [
+                .byName(name: "AWSLambdaRuntime"),
+                .product(name: "NIOCore", package: "swift-nio"),
+                .product(name: "NIOPosix", package: "swift-nio"),
+            ]
+        ),
+        .testTarget(
+            name: "AWSLambdaTestingTests",
+            dependencies: [
+                .byName(name: "AWSLambdaTesting")
+            ]
+        ),
+        // for perf testing
+        .executableTarget(
+            name: "MockServer",
+            dependencies: [
+                .product(name: "Logging", package: "swift-log"),
+                .product(name: "NIOHTTP1", package: "swift-nio"),
+                .product(name: "NIOCore", package: "swift-nio"),
+                .product(name: "NIOPosix", package: "swift-nio"),
+            ]
+        ),
+    ]
+)

Sources/AWSLambdaRuntimeCore/ControlPlaneRequest.swift renamed to Sources/AWSLambdaRuntime/ControlPlaneRequest.swift

@@ -1,2 +1,2 @@
-2025-01-02T14:59:29+0100 info LocalLambdaServer : [AWSLambdaRuntimeCore] 
+2025-01-02T14:59:29+0100 info LocalLambdaServer : [AWSLambdaRuntime] 
 LocalLambdaServer started and listening on 127.0.0.1:7000, receiving events on /invoke

Sources/AWSLambdaRuntimeCore/ControlPlaneRequestEncoder.swift renamed to Sources/AWSLambdaRuntime/ControlPlaneRequestEncoder.swift

@@ -3,4 +3,4 @@ swift run
 Building for debugging...
 [1/1] Write swift-version--58304C5D6DBC2206.txt
 Build of product 'PalindromeLambda' complete! (0.11s)
-2025-01-02T15:12:49+0100 info LocalLambdaServer : [AWSLambdaRuntimeCore] LocalLambdaServer started and listening on 127.0.0.1:7000, receiving events on /invoke
+2025-01-02T15:12:49+0100 info LocalLambdaServer : [AWSLambdaRuntime] LocalLambdaServer started and listening on 127.0.0.1:7000, receiving events on /invoke