From 31da8cb37a903d7b78b67a4aeb3886c645d10cf3 Mon Sep 17 00:00:00 2001 From: Sebastien Stormacq Date: Thu, 23 May 2024 11:49:38 +0200 Subject: [PATCH 1/5] remove support for versions of Swift <= 5.6 --- Package.swift | 8 +++++--- Package@swift-5.4.swift | 15 --------------- Package@swift-5.5.swift | 15 --------------- Package@swift-5.7.swift | 20 ++++++++++++++++++++ Package@swift-5.8.swift | 20 ++++++++++++++++++++ Package@swift-5.9.swift | 20 ++++++++++++++++++++ docker/docker-compose.al2.56.yaml | 21 --------------------- 7 files changed, 65 insertions(+), 54 deletions(-) delete mode 100644 Package@swift-5.4.swift delete mode 100644 Package@swift-5.5.swift create mode 100644 Package@swift-5.7.swift create mode 100644 Package@swift-5.8.swift create mode 100644 Package@swift-5.9.swift delete mode 100644 docker/docker-compose.al2.56.yaml diff --git a/Package.swift b/Package.swift index 160236c..0f62a6e 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.7 +// swift-tools-version:5.10 import PackageDescription @@ -12,7 +12,9 @@ let package = Package( .package(url: "https://github.com/apple/swift-http-types.git", from: "1.0.0"), ], targets: [ - .target(name: "AWSLambdaEvents", dependencies: [.product(name: "HTTPTypes", package: "swift-http-types")]), - .testTarget(name: "AWSLambdaEventsTests", dependencies: ["AWSLambdaEvents"]), + .target(name: "AWSLambdaEvents", + dependencies: [.product(name: "HTTPTypes", package: "swift-http-types")]), + .testTarget(name: "AWSLambdaEventsTests", + dependencies: ["AWSLambdaEvents"]), ] ) diff --git a/Package@swift-5.4.swift b/Package@swift-5.4.swift deleted file mode 100644 index 5c2c4f6..0000000 --- a/Package@swift-5.4.swift +++ /dev/null @@ -1,15 +0,0 @@ -// swift-tools-version:5.4 - -import PackageDescription - -let package = Package( - name: "swift-aws-lambda-events", - products: [ - .library(name: "AWSLambdaEvents", targets: ["AWSLambdaEvents"]), - ], - dependencies: [], - targets: [ - .target(name: "AWSLambdaEvents", dependencies: []), - .testTarget(name: "AWSLambdaEventsTests", dependencies: ["AWSLambdaEvents"]), - ] -) diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift deleted file mode 100644 index 5c2c4f6..0000000 --- a/Package@swift-5.5.swift +++ /dev/null @@ -1,15 +0,0 @@ -// swift-tools-version:5.4 - -import PackageDescription - -let package = Package( - name: "swift-aws-lambda-events", - products: [ - .library(name: "AWSLambdaEvents", targets: ["AWSLambdaEvents"]), - ], - dependencies: [], - targets: [ - .target(name: "AWSLambdaEvents", dependencies: []), - .testTarget(name: "AWSLambdaEventsTests", dependencies: ["AWSLambdaEvents"]), - ] -) diff --git a/Package@swift-5.7.swift b/Package@swift-5.7.swift new file mode 100644 index 0000000..de0bfc4 --- /dev/null +++ b/Package@swift-5.7.swift @@ -0,0 +1,20 @@ +// swift-tools-version:5.7 + +import PackageDescription + +let package = Package( + name: "swift-aws-lambda-events", + products: [ + .library(name: "AWSLambdaEvents", targets: ["AWSLambdaEvents"]), + ], + dependencies: [ + .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"), + .package(url: "https://github.com/apple/swift-http-types.git", from: "1.0.0"), + ], + targets: [ + .target(name: "AWSLambdaEvents", + dependencies: [.product(name: "HTTPTypes", package: "swift-http-types")]), + .testTarget(name: "AWSLambdaEventsTests", + dependencies: ["AWSLambdaEvents"]), + ] +) diff --git a/Package@swift-5.8.swift b/Package@swift-5.8.swift new file mode 100644 index 0000000..b4d0217 --- /dev/null +++ b/Package@swift-5.8.swift @@ -0,0 +1,20 @@ +// swift-tools-version:5.8 + +import PackageDescription + +let package = Package( + name: "swift-aws-lambda-events", + products: [ + .library(name: "AWSLambdaEvents", targets: ["AWSLambdaEvents"]), + ], + dependencies: [ + .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"), + .package(url: "https://github.com/apple/swift-http-types.git", from: "1.0.0"), + ], + targets: [ + .target(name: "AWSLambdaEvents", + dependencies: [.product(name: "HTTPTypes", package: "swift-http-types")]), + .testTarget(name: "AWSLambdaEventsTests", + dependencies: ["AWSLambdaEvents"]), + ] +) diff --git a/Package@swift-5.9.swift b/Package@swift-5.9.swift new file mode 100644 index 0000000..fee7786 --- /dev/null +++ b/Package@swift-5.9.swift @@ -0,0 +1,20 @@ +// swift-tools-version:5.9 + +import PackageDescription + +let package = Package( + name: "swift-aws-lambda-events", + products: [ + .library(name: "AWSLambdaEvents", targets: ["AWSLambdaEvents"]), + ], + dependencies: [ + .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"), + .package(url: "https://github.com/apple/swift-http-types.git", from: "1.0.0"), + ], + targets: [ + .target(name: "AWSLambdaEvents", + dependencies: [.product(name: "HTTPTypes", package: "swift-http-types")]), + .testTarget(name: "AWSLambdaEventsTests", + dependencies: ["AWSLambdaEvents"]), + ] +) diff --git a/docker/docker-compose.al2.56.yaml b/docker/docker-compose.al2.56.yaml deleted file mode 100644 index 56f4004..0000000 --- a/docker/docker-compose.al2.56.yaml +++ /dev/null @@ -1,21 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-aws-lambda-events:al2-5.6 - build: - args: - swift_version: "5.6" - - soundness: - image: swift-aws-lambda-events:al2-5.6 - - test: - image: swift-aws-lambda-events:al2-5.6 - - test-samples: - image: swift-aws-lambda-events:al2-5.6 - - shell: - image: swift-aws-lambda-events:al2-5.6 From ff3dfaa1501f541efca4d2ffeec81e101ebbcc9d Mon Sep 17 00:00:00 2001 From: Sebastien Stormacq Date: Thu, 23 May 2024 16:51:38 +0200 Subject: [PATCH 2/5] Simplify the Package.swift for older Swift versions --- Package.swift | 5 +++-- Package@swift-5.7.swift | 20 -------------------- Package@swift-5.8.swift | 20 -------------------- Package@swift-5.9.swift | 20 -------------------- docker/docker-compose.al2.57.yaml | 21 --------------------- 5 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 Package@swift-5.7.swift delete mode 100644 Package@swift-5.8.swift delete mode 100644 Package@swift-5.9.swift delete mode 100644 docker/docker-compose.al2.57.yaml diff --git a/Package.swift b/Package.swift index 0f62a6e..af4f47c 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.10 +// swift-tools-version:5.8 import PackageDescription @@ -15,6 +15,7 @@ let package = Package( .target(name: "AWSLambdaEvents", dependencies: [.product(name: "HTTPTypes", package: "swift-http-types")]), .testTarget(name: "AWSLambdaEventsTests", - dependencies: ["AWSLambdaEvents"]), + dependencies: ["AWSLambdaEvents"], + swiftSettings: [.enableExperimentalFeature("StrictConcurrency")]), ] ) diff --git a/Package@swift-5.7.swift b/Package@swift-5.7.swift deleted file mode 100644 index de0bfc4..0000000 --- a/Package@swift-5.7.swift +++ /dev/null @@ -1,20 +0,0 @@ -// swift-tools-version:5.7 - -import PackageDescription - -let package = Package( - name: "swift-aws-lambda-events", - products: [ - .library(name: "AWSLambdaEvents", targets: ["AWSLambdaEvents"]), - ], - dependencies: [ - .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"), - .package(url: "https://github.com/apple/swift-http-types.git", from: "1.0.0"), - ], - targets: [ - .target(name: "AWSLambdaEvents", - dependencies: [.product(name: "HTTPTypes", package: "swift-http-types")]), - .testTarget(name: "AWSLambdaEventsTests", - dependencies: ["AWSLambdaEvents"]), - ] -) diff --git a/Package@swift-5.8.swift b/Package@swift-5.8.swift deleted file mode 100644 index b4d0217..0000000 --- a/Package@swift-5.8.swift +++ /dev/null @@ -1,20 +0,0 @@ -// swift-tools-version:5.8 - -import PackageDescription - -let package = Package( - name: "swift-aws-lambda-events", - products: [ - .library(name: "AWSLambdaEvents", targets: ["AWSLambdaEvents"]), - ], - dependencies: [ - .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"), - .package(url: "https://github.com/apple/swift-http-types.git", from: "1.0.0"), - ], - targets: [ - .target(name: "AWSLambdaEvents", - dependencies: [.product(name: "HTTPTypes", package: "swift-http-types")]), - .testTarget(name: "AWSLambdaEventsTests", - dependencies: ["AWSLambdaEvents"]), - ] -) diff --git a/Package@swift-5.9.swift b/Package@swift-5.9.swift deleted file mode 100644 index fee7786..0000000 --- a/Package@swift-5.9.swift +++ /dev/null @@ -1,20 +0,0 @@ -// swift-tools-version:5.9 - -import PackageDescription - -let package = Package( - name: "swift-aws-lambda-events", - products: [ - .library(name: "AWSLambdaEvents", targets: ["AWSLambdaEvents"]), - ], - dependencies: [ - .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"), - .package(url: "https://github.com/apple/swift-http-types.git", from: "1.0.0"), - ], - targets: [ - .target(name: "AWSLambdaEvents", - dependencies: [.product(name: "HTTPTypes", package: "swift-http-types")]), - .testTarget(name: "AWSLambdaEventsTests", - dependencies: ["AWSLambdaEvents"]), - ] -) diff --git a/docker/docker-compose.al2.57.yaml b/docker/docker-compose.al2.57.yaml deleted file mode 100644 index 5b768cc..0000000 --- a/docker/docker-compose.al2.57.yaml +++ /dev/null @@ -1,21 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-aws-lambda-events:al2-5.7 - build: - args: - swift_version: "5.7" - - soundness: - image: swift-aws-lambda-events:al2-5.7 - - test: - image: swift-aws-lambda-events:al2-5.7 - - test-samples: - image: swift-aws-lambda-events:al2-5.7 - - shell: - image: swift-aws-lambda-events:al2-5.7 From 508cf4d914c6c269bc0a676c5a7248a29b187331 Mon Sep 17 00:00:00 2001 From: Sebastien Stormacq Date: Thu, 23 May 2024 17:38:45 +0200 Subject: [PATCH 3/5] bump swift version on example project as well --- Examples/Simple/Package.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Examples/Simple/Package.swift b/Examples/Simple/Package.swift index 4ba55ba..47f40a9 100644 --- a/Examples/Simple/Package.swift +++ b/Examples/Simple/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.5 +// swift-tools-version:5.7 import PackageDescription @@ -13,10 +13,11 @@ let package = Package( ], dependencies: [ // this is the dependency on the swift-aws-lambda-runtime library - .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: "1.0.0-alpha.2"), // this is the dependency on the swift-aws-lambda-events library // in real-world projects this would say // .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime-events.git", from: "1.0.0") + // but here, we're using the local version .package(name: "swift-aws-lambda-events", path: "../.."), ], targets: [ From b51aae4d176dc1560059019eb16e4f4281140d83 Mon Sep 17 00:00:00 2001 From: Sebastien Stormacq Date: Thu, 23 May 2024 17:45:42 +0200 Subject: [PATCH 4/5] additional versions bump to 5.8 --- Examples/Simple/Package.swift | 2 +- docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/Simple/Package.swift b/Examples/Simple/Package.swift index 47f40a9..461e21d 100644 --- a/Examples/Simple/Package.swift +++ b/Examples/Simple/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.7 +// swift-tools-version:5.8 import PackageDescription diff --git a/docker/Dockerfile b/docker/Dockerfile index ec97cef..aa5a229 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG swift_version=5.7 +ARG swift_version=5.8 ARG base_image=swift:$swift_version-amazonlinux2 FROM $base_image # needed to do again after FROM due to docker limitation From b6a17122241a494963dff1bdd2f84e152a32b11d Mon Sep 17 00:00:00 2001 From: Sebastien Stormacq Date: Fri, 24 May 2024 11:08:27 +0200 Subject: [PATCH 5/5] remove swift concurrency from test target --- Package.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index af4f47c..b4d0217 100644 --- a/Package.swift +++ b/Package.swift @@ -15,7 +15,6 @@ let package = Package( .target(name: "AWSLambdaEvents", dependencies: [.product(name: "HTTPTypes", package: "swift-http-types")]), .testTarget(name: "AWSLambdaEventsTests", - dependencies: ["AWSLambdaEvents"], - swiftSettings: [.enableExperimentalFeature("StrictConcurrency")]), + dependencies: ["AWSLambdaEvents"]), ] )