Require Swift 6

swift-server · Aug 22, 2024 · 3800613 · 3800613
1 parent ed72bdd
commit 3800613
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 184 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,21 +1,19 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 
 import PackageDescription
 
 let package = Package(
     name: "swift-aws-lambda-runtime",
     platforms: [
-        .macOS(.v12),
-        .iOS(.v15),
-        .tvOS(.v15),
-        .watchOS(.v8),
+        .macOS(.v15)
     ],
     products: [
         // this library exports `AWSLambdaRuntimeCore` and adds Foundation convenience methods
         .library(name: "AWSLambdaRuntime", targets: ["AWSLambdaRuntime"]),
         // this has all the main functionality for lambda and it does not link Foundation
         .library(name: "AWSLambdaRuntimeCore", targets: ["AWSLambdaRuntimeCore"]),
         // plugin to package the lambda, creating an archive that can be uploaded to AWS
+        // requires Linux or at least macOS v15
         .plugin(name: "AWSLambdaPackager", targets: ["AWSLambdaPackager"]),
         // for testing only
         .library(name: "AWSLambdaTesting", targets: ["AWSLambdaTesting"]),
@@ -26,18 +24,26 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
     ],
     targets: [
-        .target(name: "AWSLambdaRuntime", dependencies: [
-            .byName(name: "AWSLambdaRuntimeCore"),
-            .product(name: "NIOCore", package: "swift-nio"),
-            .product(name: "NIOFoundationCompat", package: "swift-nio"),
-        ]),
-        .target(name: "AWSLambdaRuntimeCore", dependencies: [
-            .product(name: "Logging", package: "swift-log"),
-            .product(name: "NIOHTTP1", package: "swift-nio"),
-            .product(name: "NIOCore", package: "swift-nio"),
-            .product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
-            .product(name: "NIOPosix", package: "swift-nio"),
-        ]),
+        .target(
+            name: "AWSLambdaRuntime",
+            dependencies: [
+                .byName(name: "AWSLambdaRuntimeCore"),
+                .product(name: "NIOCore", package: "swift-nio"),
+                .product(name: "NIOFoundationCompat", package: "swift-nio"),
+            ],
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
+        .target(
+            name: "AWSLambdaRuntimeCore",
+            dependencies: [
+                .product(name: "Logging", package: "swift-log"),
+                .product(name: "NIOHTTP1", package: "swift-nio"),
+                .product(name: "NIOCore", package: "swift-nio"),
+                .product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
+                .product(name: "NIOPosix", package: "swift-nio"),
+            ],
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
         .plugin(
             name: "AWSLambdaPackager",
             capability: .command(
@@ -47,25 +53,45 @@ let package = Package(
                 )
             )
         ),
-        .testTarget(name: "AWSLambdaRuntimeCoreTests", dependencies: [
-            .byName(name: "AWSLambdaRuntimeCore"),
-            .product(name: "NIOTestUtils", package: "swift-nio"),
-            .product(name: "NIOFoundationCompat", package: "swift-nio"),
-        ]),
-        .testTarget(name: "AWSLambdaRuntimeTests", dependencies: [
-            .byName(name: "AWSLambdaRuntimeCore"),
-            .byName(name: "AWSLambdaRuntime"),
-        ]),
+        .testTarget(
+            name: "AWSLambdaRuntimeCoreTests",
+            dependencies: [
+                .byName(name: "AWSLambdaRuntimeCore"),
+                .product(name: "NIOTestUtils", package: "swift-nio"),
+                .product(name: "NIOFoundationCompat", package: "swift-nio"),
+            ],
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
+        .testTarget(
+            name: "AWSLambdaRuntimeTests",
+            dependencies: [
+                .byName(name: "AWSLambdaRuntimeCore"),
+                .byName(name: "AWSLambdaRuntime"),
+            ],
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
         // testing helper
-        .target(name: "AWSLambdaTesting", dependencies: [
-            .byName(name: "AWSLambdaRuntime"),
-            .product(name: "NIO", package: "swift-nio"),
-        ]),
-        .testTarget(name: "AWSLambdaTestingTests", dependencies: ["AWSLambdaTesting"]),
+        .target(
+            name: "AWSLambdaTesting",
+            dependencies: [
+                .byName(name: "AWSLambdaRuntime"),
+                .product(name: "NIO", package: "swift-nio"),
+            ],
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
+        .testTarget(
+            name: "AWSLambdaTestingTests",
+            dependencies: ["AWSLambdaTesting"],
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
         // for perf testing
-        .executableTarget(name: "MockServer", dependencies: [
-            .product(name: "NIOHTTP1", package: "swift-nio"),
-            .product(name: "NIO", package: "swift-nio"),
-        ]),
+        .executableTarget(
+            name: "MockServer",
+            dependencies: [
+                .product(name: "NIOHTTP1", package: "swift-nio"),
+                .product(name: "NIO", package: "swift-nio"),
+            ],
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
     ]
 )
diff --git a/[email protected] b/[email protected]
diff --git a/[email protected] b/[email protected]
diff --git a/Plugins/AWSLambdaPackager/Plugin.swift b/Plugins/AWSLambdaPackager/Plugin.swift
@@ -15,6 +15,7 @@
 import Dispatch
 import Foundation
 import PackagePlugin
+import Synchronization
 
 #if os(macOS)
 import Darwin
@@ -28,6 +29,7 @@ import ucrt
 #error("Unsupported platform")
 #endif
 
+@available(macOS 15.0, *)
 @main
 struct AWSLambdaPackager: CommandPlugin {
     func performCommand(context: PackagePlugin.PluginContext, arguments: [String]) async throws {
@@ -259,10 +261,10 @@ struct AWSLambdaPackager: CommandPlugin {
             print("\(executable.string) \(arguments.joined(separator: " "))")
         }
 
-        var output = ""
+        let outputMutex = Mutex("")
         let outputSync = DispatchGroup()
         let outputQueue = DispatchQueue(label: "AWSLambdaPackager.output")
-        let outputHandler = { (data: Data?) in
+        let outputHandler = { @Sendable (data: Data?) in
             dispatchPrecondition(condition: .onQueue(outputQueue))
 
             outputSync.enter()
@@ -272,7 +274,9 @@ struct AWSLambdaPackager: CommandPlugin {
                 return
             }
 
-            output += _output + "\n"
+            outputMutex.withLock { output in
+                output += _output + "\n"
+            }
 
             switch logLevel {
             case .silent:
@@ -307,6 +311,8 @@ struct AWSLambdaPackager: CommandPlugin {
         // wait for output to be full processed
         outputSync.wait()
 
+        let output = outputMutex.withLock { $0 }
+
         if process.terminationStatus != 0 {
             // print output on failure and if not already printed
             if logLevel < .output {
@@ -328,6 +334,7 @@ struct AWSLambdaPackager: CommandPlugin {
     }
 }
 
+@available(macOS 15.0, *)
 private struct Configuration: CustomStringConvertible {
     public let outputDirectory: Path
     public let products: [Product]