From 46c7393a5f599bd25fb1221b115eb2a8c24bfe79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Stormacq?= Date: Wed, 30 Jul 2025 18:56:39 +0400 Subject: [PATCH 1/2] prepare 2.0.0-beta.1 --- Examples/APIGateway+LambdaAuthorizer/Package.swift | 2 +- Examples/APIGateway/Package.swift | 2 +- Examples/BackgroundTasks/Package.swift | 2 +- Examples/CDK/Package.swift | 2 +- Examples/HelloJSON/Package.swift | 2 +- Examples/HelloWorld/Package.swift | 2 +- Examples/ResourcesPackaging/Package.swift | 2 +- Examples/S3EventNotifier/Package.swift | 4 ++-- Examples/S3_AWSSDK/Package.swift | 2 +- Examples/S3_Soto/Package.swift | 2 +- Examples/ServiceLifecycle+Postgres/Package.swift | 2 +- Examples/Streaming/Package.swift | 2 +- Examples/StreamingFromEvent/Package.swift | 2 +- Examples/Testing/Package.swift | 2 +- Examples/Tutorial/Package.swift | 2 +- .../_MyFirstFunction/create_and_deploy_function.sh | 6 +++--- .../Docs.docc/Resources/code/03-02-03-package.swift | 2 +- .../Docs.docc/Resources/code/03-02-04-package.swift | 2 +- .../Docs.docc/Resources/code/03-02-05-package.swift | 2 +- Sources/AWSLambdaRuntime/Docs.docc/quick-setup.md | 2 +- readme.md | 11 +++++++---- 21 files changed, 30 insertions(+), 27 deletions(-) diff --git a/Examples/APIGateway+LambdaAuthorizer/Package.swift b/Examples/APIGateway+LambdaAuthorizer/Package.swift index 03117835..fb1bca8b 100644 --- a/Examples/APIGateway+LambdaAuthorizer/Package.swift +++ b/Examples/APIGateway+LambdaAuthorizer/Package.swift @@ -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", branch: "main"), + .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-events.git", from: "1.0.0"), ], targets: [ diff --git a/Examples/APIGateway/Package.swift b/Examples/APIGateway/Package.swift index b2373801..c44a8bd9 100644 --- a/Examples/APIGateway/Package.swift +++ b/Examples/APIGateway/Package.swift @@ -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", branch: "main"), + .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-events.git", from: "1.0.0"), ], targets: [ diff --git a/Examples/BackgroundTasks/Package.swift b/Examples/BackgroundTasks/Package.swift index 3d5b52bb..b2902719 100644 --- a/Examples/BackgroundTasks/Package.swift +++ b/Examples/BackgroundTasks/Package.swift @@ -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", branch: "main") + .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1") ], targets: [ .executableTarget( diff --git a/Examples/CDK/Package.swift b/Examples/CDK/Package.swift index b2373801..c44a8bd9 100644 --- a/Examples/CDK/Package.swift +++ b/Examples/CDK/Package.swift @@ -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", branch: "main"), + .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-events.git", from: "1.0.0"), ], targets: [ diff --git a/Examples/HelloJSON/Package.swift b/Examples/HelloJSON/Package.swift index d8b5c162..35e04e81 100644 --- a/Examples/HelloJSON/Package.swift +++ b/Examples/HelloJSON/Package.swift @@ -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", - branch: "main" + from: "2.0.0-beta.1" ) ], targets: [ diff --git a/Examples/HelloWorld/Package.swift b/Examples/HelloWorld/Package.swift index 17d5e4a4..17103417 100644 --- a/Examples/HelloWorld/Package.swift +++ b/Examples/HelloWorld/Package.swift @@ -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", branch: "main") + .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1") ], targets: [ .executableTarget( diff --git a/Examples/ResourcesPackaging/Package.swift b/Examples/ResourcesPackaging/Package.swift index 4680b74a..4136d5a9 100644 --- a/Examples/ResourcesPackaging/Package.swift +++ b/Examples/ResourcesPackaging/Package.swift @@ -13,7 +13,7 @@ let package = Package( .executable(name: "MyLambda", targets: ["MyLambda"]) ], dependencies: [ - .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", from: "2.0.0-beta.1") ], targets: [ .executableTarget( diff --git a/Examples/S3EventNotifier/Package.swift b/Examples/S3EventNotifier/Package.swift index 6554b385..f3351324 100644 --- a/Examples/S3EventNotifier/Package.swift +++ b/Examples/S3EventNotifier/Package.swift @@ -8,8 +8,8 @@ let package = Package( name: "S3EventNotifier", platforms: [.macOS(.v15)], dependencies: [ - .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", branch: "main"), - .package(url: "https://github.com/swift-server/swift-aws-lambda-events", branch: "main"), + .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-events", from: "2.0.0-beta.1"), ], targets: [ .executableTarget( diff --git a/Examples/S3_AWSSDK/Package.swift b/Examples/S3_AWSSDK/Package.swift index 0eec7c6b..ec74a596 100644 --- a/Examples/S3_AWSSDK/Package.swift +++ b/Examples/S3_AWSSDK/Package.swift @@ -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", branch: "main"), + .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-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 97e5a9fb..b2d14c5f 100644 --- a/Examples/S3_Soto/Package.swift +++ b/Examples/S3_Soto/Package.swift @@ -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", branch: "main"), + .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-events", from: "1.0.0"), ], targets: [ diff --git a/Examples/ServiceLifecycle+Postgres/Package.swift b/Examples/ServiceLifecycle+Postgres/Package.swift index a3d85298..21858e17 100644 --- a/Examples/ServiceLifecycle+Postgres/Package.swift +++ b/Examples/ServiceLifecycle+Postgres/Package.swift @@ -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", branch: "main"), + .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-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/Package.swift b/Examples/Streaming/Package.swift index b29dc961..078615d7 100644 --- a/Examples/Streaming/Package.swift +++ b/Examples/Streaming/Package.swift @@ -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", branch: "main") + .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1") ], targets: [ .executableTarget( diff --git a/Examples/StreamingFromEvent/Package.swift b/Examples/StreamingFromEvent/Package.swift index 95c72779..cc04e4a4 100644 --- a/Examples/StreamingFromEvent/Package.swift +++ b/Examples/StreamingFromEvent/Package.swift @@ -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", branch: "main") + .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1") ], targets: [ .executableTarget( diff --git a/Examples/Testing/Package.swift b/Examples/Testing/Package.swift index db196325..5d9517b7 100644 --- a/Examples/Testing/Package.swift +++ b/Examples/Testing/Package.swift @@ -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", branch: "main"), + .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-events.git", from: "1.0.0"), ], targets: [ diff --git a/Examples/Tutorial/Package.swift b/Examples/Tutorial/Package.swift index 8fd031c1..6b861ba2 100644 --- a/Examples/Tutorial/Package.swift +++ b/Examples/Tutorial/Package.swift @@ -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", branch: "main") + .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1") ], 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 eb8f6d4f..ef400b79 100755 --- a/Examples/_MyFirstFunction/create_and_deploy_function.sh +++ b/Examples/_MyFirstFunction/create_and_deploy_function.sh @@ -79,8 +79,8 @@ 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 --branch main - # swift package add-dependency https://github.com/swift-server/swift-aws-lambda-events.git --branch main + # 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-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 @@ -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", branch: "main") + .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1") ], targets: [ .executableTarget( 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 d1c46993..b6122b49 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 @@ -9,6 +9,6 @@ let package = Package( .macOS(.v15) ], dependencies: [ - .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", from: "2.0.0-beta.1") ] ) 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 89a81437..7eca218d 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 @@ -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", branch: "main") + .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1") ] ) 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 35801e7c..de4f8ee2 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 @@ -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", branch: "main") + .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1") ], targets: [ .executableTarget( diff --git a/Sources/AWSLambdaRuntime/Docs.docc/quick-setup.md b/Sources/AWSLambdaRuntime/Docs.docc/quick-setup.md index a09c5309..7a0585fa 100644 --- a/Sources/AWSLambdaRuntime/Docs.docc/quick-setup.md +++ b/Sources/AWSLambdaRuntime/Docs.docc/quick-setup.md @@ -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: "main"), + .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1"), ], targets: [ .executableTarget( diff --git a/readme.md b/readme.md index 65d5baa5..4917ee93 100644 --- a/readme.md +++ b/readme.md @@ -1,5 +1,5 @@ > [!IMPORTANT] -> The documentation included here refers to the Swift AWS Lambda Runtime v2 (code from the main branch). If you're developing for the runtime v1.x, check this [readme](https://github.com/swift-server/swift-aws-lambda-runtime/blob/v1/readme.md) instead. +> The documentation included here refers to the Swift AWS Lambda Runtime v2 (code from the v2.x tags and the main branch). If you're developing for the runtime v1.x, check this [readme](https://github.com/swift-server/swift-aws-lambda-runtime/blob/v1/readme.md) instead. This guide contains the following sections: @@ -66,8 +66,8 @@ 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 --branch main - swift package add-target-dependency AWSLambdaRuntime MyLambda --package swift-aws-lambda-runtime + swift package add-dependency https://github.com/swift-server/swift-aws-lambda-runtime.git --from 2.0.0-beta.1 + swift package add-target-dependency AWSLambdaRuntime MyLambda --package swift-aws-lambda-runtime --from 1.0.0 ``` 2.2 (Optional - only on macOS) Add `platforms` after `name` @@ -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", branch: "main"), + .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1"), ], targets: [ .executableTarget( @@ -356,6 +356,9 @@ You can learn how to deploy and invoke this function in [the streaming codable e The [Swift AWS Lambda Events](http://github.com/swift-server/swift-aws-lambda-events) package includes an `AWSLambdaEvents` module that provides implementations for most common AWS event types further simplifying writing Lambda functions. +> [!IMPORTANT] +> This library has no dependencies on the AWS Lambda Events library. It is safe to use AWS Lambda v1.x with this Lambda Runtime v2. + Here is an example Lambda function invoked when the AWS APIGateway receives an HTTP request. ```swift From 0e752258c4508e49b49f36e88e1b8422da91d928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Stormacq?= Date: Wed, 30 Jul 2025 19:02:46 +0400 Subject: [PATCH 2/2] fix s3 event notifier dependency --- Examples/S3EventNotifier/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/S3EventNotifier/Package.swift b/Examples/S3EventNotifier/Package.swift index f3351324..02336ef8 100644 --- a/Examples/S3EventNotifier/Package.swift +++ b/Examples/S3EventNotifier/Package.swift @@ -9,7 +9,7 @@ let package = Package( 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-events", from: "2.0.0-beta.1"), + .package(url: "https://github.com/swift-server/swift-aws-lambda-events", from: "1.0.0"), ], targets: [ .executableTarget(