Merge pull request #3156 from SwiftPackageIndex/swift-6-prep

Adopting Swift 6 language mode

Author: finestructure

Sources/App/Commands/TriggerBuilds.swift

@@ -16,6 +16,7 @@ import Fluent
 import PostgresKit
 import SQLKit
 import Vapor
+@preconcurrency import SPIManifest
 
 
 struct TriggerBuildsCommand: AsyncCommand {

Sources/App/Controllers/API/API+PackageCollectionController.swift

@@ -14,6 +14,7 @@
 
 import Fluent
 import PackageCollectionsModel
+import PackageCollectionsSigning
 import Vapor
 
 
@@ -59,7 +60,7 @@ extension API {
 }
 
 
-extension SignedCollection: Content {}
+extension PackageCollectionSigning.Model.SignedCollection: Vapor.Content {}
 
 
 extension API {

Sources/App/Controllers/API/Types+WithExample.swift

@@ -1,11 +1,27 @@
+// Copyright Dave Verwer, Sven A. Schmidt, and other contributors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import Foundation
 
 import VaporToOpenAPI
 import DependencyResolution
+import PackageCollectionsSigning
+
 
 // MARK: - External types
 
-extension Date: WithExample {
+extension Date: VaporToOpenAPI.WithExample {
     public static var example: Self { .init(rfc1123: "Sat, 25 Apr 2020 10:55:00 UTC")! }
 }
 
@@ -85,7 +101,7 @@ extension API.PostPackageCollectionDTO: WithExample {
     }
 }
 
-extension PackageCollectionModel.V1.Collection: WithExample {
+extension PackageCollectionModel.V1.Collection: VaporToOpenAPI.WithExample {
     public static var example: Self {
         .init(name: "Packages by mona",
               overview: "A collection of packages authored by mona from the Swift Package Index",
@@ -104,7 +120,7 @@ extension PackageCollectionModel.V1.Collection: WithExample {
     }
 }
 
-extension PackageCollectionModel.V1.Signature.Certificate: WithExample {
+extension PackageCollectionModel.V1.Signature.Certificate: VaporToOpenAPI.WithExample {
     public static var example: Self {
         .init(subject: .init(userID: "V676TFACYJ",
                              commonName: "Swift Package Collection: SPI Operations Limited",
@@ -117,13 +133,13 @@ extension PackageCollectionModel.V1.Signature.Certificate: WithExample {
     }
 }
 
-extension PackageCollectionModel.V1.Signature: WithExample {
+extension PackageCollectionModel.V1.Signature: VaporToOpenAPI.WithExample {
     public static var example: Self {
         .init(signature: "ewogICJhbGciIDogIlJ...<snip>...WD1pXXPrkvVJlv4w", certificate: .example)
     }
 }
 
-extension SignedCollection: WithExample {
+extension PackageCollectionSigning.Model.SignedCollection: VaporToOpenAPI.WithExample {
     public static var example: Self {
         .init(collection: .example, signature: .example)
     }

Sources/App/Controllers/SiteMapController.swift

@@ -17,9 +17,10 @@ import Fluent
 import SQLKit
 import Plot
 
+
 enum SiteMapController {
 
-    static var staticRoutes: [SiteURL] = [
+    static let staticRoutes: [SiteURL] = [
         .home,
         .addAPackage,
         .faq,

Sources/App/Core/AppEnvironment.swift

@@ -19,7 +19,7 @@ import Vapor
 
 enum AppMetrics {
 
-    static var initialized = false
+    nonisolated(unsafe) static var initialized = false
 
     static func bootstrap() {
         // prevent tests from boostrapping multiple times

Sources/App/Core/AppMetrics.swift

@@ -0,0 +1,27 @@
+// Copyright Dave Verwer, Sven A. Schmidt, and other contributors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+@discardableResult
+func run<T>(_ operation: () async throws -> T,
+         defer deferredOperation: () async throws -> Void) async throws -> T {
+    do {
+        let result = try await operation()
+        try await deferredOperation()
+        return result
+    } catch {
+        try await deferredOperation()
+        throw error
+    }
+}

Sources/App/Core/AsyncDefer.swift

@@ -1,9 +1,21 @@
-import Cache
+// Copyright Dave Verwer, Sven A. Schmidt, and other contributors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
+import Cache
 
 typealias CurrentReferenceCache = ExpiringCache<String, String>
 
-
 extension CurrentReferenceCache {
     static let live = CurrentReferenceCache(duration: .minutes(5))
 

Sources/App/Core/CurrentReferenceCache.swift

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import Fluent
+@preconcurrency import SPIManifest
 
 
 enum DocumentationTarget: Equatable, Codable {

Sources/App/Core/DocumentationTarget.swift

@@ -16,6 +16,8 @@ import Foundation
 
 import Fluent
 import SemanticVersion
+@preconcurrency import SPIManifest
+
 
 struct DocumentationMetadata {
     var owner: String?