remove deprecated code and update to swift 6.1 minimum

Author: sebsto

.github/workflows/integration_tests.yml

@@ -42,8 +42,8 @@ on:
       matrix_linux_swift_container_image:
         type: string
         # 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"
-        default: "swift:6.2"
+        description: "Container image for the matrix test jobs. Defaults to Swift 6.3"
+        default: "swift:6.3"
 
 ## We are cancelling previously triggered workflow runs
 concurrency:

.github/workflows/pull_request.yml

@@ -25,7 +25,7 @@ jobs:
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
     with:
       enable_windows_checks: false
-      linux_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}, {\"swift_version\": \"5.10\"}]"
+      linux_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}, {\"swift_version\": \"5.10\"}, {\"swift_version\": \"6.0\"}]"
       swift_flags: "--explicit-target-dependency-import-check error"
       swift_nightly_flags: "--explicit-target-dependency-import-check error"
       enable_linux_static_sdk_build: true

Examples/ManagedInstances/README.md

@@ -12,7 +12,7 @@ This example demonstrates deploying Swift Lambda functions to Lambda Managed Ins
 
 - AWS CLI configured with appropriate permissions
 - SAM CLI installed
-- Swift 6.0+ installed
+- Swift 6.1+ installed
 - An existing [Lambda Managed Instances capacity provider](https://docs.aws.amazon.com/lambda/latest/dg/lambda-managed-instances-capacity-providers.html)
 
 ## Capacity Provider Configuration

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.1
 
 import PackageDescription
 

Tests/AWSLambdaRuntimeTests/LocalServerPoolCancellationTests.swift

@@ -34,7 +34,6 @@ struct LocalServerPoolCancellationTests {
     @Test("Cancelling one task should not affect other waiting tasks")
     @available(LambdaSwift 2.0, *)
     func testCancellationOnlyAffectsOwnTask() async throws {
-        #if compiler(>=6.0)
         let pool = LambdaHTTPServer.Pool<TestItem>(name: "Test Pool")
 
         let cancelledFlags = Mutex<[Bool]>([false, false, false])
@@ -95,9 +94,6 @@ struct LocalServerPoolCancellationTests {
         _ = await task2.result
         _ = await task3.result
 
-        #else
-        throw XCTSkip("This test requires Swift 6.0 or later")
-        #endif
     }
 
     /// Test concurrent invocations with one being cancelled
@@ -107,8 +103,6 @@ struct LocalServerPoolCancellationTests {
     @Test("Multiple concurrent invocations with one cancellation")
     @available(LambdaSwift 2.0, *)
     func testConcurrentInvocationsWithCancellation() async throws {
-        #if compiler(>=6.0)
-
         try await withThrowingTaskGroup(of: Void.self) { group in
             // Timeout task
             group.addTask {
@@ -169,10 +163,6 @@ struct LocalServerPoolCancellationTests {
             try await group.next()
             group.cancelAll()
         }
-
-        #else
-        throw XCTSkip("This test requires Swift 6.0 or later")
-        #endif
     }
 
     /// Test that FIFO mode doesn't have the same issue
@@ -181,7 +171,6 @@ struct LocalServerPoolCancellationTests {
     @Test("FIFO mode cancellation works correctly")
     @available(LambdaSwift 2.0, *)
     func testFIFOModeCancellation() async throws {
-        #if compiler(>=6.0)
         let pool = LambdaHTTPServer.Pool<TestItem>(name: "FIFO Test Pool")
 
         try await withThrowingTaskGroup(of: Void.self) { group in
@@ -222,9 +211,6 @@ struct LocalServerPoolCancellationTests {
             try await group.next()
             group.cancelAll()
         }
-        #else
-        throw XCTSkip("This test requires Swift 6.0 or later")
-        #endif
     }
 }
 

Tests/AWSLambdaRuntimeTests/PoolTests.swift

@@ -163,10 +163,6 @@ struct PoolTests {
         #expect(Set(receivedValues).count == producerCount * messagesPerProducer)
     }
 
-    // in Swift 6.0, the error returned by #expect(throwing:) macro is a tuple ()
-    // I decided to skip these tests on Swift 6.0
-    #if swift(>=6.1)
-
     @Test
     @available(LambdaSwift 2.0, *)
     func testConcurrentNext() async throws {
@@ -514,7 +510,5 @@ struct PoolTests {
         let third = try await pool.next(for: "req1")
         #expect(String(buffer: third.body!) == "third")
     }
-    #endif  //swift >= 6.1
-
 }
 #endif  // trait

readme.md

@@ -88,7 +88,7 @@ swift package init --type executable --name MyLambda
     2.3 Your `Package.swift` file must look like this
 
     ```swift
-    // swift-tools-version: 6.0
+    // swift-tools-version: 6.1
 
     import PackageDescription