Swift v6

Author: AndrewBarba

.swift-format

@@ -0,0 +1,7 @@
+{
+  "indentation" : {
+    "spaces": 4
+  },
+  "tabWidth": 4,
+  "version": 1
+}

Package.resolved

@@ -1,43 +1,58 @@
-// swift-tools-version: 5.6
+// swift-tools-version: 5.9
 
 import PackageDescription
 
 let package = Package(
     name: "Vercel",
     platforms: [
-        .macOS(.v12),
-        .iOS(.v15),
-        .tvOS(.v15),
-        .watchOS(.v8)
+        .macOS(.v12)
     ],
     products: [
         .library(name: "Vercel", targets: ["Vercel"]),
         .library(name: "VercelVapor", targets: ["VercelVapor"]),
-        .plugin(name: "VercelPackager", targets: ["VercelPackager"])
+        .plugin(name: "VercelPackager", targets: ["VercelPackager"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-crypto", "1.0.0" ..< "3.0.0"),
-        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime", from: "1.0.0-alpha.1"),
-        .package(url: "https://github.com/vapor/vapor", from: "4.0.0")
+        .package(url: "https://github.com/apple/swift-crypto", from: "3.0.0"),
+        .package(
+            url: "https://github.com/swift-server/swift-aws-lambda-runtime", from: "1.0.0-alpha.2"),
+        .package(url: "https://github.com/vapor/vapor", from: "4.0.0"),
     ],
     targets: [
-        .target(name: "Vercel", dependencies: [
-            .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"),
-            .product(name: "Crypto", package: "swift-crypto")
-        ]),
-        .target(name: "VercelVapor", dependencies: [
-            .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"),
-            .product(name: "Vapor", package: "vapor"),
-            .byName(name: "Vercel")
-        ]),
+        .target(
+            name: "Vercel",
+            dependencies: [
+                .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"),
+                .product(name: "Crypto", package: "swift-crypto"),
+            ],
+            swiftSettings: [
+                .enableExperimentalFeature("StrictConcurrency")
+            ]
+        ),
+        .target(
+            name: "VercelVapor",
+            dependencies: [
+                .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"),
+                .product(name: "Vapor", package: "vapor"),
+                .byName(name: "Vercel"),
+            ],
+            swiftSettings: [
+                .enableExperimentalFeature("StrictConcurrency")
+            ]
+        ),
         .plugin(
             name: "VercelPackager",
             capability: .command(
-                intent: .custom(verb: "vercel", description: "Build and deploy your Swift application to Vercel")
+                intent: .custom(
+                    verb: "vercel", description: "Build and deploy your Swift application to Vercel"
+                )
             )
         ),
-        .testTarget(name: "VercelTests", dependencies: [
-            .byName(name: "Vercel")
-        ])
+        .testTarget(
+            name: "VercelTests",
+            dependencies: [
+                .byName(name: "Vercel")
+            ]
+        ),
     ]
 )

Package.swift

@@ -1,6 +1,6 @@
 //
 //  VaporHandler.swift
-//  
+//
 //
 //  Created by Andrew Barba on 8/25/23.
 //
@@ -29,13 +29,15 @@ extension VaporHandler {
         // Configure vercel server
         app.servers.use(.vercel)
         // Start the application
-        try app.start()
+        try await app.startup()
         // Cache the app instance
-        Shared.app = app
+        await MainActor.run {
+            Shared.app = app
+        }
     }
 
     public func onRequest(_ req: Vercel.Request) async throws -> Vercel.Response {
-        guard let app = Shared.app else {
+        guard let app = await Shared.app else {
             return .status(.serviceUnavailable).send("Vapor application not configured")
         }
         let vaporRequest = try Vapor.Request.from(request: req, for: app)
@@ -44,8 +46,9 @@ extension VaporHandler {
     }
 }
 
-fileprivate struct Shared {
+private struct Shared {
 
+    @MainActor
     static var app: Application?
 }