Package updates

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: RISCfuture

.github/workflows/ci.yml

@@ -13,41 +13,33 @@ concurrency:
 jobs:
   tests:
     name: Build
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-14, macos-latest]
-        swift: ["6.0"]
+    runs-on: macos-26
     steps:
       - uses: actions/checkout@v6
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: "26.3"
       - uses: SwiftyLab/setup-swift@latest
         with:
-          swift-version: ${{ matrix.swift }}
+          swift-version: "6.2"
       - name: Build
         run: swift build -v
   lint:
-    name: Run Swiftlint
+    name: Run SwiftLint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
       - uses: norio-nomura/action-swiftlint@3.2.1
   swift-format:
     name: Run swift-format
     runs-on: ubuntu-latest
+    container:
+      image: swift:latest
     steps:
       - uses: actions/checkout@v6
-      - uses: SwiftyLab/setup-swift@latest
-        with:
-          swift-version: "6.0"
-      - name: Download .swift-format
-        run: |
-          curl -o .swift-format https://gist.githubusercontent.com/RISCfuture/e0c21afb7bd80a88d128a42bf40d2ecd/raw/7c4af5558f34e9deefc70701f7f7e289d0934187/.swift-format
-      - name: Install swift-format
+      - name: Download .swift-format config
         run: |
-          git clone https://github.com/apple/swift-format.git
-          cd swift-format
-          swift build -c release
-          sudo cp .build/release/swift-format /usr/local/bin/
+          apt-get update && apt-get install -y wget
+          wget -O .swift-format https://gist.githubusercontent.com/RISCfuture/e0c21afb7bd80a88d128a42bf40d2ecd/raw/.swift-format
       - name: Run swift-format lint
-        run: swift-format lint -r .
+        run: swift format lint -r .

.gitignore

@@ -7,3 +7,7 @@ DerivedData/
 .netrc
 .swiftlint
 .swift-format
+
+
+# SwiftLint Remote Config Cache
+.swiftlint/RemoteConfigCache

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

Package.swift

@@ -45,7 +45,7 @@ struct GameGenerator: AsyncParsableCommand {
     let words = Words()
     try await words.load(from: dictionary)
 
-    if let output = output { FileManager.default.createFile(atPath: output.path(), contents: nil) }
+    if let output { FileManager.default.createFile(atPath: output.path(), contents: nil) }
     let outputStream =
       output == nil ? FileHandle.standardOutput : try FileHandle(forWritingTo: output!)
     let signalSource = DispatchSource.makeSignalSource(signal: SIGINT, queue: .main)
@@ -55,7 +55,7 @@ struct GameGenerator: AsyncParsableCommand {
       try? outputStream.synchronize()
       try? outputStream.write(contentsOf: "]".data(using: .ascii)!)
       try? outputStream.close()
-      GameGenerator.exit()
+      Self.exit()
     }
     signalSource.resume()
 

Sources/GameGenerator.swift

@@ -50,17 +50,14 @@ actor GameFinder {
   }
 
   private static var tileSizes: [Int: [Int]] {
-    validWordLengths.reduce([:]) { dict, wordLength in
-      var dict = dict
+    validWordLengths.reduce(into: [:]) { dict, wordLength in
       dict[wordLength] = Array(repeating: minCharactersPerTile, count: numTilesPerFourtile)
       while dict[wordLength]!.reduce(0, +) < wordLength {
         guard let index = dict[wordLength]!.firstIndex(where: { $0 < maxCharactersPerTile }) else {
           fatalError("Couldn’t generate tileSizes")
         }
         dict[wordLength]![index] += 1
       }
-
-      return dict
     }
   }