awslabs · sebsto · Sep 23, 2025 · Sep 23, 2025 · 0xTim · Sep 23, 2025
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -38,8 +38,9 @@ on:
         required: true
       matrix_linux_swift_container_image:
         type: string
-        description: "Container image for the matrix job. Defaults to matching latest Swift 6.1 Amazon Linux 2 image."
-        default: "swiftlang/swift:nightly-6.1-amazonlinux2"
+        # Note: we don't use Amazon Linux 2 here because zip is not installed by default.
+        description: "Container image for the matrix test jobs. Defaults to Swift 6.2 on Amazon Linux 2."
+        default: "swift:6.2-amazonlinux2"
 
 ## We are cancelling previously triggered workflow runs
 concurrency:
@@ -48,7 +49,7 @@ concurrency:
 
 jobs:
   test-examples:
-    name: Test Examples/${{ matrix.examples }} on ${{ matrix.swift.swift_version }}
+    name: Test Examples/${{ matrix.examples }} on ${{ matrix.swift.image }}
     if: ${{ inputs.examples_enabled }}
     runs-on: ubuntu-latest
     strategy:
@@ -105,14 +106,17 @@ jobs:
       fail-fast: false
       matrix:
         examples: ${{ fromJson(inputs.archive_plugin_examples) }}
+    # These must run on Ubuntu and not in a container, because the plugin uses docker
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           persist-credentials: false
+
       - name: Mark the workspace as safe
         # https://github.com/actions/checkout/issues/766
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+
       - name: Test the archive plugin
         env:
           EXAMPLE: ${{ matrix.examples }}
@@ -123,14 +127,37 @@ jobs:
     name: No dependencies on Foundation
     if: ${{ inputs.check_foundation_enabled }}
     runs-on: ubuntu-latest
+    container:
+      image: ${{ inputs.matrix_linux_swift_container_image }}
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+      # GitHub checkout action has a dep on NodeJS 20 which is not running on Amazonlinux2
+      # workaround is to manually checkout the repository
+      # https://github.com/actions/checkout/issues/1487
+      - name: Manually Clone repository and checkout PR
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        run: |
+          # Clone the repository
+          git clone https://github.com/${{ github.repository }}
+          cd ${{ github.event.repository.name }}
+
+          # Fetch the pull request
+          git fetch origin +refs/pull/$PR_NUMBER/merge:
+
+          # Checkout the pull request
+          git checkout -qf FETCH_HEAD
+
+      # - name: Checkout repository
+      #   uses: actions/checkout@v4
+      #   with:
+      #     persist-credentials: false
+
       - name: Mark the workspace as safe
+        working-directory: ${{ github.event.repository.name }}  # until we can use action/checkout@v4
         # https://github.com/actions/checkout/issues/766
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+
       - name: Check for Foundation or ICU dependency
+        working-directory: ${{ github.event.repository.name }}  # until we can use action/checkout@v4
         run: |
           .github/workflows/scripts/check-link-foundation.sh
diff --git a/.github/workflows/pull_request.yml b/.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: "swiftlang/swift:nightly-6.1-jammy"
-      docs_check_container_image: "swift:6.0-noble"
-      format_check_container_image: "swiftlang/swift:nightly-6.1-jammy"
+      api_breakage_check_container_image: "swift:6.2-noble"
+      docs_check_container_image: "swift:6.2-noble"
+      format_check_container_image: "swift:6.2-noble"
       yamllint_check_enabled: true
 
   unit-tests:

diff --git a/.mailmap b/.mailmap
@@ -2,4 +2,5 @@ Tomer Doron <tomer@apple.com> <tomer@apple.com>
 Tomer Doron <tomer@apple.com> <tomerd@apple.com>
 Tomer Doron <tomer@apple.com> <tomer.doron@gmail.com>
 Fabian Fett <fabianfett@apple.com> <fabianfett@apple.com>
-Fabian Fett <fabianfett@apple.com> <fabianfett@mac.com>
+Fabian Fett <fabianfett@apple.com> <fabianfett@mac.com>
+Sébastien Stormacq <stormacq@amazon.com> <sebastien.stormacq@gmail.com>
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -8,26 +8,66 @@ needs to be listed here.
 ## COPYRIGHT HOLDERS
 
 - Apple Inc. (all contributors with '@apple.com')
+- Amazon.com, Inc. or its affiliates (all contributors with '@amazon.com')
 
 ### Contributors
 
 - Adam Fowler <adamfowler71@gmail.com>
+- Adolfo <fitomad@users.noreply.github.com>
+- Alessio Buratti <9006089+Buratti@users.noreply.github.com>
 - Andrea Scuderi <andreascuderi@ymail.com>
