Use Swift 6.2 + Dependency updates (#370)

Author: MahdiBM

.github/workflows/deploy-all-lambdas.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   deploy-lambdas:
     runs-on: ubuntu-latest
-    container: swift:6.1-amazonlinux2
+    container: swift:6.2-amazonlinux2
 
     env:
       AWS_DEFAULT_REGION: eu-west-1

.github/workflows/deploy-penny.yml

@@ -11,7 +11,7 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    container: swift:6.1-noble
+    container: swift:6.2-noble
 
     steps:
       - name: Checkout

.swift-version

@@ -1,7 +1,7 @@
 # ================================
 # Build image
 # ================================
-FROM swift:6.1-noble as build
+FROM swift:6.2-noble as build
 
 ARG SWIFT_CONFIGURATION
 ARG EXEC_NAME

Dockerfile

@@ -1,4 +1,4 @@
-// swift-tools-version:6.1
+// swift-tools-version:6.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -29,13 +29,9 @@ let package = Package(
         .package(url: "https://github.com/soto-project/soto-core.git", from: "7.3.0"),
         /// Not-released area:
         .package(url: "https://github.com/swiftlang/swift-evolution-metadata-extractor.git", from: "0.1.0"),
-        .package(url: "https://github.com/apple/swift-markdown.git", from: "0.5.0"),
-        .package(
-            url: "https://github.com/swift-server/swift-aws-lambda-runtime.git",
-            /// Last commit on main as of this code change; V2
-            revision: "c7df9bcd8af279c70f991f5d53e48d73d3e6821a"
-        ),
-        .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.0.0"),
+        .package(url: "https://github.com/swiftlang/swift-markdown.git", from: "0.7.1"),
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.3"),
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.2.1"),
     ],
     targets: [
         .executableTarget(
@@ -54,7 +50,7 @@ let package = Package(
                 .target(name: "Shared"),
                 .target(name: "Models"),
             ],
-            swiftSettings: targetsSwiftSettings
+            swiftSettings: upcomingFeaturesSwiftSettings
         ),
         .lambdaTarget(
             name: "Users",
@@ -122,10 +118,11 @@ let package = Package(
                 .product(name: "SotoSecretsManager", package: "soto"),
                 .product(name: "SotoCore", package: "soto-core"),
                 .product(name: "Logging", package: "swift-log"),
+                .product(name: "AWSLambdaEvents", package: "swift-aws-lambda-events"),
                 .target(name: "Shared"),
             ],
             path: "./Lambdas/LambdasShared",
-            swiftSettings: targetsSwiftSettings
+            swiftSettings: upcomingFeaturesSwiftSettings
         ),
         .target(
             name: "GitHubAPI",
@@ -145,14 +142,14 @@ let package = Package(
                 .copy("openapi-generator-config.yaml"),
                 .copy("openapi.yaml"),
             ],
-            swiftSettings: targetsSwiftSettings
+            swiftSettings: upcomingFeaturesSwiftSettings
         ),
         .target(
             name: "Models",
             dependencies: [
                 .product(name: "DiscordModels", package: "DiscordBM")
             ],
-            swiftSettings: targetsSwiftSettings
+            swiftSettings: upcomingFeaturesSwiftSettings
         ),
         .target(
             name: "Shared",
@@ -163,7 +160,7 @@ let package = Package(
                 .product(name: "DiscordBM", package: "DiscordBM"),
                 .target(name: "Models"),
             ],
-            swiftSettings: targetsSwiftSettings
+            swiftSettings: upcomingFeaturesSwiftSettings
         ),
         .target(
             name: "Rendering",
@@ -175,7 +172,7 @@ let package = Package(
                 .product(name: "LeafKit", package: "leaf-kit"),
                 .target(name: "Shared"),
             ],
-            swiftSettings: targetsSwiftSettings
+            swiftSettings: upcomingFeaturesSwiftSettings
         ),
         .testTarget(
             name: "PennyTests",
@@ -202,12 +199,12 @@ let package = Package(
                 .target(name: "Penny"),
                 .target(name: "GHHooksLambda"),
             ],
-            swiftSettings: testsSwiftSettings
+            swiftSettings: upcomingFeaturesSwiftSettings
         ),
     ]
 )
 
