SDGGiesbrecht · SDGGiesbrecht · May 10, 2023 · Apr 3, 2023 · Apr 3, 2023 · Apr 3, 2023
diff --git a/.github/workflows/Amazon Linux.yaml b/.github/workflows/Amazon Linux.yaml
@@ -20,7 +20,7 @@ jobs:
   Amazon_Linux:
     name: Amazon Linux
     runs-on: ubuntu-20.04
-    container: swift:5.7.0-amazonlinux2
+    container: swift:5.8.0-amazonlinux2
     steps:
     - name: Check out
       uses: actions/checkout@v2

diff --git a/.github/workflows/Android.yaml b/.github/workflows/Android.yaml
@@ -47,15 +47,15 @@ jobs:
         sudo rm -rf /usr/lib/clang/10.0.0
         sudo rm -rf /usr/lib/python3/dist-packages/lldb
         curl \
-          'https://download.swift.org/swift-5.7-release/ubuntu2004/swift-5.7-RELEASE/swift-5.7-RELEASE-ubuntu20.04.tar.gz' \
-          --output '/tmp/swift-5.7-RELEASE-ubuntu20.04.tar.gz' \
+          'https://download.swift.org/swift-5.8-release/ubuntu2004/swift-5.8-RELEASE/swift-5.8-RELEASE-ubuntu20.04.tar.gz' \
+          --output '/tmp/swift-5.8-RELEASE-ubuntu20.04.tar.gz' \
           --location
         tar --extract \
-          --file /tmp/swift-5.7-RELEASE-ubuntu20.04.tar.gz \
+          --file /tmp/swift-5.8-RELEASE-ubuntu20.04.tar.gz \
           --directory /tmp \
           --verbose
         sudo mkdir -p /