+- Bill <3207996+gestrich@users.noreply.github.com>
 - Brendan Kirchner <brendankirchner@me.com>
 - Bryan Bartow <bryanbartow@gmail.com>
 - Bryan Moffatt <bmoffatt@users.noreply.github.com>
+- Camden Fullmer <camdenfullmer@gmail.com>
 - Christoph Walcher <christoph-wa@gmx.de>
 - Colton Schlosser <cltnschlosser@gmail.com>
+- Cory Benfield <lukasa@apple.com>
+- Dmitry Platonov <dsplatonov@mail.ru>
+- DwayneCoussement <dwayne.coussement@gmail.com>
+- DwayneCoussement <dwayne.coussement@showpad.com>
 - Eneko Alonso <eneko.alonso@gmail.com>
-- Fabian Fett <fabianfett@mac.com>
+- Fabian Fett <fabianfett@apple.com>
+- Filipp Fediakov <julik103@mail.ru>
+- Florent Morin <florentmorin@icloud.com>
+- Franz Busch <f.busch@apple.com>
+- Franz Busch <privat@franz-busch.de>
 - George Barnett <gbarnett@apple.com>
+- Jack Rosen <jrosen081@gmail.com>
+- Joannis Orlandos <joannis@orlandos.nl>
+- Joel Saltzman <talk@joelsaltzman.com>
+- Johannes Bosecker <j.bosecker.dev@icloud.com>
 - Johannes Weiss <johannesweiss@apple.com>
+- Josh <29730338+mr-j-tree@users.noreply.github.com>
+- Juan A. Reyes <59104004+jareyesda@users.noreply.github.com>
+- Konrad `ktoso` Malawski <konrad.malawski@project13.pl>
+- ML <44809298+mufumade@users.noreply.github.com>
+- Marwane Koutar <100198937+MarwaneKoutar@users.noreply.github.com>
+- Matt Massicotte <85322+mattmassicotte@users.noreply.github.com>
 - Max Desiatov <max@desiatov.com>
+- Natan Rolnik <me@natanrolnik.me>
 - Norman Maurer <norman_maurer@apple.com>
+- Paul Toffoloni <69189821+ptoffy@users.noreply.github.com>
+- Ralph Küpper <ralph.kuepper@skelpo.com>
 - Ro-M <Ro-M@users.noreply.github.com>
+- Stefan Nienhuis <stefan@nienhuisdevelopment.com>
+- Sven A. Schmidt <sas@finestructure.co>
+- Sébastien Stormacq <stormacq@amazon.com>
+- Tim Condon <0xTim@users.noreply.github.com>
+- Tobias <t089@users.noreply.github.com>
 - Tomer Doron <tomer@apple.com>
+- YR Chen <stevapple@icloud.com>
+- Yim Lee <yim_lee@apple.com>
 - Zhibin Cai <TonyChol@users.noreply.github.com>
+- aryan-25 <aryan_shah@apple.com>
+- dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
+- jsonfry <jason@jasonfry.co.uk>
+- mattcorey <mattcorey@users.noreply.github.com>
 - pmarrufo <p_marrufo94@hotmail.com>
+- pokryfka <5090827+pokryfka@users.noreply.github.com>
+- pokryfka <pokryfka@gmail.com>
+- sja26 <sja26@users.noreply.github.com>
 - tachyonics <simon@tachyonics.io>
 
 **Updating this list**

diff --git a/Examples/APIGateway+LambdaAuthorizer/Package.swift b/Examples/APIGateway+LambdaAuthorizer/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.2
 
 import PackageDescription
 