-/// Bug alert! Don't make these constants, or they won't take effect!
+/// Bug alert! Don't make this a constant, or it won't take effect!
 /// https://github.com/apple/swift-package-manager/issues/6597
 var upcomingFeaturesSwiftSettings: [SwiftSetting] {
     [
@@ -218,20 +215,6 @@ var upcomingFeaturesSwiftSettings: [SwiftSetting] {
     ]
 }
 
-var targetsSwiftSettings: [SwiftSetting] {
-    upcomingFeaturesSwiftSettings + [
-        /// https://github.com/apple/swift/issues/67214
-        .unsafeFlags(
-            ["-Xllvm", "-vectorize-slp=false"],
-            .when(platforms: [.linux], configuration: .release)
-        )
-    ]
-}
-
-var testsSwiftSettings: [SwiftSetting] {
-    upcomingFeaturesSwiftSettings
-}
-
 extension PackageDescription.Target {
     @MainActor
     static func lambdaTarget(
@@ -249,7 +232,7 @@ extension PackageDescription.Target {
                 .target(name: "Models"),
             ] + additionalDependencies,
             path: "./Lambdas/\(name)",
-            swiftSettings: targetsSwiftSettings
+            swiftSettings: upcomingFeaturesSwiftSettings
         )
     }
 }

Package.resolved

@@ -29,8 +29,8 @@ Penny is a Swift bot that works for the [Vapor](https://vapor.codes) community.
     </a>
     <a href="https://swift.org">
         <img
-            src="https://design.vapor.codes/images/swift61up.svg"
-            alt="Swift 6.1+"
+            src="https://design.vapor.codes/images/swift62up.svg"
+            alt="Swift 6.2+"
         >
     </a>
 </p>
@@ -63,7 +63,7 @@ The related labels are:
 * `semver-noop`
 * `release`
 * `prerelease`
-* `no-release-needed` 
+* `no-release-needed`
 
 Some other notes:
 * `semver-major` and `release` are of limited use for automatic releases. Penny won't do a whole major release by itself since those are rare and they can be risky to do.

Package.swift

@@ -12,32 +12,37 @@ func expectMultilineStringsEqual(
 ) {
     let expression1 = expression1.trimmingSuffix(while: \.isNewline)
     let expression2 = expression2.trimmingSuffix(while: \.isNewline)
-    if expression1 != expression2 {
-        /// Not using `whereSeparator: \.isNewline` so it doesn't match non `\n` characters.
-        let lines1 =
-            expression1
-            .split(separator: "\n", omittingEmptySubsequences: false)
-            .map { $0.trimmingSuffix(while: \.isWhitespace) }
-        let lines2 =
-            expression2
-            .split(separator: "\n", omittingEmptySubsequences: false)
-            .map { $0.trimmingSuffix(while: \.isWhitespace) }
 
-        if lines1.count == lines2.count {
-            for (idx, (line1, line2)) in zip(lines1, lines2).enumerated() {
-                if line1 != line2 {
-                    Issue.record(
-                        """
-                        Not equal at line \(idx + 1):
-                        Got:      \(line1.debugDescription)
-                        Expected: \(line2.debugDescription)
-                        """,
-                        sourceLocation: sourceLocation
-                    )
-                }
-            }
-        } else {
-            #expect(expression1 == expression2, sourceLocation: sourceLocation)
+    /// Short-circuit if the lines are completely equal.
+    if expression1 == expression2 {
+        return
+    }
+
+    /// Not using `whereSeparator: \.isNewline` so it doesn't match non `\n` characters.
+    let lines1 =
+        expression1
+        .split(separator: "\n", omittingEmptySubsequences: false)
+        .map { $0.trimmingSuffix(while: \.isWhitespace) }
+    let lines2 =
+        expression2
+        .split(separator: "\n", omittingEmptySubsequences: false)
+        .map { $0.trimmingSuffix(while: \.isWhitespace) }
+
+    guard lines1.count == lines2.count else {
+        #expect(expression1 == expression2, sourceLocation: sourceLocation)
+        return
+    }
+
+    for (idx, (line1, line2)) in zip(lines1, lines2).enumerated() {
+        if line1 != line2 {
+            Issue.record(
+                """
+                Not equal at line \(idx + 1):
+                Got:      \(line1.debugDescription)
+                Expected: \(line2.debugDescription)
+                """,
+                sourceLocation: sourceLocation
+            )
         }
     }
 }