-        sudo cp -R /tmp/swift-5.7-RELEASE-ubuntu20.04/* /
+        sudo cp -R /tmp/swift-5.8-RELEASE-ubuntu20.04/* /
         export PATH="/usr/bin:${PATH}"
         echo "PATH=${PATH}" >> $GITHUB_ENV
         swift --version
@@ -64,15 +64,15 @@ jobs:
       run: |
         set -x
         curl \
-          'https://github.com/buttaface/swift-android-sdk/releases/download/5.7/swift-5.7-android-x86_64-24-sdk.tar.xz' \
-          --output '/tmp/swift-5.7-android-x86_64-24-sdk.tar.xz' \
+          'https://github.com/buttaface/swift-android-sdk/releases/download/5.8/swift-5.8-android-24-sdk.tar.xz' \
+          --output '/tmp/swift-5.8-android-24-sdk.tar.xz' \
           --location
         tar --extract \
-          --file /tmp/swift-5.7-android-x86_64-24-sdk.tar.xz \
+          --file /tmp/swift-5.8-android-24-sdk.tar.xz \
           --directory /tmp \
           --verbose
         sudo mkdir -p /Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk
-        sudo cp -R /tmp/swift-5.7-android-x86_64-24-sdk/* /Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk
+        sudo cp -R /tmp/swift-5.8-android-24-sdk/* /Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk
         sudo chmod -R a+rwx /Library
         ln \
           /usr/lib/clang/13.0.0 \
@@ -89,24 +89,23 @@ jobs:
           --sdk ${ANDROID_HOME}/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/sysroot \
           -Xswiftc -resource-dir -Xswiftc /Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift \
           -Xswiftc -tools-directory -Xswiftc ${ANDROID_HOME}/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin \
+          -Xswiftc -L -Xswiftc /Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/x86_64-linux-android \
           -Xcc -fPIC \
           -Xcc -lstdc++
     - name: Copy libraries
       shell: bash
       run: |
         set -x
         mkdir -p .build/x86_64-unknown-linux-android24/debug
-        cp -R /Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/*.so .build/x86_64-unknown-linux-android24/debug
-        mkdir -p .build/x86_64-unknown-linux-android24/debug
-        cp -R /Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/*.so .build/x86_64-unknown-linux-android24/debug
+        cp -R /Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/x86_64-linux-android/*.so .build/x86_64-unknown-linux-android24/debug
     - name: Upload tests
       uses: actions/upload-artifact@v2
       with:
         name: tests
         path: .build/x86_64-unknown-linux-android24/debug
   Android_II:
     name: Android II
-    runs-on: macos-12
+    runs-on: macos-13
     needs: Android
     steps:
     - name: Check out

diff --git a/.github/workflows/Documentation Deployment.yaml b/.github/workflows/Documentation Deployment.yaml
@@ -23,7 +23,7 @@ jobs:
   Deployment:
     name: Deployment
     runs-on: ubuntu-20.04
-    container: swift:5.7.0-focal
+    container: swift:5.8.0-focal
     steps:
     - name: Check out
       uses: actions/checkout@v2

diff --git a/.github/workflows/Miscellaneous.yaml b/.github/workflows/Miscellaneous.yaml
@@ -20,7 +20,7 @@ jobs:
   Miscellaneous:
     name: Miscellaneous
     runs-on: ubuntu-20.04
-    container: swift:5.7.0-focal
+    container: swift:5.8.0-focal
     steps:
     - name: Check out
       uses: actions/checkout@v2

diff --git a/.github/workflows/Ubuntu.yaml b/.github/workflows/Ubuntu.yaml
@@ -20,7 +20,7 @@ jobs:
   Ubuntu:
     name: Ubuntu
     runs-on: ubuntu-20.04
-    container: swift:5.7.0-focal
+    container: swift:5.8.0-focal
     steps:
     - name: Check out
       uses: actions/checkout@v2

diff --git a/.github/workflows/Web.yaml b/.github/workflows/Web.yaml
@@ -20,7 +20,7 @@ jobs:
   Web:
     name: Web
     runs-on: ubuntu-20.04
-    container: ghcr.io/swiftwasm/carton:0.18.0
+    container: ghcr.io/swiftwasm/carton:0.19.1
     steps:
     - name: Check out
       uses: actions/checkout@v2

diff --git a/.github/workflows/Windows.yaml b/.github/workflows/Windows.yaml
@@ -31,8 +31,8 @@ jobs:
     - name: Install Swift
       uses: compnerd/gha-setup-swift@cf2a61060c146203ea6fe10cce367979ae4ec0b1
       with:
-        branch: swift-5.7-release
-        tag: 5.7-RELEASE
+        branch: swift-5.8-release
+        tag: 5.8-RELEASE
     - name: Test
       shell: cmd
       run: |

diff --git a/.github/workflows/iOS.yaml b/.github/workflows/iOS.yaml
@@ -19,7 +19,7 @@ on: [push, pull_request]
 jobs:
   iOS:
     name: iOS
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - name: Check out
       uses: actions/checkout@v2
@@ -32,7 +32,7 @@ jobs:
       shell: bash
       run: |
         set -x
-        sudo xcode-select -switch /Applications/Xcode_14.0.app
+        sudo xcode-select -switch /Applications/Xcode_14.3.app
         defaults write com.apple.dt.Xcode IDESkipPackagePluginFingerprintValidatation -bool YES
         xcodebuild -version
         swift --version

diff --git a/.github/workflows/macOS.yaml b/.github/workflows/macOS.yaml
@@ -19,7 +19,7 @@ on: [push, pull_request]
 jobs:
   macOS:
     name: macOS
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - name: Check out
       uses: actions/checkout@v2
@@ -32,7 +32,7 @@ jobs:
       shell: bash
       run: |
         set -x
-        sudo xcode-select -switch /Applications/Xcode_14.0.app
+        sudo xcode-select -switch /Applications/Xcode_14.3.app
         defaults write com.apple.dt.Xcode IDESkipPackagePluginFingerprintValidatation -bool YES
         xcodebuild -version
         swift --version

diff --git a/.github/workflows/tvOS.yaml b/.github/workflows/tvOS.yaml
@@ -19,7 +19,7 @@ on: [push, pull_request]
 jobs:
   tvOS:
     name: tvOS
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - name: Check out
       uses: actions/checkout@v2
@@ -32,7 +32,7 @@ jobs:
       shell: bash
       run: |
         set -x
-        sudo xcode-select -switch /Applications/Xcode_14.0.app
+        sudo xcode-select -switch /Applications/Xcode_14.3.app
         defaults write com.apple.dt.Xcode IDESkipPackagePluginFingerprintValidatation -bool YES
         xcodebuild -version
         swift --version

diff --git a/.github/workflows/watchOS.yaml b/.github/workflows/watchOS.yaml
@@ -19,7 +19,7 @@ on: [push, pull_request]
 jobs:
   watchOS:
     name: watchOS
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - name: Check out
       uses: actions/checkout@v2
@@ -32,7 +32,7 @@ jobs:
       shell: bash
       run: |
         set -x
-        sudo xcode-select -switch /Applications/Xcode_14.0.app
+        sudo xcode-select -switch /Applications/Xcode_14.3.app
         defaults write com.apple.dt.Xcode IDESkipPackagePluginFingerprintValidatation -bool YES
         xcodebuild -version
         swift --version

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.8
 
 /*
  Package.swift

diff --git a/Sources/WorkspaceImplementation/Tasks/Continuous Integration/ContinuousIntegrationJob.swift b/Sources/WorkspaceImplementation/Tasks/Continuous Integration/ContinuousIntegrationJob.swift
@@ -41,12 +41,12 @@
     case miscellaneous
     case deployment
 
-    internal static let currentSwiftVersion = Version(5, 7, 0)
+    internal static let currentSwiftVersion = Version(5, 8, 0)
 
-    private static let currentMacOSVersion = Version(12)
-    internal static let currentXcodeVersion = Version(14, 0)
+    private static let currentMacOSVersion = Version(13)
+    internal static let currentXcodeVersion = Version(14, 3)
     private static let currentVisualStudioVersion = "2019"
-    private static let currentCartonVersion = Version(0, 18, 0)
+    private static let currentCartonVersion = Version(0, 19, 1)
     private static let currentUbuntuName = "focal"  // Used by Docker image
     private static let currentUbuntuVersion = "20.04"  // Used by GitHub host
     private static let currentAnroidNDKVersion = "25b"
@@ -811,7 +811,7 @@
             localization: interfaceLocalization,
             commands: [
               cURL(
-                "https://github.com/buttaface/swift\u{2D}android\u{2D}sdk/releases/download/\(version)/swift\u{2D}\(version)\u{2D}android\u{2D}x86_64\u{2D}24\u{2D}sdk.tar.xz",
+                "https://github.com/buttaface/swift\u{2D}android\u{2D}sdk/releases/download/\(version)/swift\u{2D}\(version)\u{2D}android\u{2D}24\u{2D}sdk.tar.xz",
                 andUntarTo:
                   "/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk",
                 sudoCopy: true
@@ -907,6 +907,7 @@
               "  \u{2D}\u{2D}sdk ${ANDROID_HOME}/ndk\u{2D}bundle/toolchains/llvm/prebuilt/linux\u{2D}x86_64/sysroot \u{5C}",
               "  \u{2D}Xswiftc \u{2D}resource\u{2D}dir \u{2D}Xswiftc /Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift \u{5C}",
               "  \u{2D}Xswiftc \u{2D}tools\u{2D}directory \u{2D}Xswiftc ${ANDROID_HOME}/ndk\u{2D}bundle/toolchains/llvm/prebuilt/linux\u{2D}x86_64/bin \u{5C}",
+              "  \u{2D}Xswiftc \u{2D}L \u{2D}Xswiftc /Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/x86_64\u{2D}linux\u{2D}android \u{5C}",
               "  \u{2D}Xcc \u{2D}fPIC \u{5C}",
               "  \u{2D}Xcc \u{2D}lstdc++",
             ]
@@ -921,12 +922,7 @@
             commands: [
               copyFiles(
                 from:
-                  "/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/*.so",
-                to: productsDirectory
-              ),
-              copyFiles(
-                from:
-                  "/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/*.so",
+                  "/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/x86_64\u{2D}linux\u{2D}android/*.so",
                 to: productsDirectory
               ),
             ]

diff --git a/Sources/WorkspaceImplementation/Tasks/Resources/PackageRepository.Target.swift b/Sources/WorkspaceImplementation/Tasks/Resources/PackageRepository.Target.swift
@@ -267,7 +267,11 @@
       ) -> [StrictString: Any] {
         var tree: [StrictString: Any] = [:]
         for resource in resources {
-          add(components: resource.namespace[...], to: &tree, for: resource)
+          add(
+            components: resource.namespace[...],  // @exempt(from: tests)
+            to: &tree,
+            for: resource
+          )
         }
         return tree
       }
@@ -388,7 +392,7 @@
 
         // #workaround(Swift 5.7, The compiler hangs for some platforms if long literals are used (Workspace’s own licence resources are big enough to trigger the problem). Not worth removing until SwiftFormat can handle long literals quickly.)
         let problematicLength: Int = 2 ↑ 15
-        var unprocessed: Data.SubSequence = data[...]
+        var unprocessed: Data.SubSequence = data[...]  // @exempt(from: tests)
         var sections: [Data.SubSequence] = []
         while ¬unprocessed.isEmpty {
           let prefix = unprocessed.prefix(problematicLength)

diff --git a/Sources/WorkspaceImplementation/Tasks/Testing/PackageRepository + Testing.swift b/Sources/WorkspaceImplementation/Tasks/Testing/PackageRepository + Testing.swift
@@ -72,7 +72,12 @@
                   line.line.contains(
                     "lib_InternalSwiftSyntaxParser.dylib) was built for newer macOS version".scalars
                       .literal()
-                  ))
+                  )
+                  // #workaround(Swift 5.8, Currently thrown by SwiftPM, losing its origin in a dependency.)
+                  ∨ line.line.contains(
+                    "warning: couldn\u{27}t find pc file for sqlite3".scalars.literal()
+                  )
+                  )
               }
               log.lines = LineView<String>(filtered)
 
@@ -82,14 +87,32 @@
             unreachable()
           case .tvOS, .iOS, .watchOS:  // @exempt(from: tests) Unreachable from Linux.
             buildCommand = { output in
-              let log = try self.build(
+              var log = try self.build(
                 for: job.buildPlatform,
                 reportProgress: { report in
                   if let relevant = Xcode.abbreviate(output: report) {
                     output.print(relevant)
                   }
                 }
               ).get()
+
+              let filtered = log.components(separatedBy: "\n").filter { line in
+                return
+                  ¬(
+                  // #workaround(SDGSwift 13.0.1, Toolchain’s fault and irrelevant, since tests only need to support the development environment.)
+                  line.scalars.contains(
+                    "/XCTest) was built for newer watchOS version".scalars.literal()
+                  ) ∨ line.scalars.contains(
+                    "libXCTestSwiftSupport.dylib) was built for newer watchOS version".scalars.literal()
+                  )
+                  // #workaround(Swift 5.8, Currently thrown by SwiftPM, losing its origin in a dependency.)
+                  ∨ line.scalars.contains(
+                    "warning: couldn\u{27}t find pc file for sqlite3".scalars.literal()
+                  )
+                  )
+              }
+              log = filtered.joined(separator: "\n")
+
               return ¬Xcode.warningsOccurred(during: log)
             }
           }
@@ -358,6 +381,7 @@
           }
         }
         let exemptPaths = try configuration(output: output).testing.exemptPaths.map({
+          // @exempt(from: tests) False positive with Swift 5.8.
           location.appendingPathComponent($0).resolvingSymlinksInPath()
         })
 
@@ -374,6 +398,7 @@
             continue files
           }
           for path in exemptPaths where resolved.is(in: path) {
+            // @exempt(from: tests) False positive with Swift 5.8.
             continue files
           }
 

diff --git a/Tests/Mock Projects/After/AllTasks/.github/workflows/Amazon Linux.yaml b/Tests/Mock Projects/After/AllTasks/.github/workflows/Amazon Linux.yaml
@@ -14,7 +14,7 @@ jobs:
   Amazon_Linux:
     name: Amazon Linux
     runs-on: ubuntu-20.04
-    container: swift:5.7.0-amazonlinux2
+    container: swift:5.8.0-amazonlinux2
     steps:
     - name: Check out
       uses: actions/checkout@v2