From 1ec9711a480b36c3f1899bc2ed13cfbc485ecc9c Mon Sep 17 00:00:00 2001 From: tom doron Date: Mon, 9 Jan 2023 13:52:55 -0800 Subject: [PATCH 1/2] remove unnecessary preconcurrency imports motivation: eliminate warnings changes: require swift 5.7 and remove unnecessary preconcurrency imports for foundation --- Package.swift | 2 +- Sources/AWSLambdaEvents/Cloudwatch.swift | 4 ---- Sources/AWSLambdaEvents/DynamoDB.swift | 4 ---- Sources/AWSLambdaEvents/Utils/DateWrappers.swift | 4 ---- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Package.swift b/Package.swift index 923815f..1c08bf9 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.6 +// swift-tools-version:5.7 import PackageDescription diff --git a/Sources/AWSLambdaEvents/Cloudwatch.swift b/Sources/AWSLambdaEvents/Cloudwatch.swift index a6441c6..dc0d586 100644 --- a/Sources/AWSLambdaEvents/Cloudwatch.swift +++ b/Sources/AWSLambdaEvents/Cloudwatch.swift @@ -12,11 +12,7 @@ // //===----------------------------------------------------------------------===// -#if swift(>=5.6) -@preconcurrency import struct Foundation.Date -#else import struct Foundation.Date -#endif /// EventBridge has the same events/notification types as CloudWatch typealias EventBridgeEvent = CloudwatchEvent diff --git a/Sources/AWSLambdaEvents/DynamoDB.swift b/Sources/AWSLambdaEvents/DynamoDB.swift index c0f1000..a66006a 100644 --- a/Sources/AWSLambdaEvents/DynamoDB.swift +++ b/Sources/AWSLambdaEvents/DynamoDB.swift @@ -12,11 +12,7 @@ // //===----------------------------------------------------------------------===// -#if swift(>=5.6) -@preconcurrency import struct Foundation.Date -#else import struct Foundation.Date -#endif // https://docs.aws.amazon.com/lambda/latest/dg/with-ddb.html public struct DynamoDBEvent: Decodable { diff --git a/Sources/AWSLambdaEvents/Utils/DateWrappers.swift b/Sources/AWSLambdaEvents/Utils/DateWrappers.swift index eedcf23..43a86f8 100644 --- a/Sources/AWSLambdaEvents/Utils/DateWrappers.swift +++ b/Sources/AWSLambdaEvents/Utils/DateWrappers.swift @@ -12,11 +12,7 @@ // //===----------------------------------------------------------------------===// -#if swift(>=5.6) -@preconcurrency import struct Foundation.Date -#else import struct Foundation.Date -#endif import class Foundation.DateFormatter import struct Foundation.Locale import struct Foundation.TimeZone From 4b4db715fdb6d6ca672b4adb2b2d343aa04879e3 Mon Sep 17 00:00:00 2001 From: tom doron Date: Mon, 9 Jan 2023 16:30:20 -0800 Subject: [PATCH 2/2] fixup --- Sources/AWSLambdaEvents/Cloudwatch.swift | 4 ++++ Sources/AWSLambdaEvents/DynamoDB.swift | 4 ++++ .../AWSLambdaEvents/Utils/DateWrappers.swift | 4 ++++ docker/docker-compose.al2.54.yaml | 18 ------------------ docker/docker-compose.al2.55.yaml | 18 ------------------ docker/docker-compose.al2.57.yaml | 2 +- docker/docker-compose.yaml | 2 +- 7 files changed, 14 insertions(+), 38 deletions(-) delete mode 100644 docker/docker-compose.al2.54.yaml delete mode 100644 docker/docker-compose.al2.55.yaml diff --git a/Sources/AWSLambdaEvents/Cloudwatch.swift b/Sources/AWSLambdaEvents/Cloudwatch.swift index dc0d586..e27af01 100644 --- a/Sources/AWSLambdaEvents/Cloudwatch.swift +++ b/Sources/AWSLambdaEvents/Cloudwatch.swift @@ -12,7 +12,11 @@ // //===----------------------------------------------------------------------===// +#if canImport(Darwin) import struct Foundation.Date +#else +@preconcurrency import struct Foundation.Date +#endif /// EventBridge has the same events/notification types as CloudWatch typealias EventBridgeEvent = CloudwatchEvent diff --git a/Sources/AWSLambdaEvents/DynamoDB.swift b/Sources/AWSLambdaEvents/DynamoDB.swift index a66006a..71ff22e 100644 --- a/Sources/AWSLambdaEvents/DynamoDB.swift +++ b/Sources/AWSLambdaEvents/DynamoDB.swift @@ -12,7 +12,11 @@ // //===----------------------------------------------------------------------===// +#if canImport(Darwin) import struct Foundation.Date +#else +@preconcurrency import struct Foundation.Date +#endif // https://docs.aws.amazon.com/lambda/latest/dg/with-ddb.html public struct DynamoDBEvent: Decodable { diff --git a/Sources/AWSLambdaEvents/Utils/DateWrappers.swift b/Sources/AWSLambdaEvents/Utils/DateWrappers.swift index 43a86f8..235e380 100644 --- a/Sources/AWSLambdaEvents/Utils/DateWrappers.swift +++ b/Sources/AWSLambdaEvents/Utils/DateWrappers.swift @@ -12,7 +12,11 @@ // //===----------------------------------------------------------------------===// +#if canImport(Darwin) import struct Foundation.Date +#else +@preconcurrency import struct Foundation.Date +#endif import class Foundation.DateFormatter import struct Foundation.Locale import struct Foundation.TimeZone diff --git a/docker/docker-compose.al2.54.yaml b/docker/docker-compose.al2.54.yaml deleted file mode 100644 index c23061c..0000000 --- a/docker/docker-compose.al2.54.yaml +++ /dev/null @@ -1,18 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-aws-lambda-events:al2-5.4 - build: - args: - swift_version: "5.4" - - test: - image: swift-aws-lambda-events:al2-5.4 - - test-samples: - image: swift-aws-lambda-events:al2-5.4 - - shell: - image: swift-aws-lambda-events:al2-5.4 diff --git a/docker/docker-compose.al2.55.yaml b/docker/docker-compose.al2.55.yaml deleted file mode 100644 index fc05473..0000000 --- a/docker/docker-compose.al2.55.yaml +++ /dev/null @@ -1,18 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-aws-lambda-events:al2-5.5 - build: - args: - swift_version: "5.5" - - test: - image: swift-aws-lambda-events:al2-5.5 - - test-samples: - image: swift-aws-lambda-events:al2-5.5 - - shell: - image: swift-aws-lambda-events:al2-5.5 diff --git a/docker/docker-compose.al2.57.yaml b/docker/docker-compose.al2.57.yaml index 45805c9..17c650a 100644 --- a/docker/docker-compose.al2.57.yaml +++ b/docker/docker-compose.al2.57.yaml @@ -6,7 +6,7 @@ services: image: swift-aws-lambda-events:al2-5.7 build: args: - base_image: "swiftlang/swift:nightly-main-amazonlinux2" + swift_version: "5.7" test: image: swift-aws-lambda-events:al2-5.7 diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index e7fba40..e194a58 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -1,6 +1,6 @@ # this file is not designed to be run directly # instead, use the docker-compose.. files -# eg docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.al2.52.yaml run test +# eg docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.al2.57.yaml run test version: "3" services: