From 4feb013e94967fa36a9112b34dac15ca7e486405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Stormacq?= Date: Tue, 23 Sep 2025 20:17:12 +0200 Subject: [PATCH] Update examples and CI for Swift 6.2 --- .github/workflows/integration_tests.yml | 41 ++++++++++++++---- .github/workflows/pull_request.yml | 6 +-- .mailmap | 3 +- CONTRIBUTORS.txt | 42 ++++++++++++++++++- .../APIGateway+LambdaAuthorizer/Package.swift | 4 +- Examples/APIGateway/Package.swift | 4 +- Examples/BackgroundTasks/Package.swift | 4 +- Examples/CDK/Package.swift | 4 +- Examples/HelloJSON/Package.swift | 4 +- Examples/HelloWorld/Package.swift | 9 +++- Examples/HelloWorldNoTraits/Package.swift | 4 +- Examples/HummingbirdLambda/Package.swift | 4 +- Examples/ResourcesPackaging/Package.swift | 10 +++-- Examples/S3EventNotifier/Package.swift | 4 +- Examples/S3_AWSSDK/Package.swift | 4 +- Examples/S3_Soto/Package.swift | 4 +- .../ServiceLifecycle+Postgres/Package.swift | 4 +- Examples/Streaming+Codable/Package.swift | 4 +- Examples/Streaming/Package.swift | 4 +- Examples/Testing/Package.swift | 4 +- Examples/Tutorial/Package.swift | 4 +- .../create_and_deploy_function.sh | 6 +-- Package.swift | 2 +- .../Resources/code/03-02-01-package.swift | 2 +- .../Resources/code/03-02-02-package.swift | 2 +- .../Resources/code/03-02-03-package.swift | 4 +- .../Resources/code/03-02-04-package.swift | 4 +- .../Resources/code/03-02-05-package.swift | 4 +- .../AWSLambdaRuntime/Docs.docc/quick-setup.md | 4 +- readme.md | 4 +- scripts/generate_contributors_list.sh | 39 +++++++++++++++++ 31 files changed, 179 insertions(+), 63 deletions(-) create mode 100755 scripts/generate_contributors_list.sh diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 422ef82e..22e6e9de 100644 --- 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 index a36a6fbd..e0a78055 100644 --- 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 index 91b18339..59f7e426 100644 --- a/.mailmap +++ b/.mailmap @@ -2,4 +2,5 @@ Tomer Doron Tomer Doron Tomer Doron Fabian Fett -Fabian Fett \ No newline at end of file +Fabian Fett +Sébastien Stormacq \ No newline at end of file diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index c2e31f97..77d546ad 100644 --- 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 +- Adolfo +- Alessio Buratti <9006089+Buratti@users.noreply.github.com> - Andrea Scuderi +- Bill <3207996+gestrich@users.noreply.github.com> - Brendan Kirchner - Bryan Bartow - Bryan Moffatt +- Camden Fullmer - Christoph Walcher - Colton Schlosser +- Cory Benfield +- Dmitry Platonov +- DwayneCoussement +- DwayneCoussement - Eneko Alonso -- Fabian Fett +- Fabian Fett +- Filipp Fediakov +- Florent Morin +- Franz Busch +- Franz Busch - George Barnett +- Jack Rosen +- Joannis Orlandos +- Joel Saltzman +- Johannes Bosecker - Johannes Weiss +- Josh <29730338+mr-j-tree@users.noreply.github.com> +- Juan A. Reyes <59104004+jareyesda@users.noreply.github.com> +- Konrad `ktoso` Malawski +- 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 +- Natan Rolnik - Norman Maurer +- Paul Toffoloni <69189821+ptoffy@users.noreply.github.com> +- Ralph Küpper - Ro-M +- Stefan Nienhuis +- Sven A. Schmidt +- Sébastien Stormacq +- Tim Condon <0xTim@users.noreply.github.com> +- Tobias - Tomer Doron +- YR Chen +- Yim Lee - Zhibin Cai +- aryan-25 +- dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> +- jsonfry +- mattcorey - pmarrufo +- pokryfka <5090827+pokryfka@users.noreply.github.com> +- pokryfka +- sja26 - tachyonics **Updating this list** diff --git a/Examples/APIGateway+LambdaAuthorizer/Package.swift b/Examples/APIGateway+LambdaAuthorizer/Package.swift index fb1bca8b..ebbc7133 100644 --- 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 index c44a8bd9..f52f9d74 100644 --- 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 index b2902719..0ed15254 100644 --- 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 index c44a8bd9..f52f9d74 100644 --- 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 index 35e04e81..e81d12ac 100644 --- 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 index 17103417..8665a07f 100644 --- 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 index 51b7e2bf..2c613221 100644 --- 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 index 58a6c877..cadca817 100644 --- 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 index 4136d5a9..24c16180 100644 --- 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 index 02336ef8..54fe7972 100644 --- 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 index ec74a596..b4f0dbbd 100644 --- 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 index b2d14c5f..8302b370 100644 --- 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 index 21858e17..837269ee 100644 --- 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 index 7bed318c..259499c9 100644 --- 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: [ diff --git a/Examples/Streaming/Package.swift b/Examples/Streaming/Package.swift index 078615d7..d972e995 100644 --- a/Examples/Streaming/Package.swift +++ b/Examples/Streaming/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/Testing/Package.swift b/Examples/Testing/Package.swift index 5d9517b7..64757eff 100644 --- a/Examples/Testing/Package.swift +++ b/Examples/Testing/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/Tutorial/Package.swift b/Examples/Tutorial/Package.swift index 6b861ba2..6158884f 100644 --- a/Examples/Tutorial/Package.swift +++ b/Examples/Tutorial/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 @@ -9,7 +9,7 @@ let package = Package( name: "Palindrome", 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") ], targets: [ // Targets are the basic building blocks of a package, defining a module or a test suite. diff --git a/Examples/_MyFirstFunction/create_and_deploy_function.sh b/Examples/_MyFirstFunction/create_and_deploy_function.sh index ef400b79..1020648a 100755 --- a/Examples/_MyFirstFunction/create_and_deploy_function.sh +++ b/Examples/_MyFirstFunction/create_and_deploy_function.sh @@ -79,12 +79,12 @@ create_swift_project() { echo "📦 Add the AWS Lambda Swift runtime to your project" # The following commands are commented out until the `lambad-init` plugin will be release - # swift package add-dependency https://github.com/swift-server/swift-aws-lambda-runtime.git --from 2.0.0-beta.1 + # swift package add-dependency https://github.com/swift-server/swift-aws-lambda-runtime.git --from 2.0.0 # swift package add-dependency https://github.com/swift-server/swift-aws-lambda-events.git --from 1.0.0 # swift package add-target-dependency AWSLambdaRuntime MyLambda --package swift-aws-lambda-runtime # swift package add-target-dependency AWSLambdaEvents MyLambda --package swift-aws-lambda-events cat < Package.swift -// swift-tools-version:6.0 +// swift-tools-version:6.2 import PackageDescription @@ -95,7 +95,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/Package.swift b/Package.swift index 9077284f..99ea9667 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:6.1 +// swift-tools-version:6.2 import PackageDescription diff --git a/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-01-package.swift b/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-01-package.swift index 5f1d9b8d..155bda8d 100644 --- a/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-01-package.swift +++ b/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-01-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 diff --git a/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-02-package.swift b/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-02-package.swift index 4fd09eba..45be7f2c 100644 --- a/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-02-package.swift +++ b/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-02-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 diff --git a/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-03-package.swift b/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-03-package.swift index b6122b49..7fceaf97 100644 --- a/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-03-package.swift +++ b/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-03-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 @@ -9,6 +9,6 @@ let package = Package( .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") ] ) diff --git a/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-04-package.swift b/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-04-package.swift index 7eca218d..889a4e40 100644 --- a/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-04-package.swift +++ b/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-04-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 @@ -12,6 +12,6 @@ let package = Package( .executable(name: "PalindromeLambda", targets: ["PalindromeLambda"]) ], 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") ] ) diff --git a/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-05-package.swift b/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-05-package.swift index de4f8ee2..34c7f3a1 100644 --- a/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-05-package.swift +++ b/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-05-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 @@ -12,7 +12,7 @@ let package = Package( .executable(name: "PalindromeLambda", targets: ["PalindromeLambda"]) ], 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/Sources/AWSLambdaRuntime/Docs.docc/quick-setup.md b/Sources/AWSLambdaRuntime/Docs.docc/quick-setup.md index 7a0585fa..426a024d 100644 --- a/Sources/AWSLambdaRuntime/Docs.docc/quick-setup.md +++ b/Sources/AWSLambdaRuntime/Docs.docc/quick-setup.md @@ -23,7 +23,7 @@ swift package init --type executable 2. Add dependencies on `AWSLambdaRuntime` library ```swift -// 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 @@ -37,7 +37,7 @@ let package = Package( .executable(name: "MyFirstLambdaFunction", targets: ["MyFirstLambdaFunction"]), ], 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/readme.md b/readme.md index 75e17bcb..f79e442d 100644 --- a/readme.md +++ b/readme.md @@ -66,7 +66,7 @@ swift package init --type executable 2.1 Add the Swift AWS Lambda Runtime as a dependency ```bash - swift package add-dependency https://github.com/swift-server/swift-aws-lambda-runtime.git --from 2.0.0-beta.1 + swift package add-dependency https://github.com/swift-server/swift-aws-lambda-runtime.git --from 2.0.0 swift package add-target-dependency AWSLambdaRuntime MyLambda --package swift-aws-lambda-runtime --from 1.0.0 ``` @@ -87,7 +87,7 @@ swift package init --type executable name: "MyLambda", 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"), ], targets: [ .executableTarget( diff --git a/scripts/generate_contributors_list.sh b/scripts/generate_contributors_list.sh new file mode 100755 index 00000000..9d4014d8 --- /dev/null +++ b/scripts/generate_contributors_list.sh @@ -0,0 +1,39 @@ +#!/bin/bash +##===----------------------------------------------------------------------===## +## +## This source file is part of the SwiftAWSLambdaRuntime open source project +## +## Copyright (c) 2017-2025 Apple Inc. and the SwiftAWSLambdaRuntime project authors +## Licensed under Apache License v2.0 +## +## See LICENSE.txt for license information +## See CONTRIBUTORS.txt for the list of SwiftAWSLambdaRuntime project authors +## +## SPDX-License-Identifier: Apache-2.0 +## +##===----------------------------------------------------------------------===## + +set -eu +here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +contributors=$( cd "$here"/.. && git shortlog -es | cut -f2 | sed 's/^/- /' ) + +cat > "$here/../CONTRIBUTORS.txt" <<- EOF + For the purpose of tracking copyright, this is the list of individuals and + organizations who have contributed source code to SwiftAWSLambdaRuntime. + + For employees of an organization/company where the copyright of work done + by employees of that company is held by the company itself, only the company + needs to be listed here. + + ## COPYRIGHT HOLDERS + + - Apple Inc. (all contributors with '@apple.com') + + ### Contributors + + $contributors + + **Updating this list** + + Please do not edit this file manually. It is generated using \`./scripts/generate_contributors_list.sh\`. If a name is misspelled or appearing multiple times: add an entry in \`./.mailmap\` +EOF \ No newline at end of file