@@ -14,7 +14,7 @@ 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", from: "2.0.0-beta.1"),
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0"),
         .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.0.0"),
     ],
     targets: [

diff --git a/Examples/APIGateway/Package.swift b/Examples/APIGateway/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.2
 
 import PackageDescription
 
@@ -13,7 +13,7 @@ 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", from: "2.0.0-beta.1"),
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0"),
         .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.0.0"),
     ],
     targets: [

diff --git a/Examples/BackgroundTasks/Package.swift b/Examples/BackgroundTasks/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.2
 
 import PackageDescription
 
@@ -13,7 +13,7 @@ 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", from: "2.0.0-beta.1")
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0")
     ],
     targets: [
         .executableTarget(

diff --git a/Examples/CDK/Package.swift b/Examples/CDK/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.2
 
 import PackageDescription
 
@@ -13,7 +13,7 @@ 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", from: "2.0.0-beta.1"),
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0"),
         .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.0.0"),
     ],
     targets: [

diff --git a/Examples/HelloJSON/Package.swift b/Examples/HelloJSON/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.1
+// swift-tools-version:6.2
 
 import PackageDescription
 
@@ -15,7 +15,7 @@ let package = Package(
         // 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",
-            from: "2.0.0-beta.1"
+            from: "2.0.0"
         )
     ],
     targets: [

diff --git a/Examples/HelloWorld/Package.swift b/Examples/HelloWorld/Package.swift
@@ -1,4 +1,9 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.1
+// This example has to be in Swift 6.1 because it is used in the test archive plugin CI job
+// That job runs on GitHub's ubuntu-latest environment that only supports Swift 6.1
+// https://github.com/actions/runner-images?tab=readme-ov-file
+// https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
+// We can update to Swift 6.2 when GitHUb hosts will have Swift 6.2
 
 import PackageDescription
 
@@ -13,7 +18,7 @@ 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", from: "2.0.0-beta.1")
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0")
     ],
     targets: [
         .executableTarget(

diff --git a/Examples/HelloWorldNoTraits/Package.swift b/Examples/HelloWorldNoTraits/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.1
+// swift-tools-version:6.2
 
 import PackageDescription
 
@@ -13,7 +13,7 @@ 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", from: "2.0.0-beta.3", traits: [])
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0", traits: [])
     ],
     targets: [
         .executableTarget(

diff --git a/Examples/HummingbirdLambda/Package.swift b/Examples/HummingbirdLambda/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.1
+// swift-tools-version: 6.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -12,7 +12,7 @@ let package = Package(
     dependencies: [
         .package(
             url: "https://github.com/swift-server/swift-aws-lambda-runtime.git",
-            from: "2.0.0-beta.1"
+            from: "2.0.0"
         ),
         .package(
             url: "https://github.com/hummingbird-project/hummingbird-lambda.git",

diff --git a/Examples/ResourcesPackaging/Package.swift b/Examples/ResourcesPackaging/Package.swift
@@ -1,5 +1,9 @@
-// swift-tools-version: 6.0
-// The swift-tools-version declares the minimum version of Swift required to build this package.
+// swift-tools-version:6.1
+// This example has to be in Swift 6.1 because it is used in the test archive plugin CI job
+// That job runs on GitHub's ubuntu-latest environment that only supports Swift 6.1
+// https://github.com/actions/runner-images?tab=readme-ov-file
+// https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
+// We can update to Swift 6.2 when GitHUb hosts will have Swift 6.2
 
 import PackageDescription
 
@@ -13,7 +17,7 @@ let package = Package(
         .executable(name: "MyLambda", targets: ["MyLambda"])
     ],
     dependencies: [
-        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1")
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0")
     ],
     targets: [
         .executableTarget(

diff --git a/Examples/S3EventNotifier/Package.swift b/Examples/S3EventNotifier/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.2
 import PackageDescription
 
 // needed for CI to test the local version of the library
@@ -8,7 +8,7 @@ let package = Package(
     name: "S3EventNotifier",
     platforms: [.macOS(.v15)],
     dependencies: [
-        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1"),
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0"),
         .package(url: "https://github.com/swift-server/swift-aws-lambda-events", from: "1.0.0"),
     ],
     targets: [

diff --git a/Examples/S3_AWSSDK/Package.swift b/Examples/S3_AWSSDK/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.2
 
 import PackageDescription
 
@@ -13,7 +13,7 @@ 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", from: "2.0.0-beta.1"),
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0"),
         .package(url: "https://github.com/swift-server/swift-aws-lambda-events", from: "1.0.0"),
         .package(url: "https://github.com/awslabs/aws-sdk-swift", from: "1.0.0"),
     ],

diff --git a/Examples/S3_Soto/Package.swift b/Examples/S3_Soto/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.2
 
 import PackageDescription
 
@@ -15,7 +15,7 @@ let package = Package(
         .package(url: "https://github.com/soto-project/soto.git", from: "7.0.0"),
 
         // 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", from: "2.0.0-beta.1"),
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0"),
         .package(url: "https://github.com/swift-server/swift-aws-lambda-events", from: "1.0.0"),
     ],
     targets: [

diff --git a/Examples/ServiceLifecycle+Postgres/Package.swift b/Examples/ServiceLifecycle+Postgres/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -13,7 +13,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/vapor/postgres-nio.git", from: "1.26.0"),
-        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1"),
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0"),
         .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.0.0"),
         .package(url: "https://github.com/swift-server/swift-service-lifecycle.git", from: "2.6.3"),
     ],

diff --git a/Examples/Streaming+Codable/Package.swift b/Examples/Streaming+Codable/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.2
 
 import PackageDescription
 
@@ -10,7 +10,7 @@ let package = Package(
     platforms: [.macOS(.v15)],
     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", from: "2.0.0-beta.1"),
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0"),
         .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.2.0"),
     ],
     targets: [