update to Swift 6 / AoCTools 0.1.x

gereons · Oct 4, 2024 · 2872a46 · 2872a46
1 parent ab6c3e3
commit 2872a46
Show file tree

Hide file tree

Showing 31 changed files with 69 additions and 14 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -1,23 +1,51 @@
 {
+  "originHash" : "491a32c3af53ada53c6e874e2a142c02f10d9d27fc923e31fb6e1fee3b5726b8",
   "pins" : [
     {
       "identity" : "aoctools",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/gereons/AoCTools",
       "state" : {
-        "revision" : "19b8a7f6845c9fc89d26c52f09a14f1d7f46b81a",
-        "version" : "0.0.45"
+        "revision" : "d7971984089e4724cee928895176db6e81939491",
+        "version" : "0.1.0"
+      }
+    },
+    {
+      "identity" : "swift-algorithms",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-algorithms",
+      "state" : {
+        "revision" : "f6919dfc309e7f1b56224378b11e28bab5bccc42",
+        "version" : "1.2.0"
+      }
+    },
+    {
+      "identity" : "swift-collections",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-collections",
+      "state" : {
+        "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7",
+        "version" : "1.1.4"
+      }
+    },
+    {
+      "identity" : "swift-numerics",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-numerics.git",
+      "state" : {
+        "revision" : "0a5bc04095a675662cf24757cc0640aa2204253b",
+        "version" : "1.0.2"
       }
     },
     {
       "identity" : "swiftlintplugin",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/lukepistrol/SwiftLintPlugin",
       "state" : {
-        "revision" : "ea6d3ca895b49910f790e98e4b4ca658e0fe490e",
-        "version" : "0.54.0"
+        "revision" : "bea71d23db993c58934ee704f798a66d7b8cb626",
+        "version" : "0.57.0"
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }
diff --git a/Package.swift b/Package.swift
@@ -1,12 +1,12 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 
 import PackageDescription
 
 let package = Package(
     name: "AdventOfCode",
-    platforms: [ .macOS(.v14) ],
+    platforms: [ .macOS(.v15) ],
     dependencies: [
-        .package(url: "https://github.com/gereons/AoCTools", from: "0.0.45"),
+        .package(url: "https://github.com/gereons/AoCTools", from: "0.1.0"),
         // .package(path: "../AoCTools"),
     ],
     targets: [

diff --git a/Sources/AoC.swift b/Sources/AoC.swift
@@ -6,6 +6,7 @@ import AoCTools
 import Foundation
 
 @main
+@MainActor
 struct AdventOfCode {
     // assign to eg `.day(1)`, leave as nil to run the puzzle for the current calendar day
     static var defaultDay: Day? // = .day(1)

diff --git a/Sources/Day05/Day05.swift b/Sources/Day05/Day05.swift
@@ -5,6 +5,7 @@
 //
 
 import AoCTools
+import Algorithms
 
 private struct Almanac {
     let seeds: [Int]
@@ -78,8 +79,8 @@ final class Day05: AOCDay {
 
     func part2() -> Int {
         var ranges = almanac.seeds
-            .chunked(2)
-            .compactMap { Range(from: $0[0], to: $0[0] + $0[1] - 1) }
+            .chunks(ofCount: 2)
+            .map { Range(from: $0.first!, to: $0.first! + $0.last! - 1) }
 
         for map in almanac.maps {
             var newRanges = [Range]()
@@ -115,8 +116,8 @@ final class Day05: AOCDay {
 
     func part2_bruteForce() -> Int {
         let seedRanges = almanac.seeds
-            .chunked(2)
-            .map { $0[0] ..< $0[0]+$0[1] }
+            .chunks(ofCount: 2)
+            .map { $0.first! ..< $0.first! + $0.last! }
 
         var minLocation = Int.max
         for range in seedRanges {

diff --git a/Sources/Day11/Day11.swift b/Sources/Day11/Day11.swift
@@ -33,7 +33,7 @@ final class Day11: AOCDay {
         let galaxies = expand(galaxies, growth: growth)
 
         return galaxies
-            .combinations(of: 2)
+            .combinations(ofCount: 2)
             .map { pair in
                 pair[0].distance(to: pair[1])
             }

diff --git a/Sources/Day24/Day24.swift b/Sources/Day24/Day24.swift
@@ -39,7 +39,7 @@ final class Day24: AOCDay {
     func part1() -> Int {
         // https://en.wikipedia.org/wiki/Line%E2%80%93line_intersection
         var total = 0
-        for pair in stones.combinations(of: 2) {
+        for pair in stones.combinations(ofCount: 2) {
             let s1 = pair[0]
             let s2 = pair[1]
             let (slope1, intercept1) = slopeIntercept(for: s1)

diff --git a/Tests/Day01Tests.swift b/Tests/Day01Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day01Tests: XCTestCase {
     let testInput = """
 1abc2

diff --git a/Tests/Day02Tests.swift b/Tests/Day02Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day02Tests: XCTestCase {
     let testInput = """
 Game 1: 3 blue, 4 red; 1 red, 2 green, 6 blue; 2 green

diff --git a/Tests/Day03Tests.swift b/Tests/Day03Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day03Tests: XCTestCase {
     let testInput = """
 467..114..

diff --git a/Tests/Day04Tests.swift b/Tests/Day04Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day04Tests: XCTestCase {
     let testInput = """
 Card 1: 41 48 83 86 17 | 83 86  6 31 17  9 48 53

diff --git a/Tests/Day05Tests.swift b/Tests/Day05Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day05Tests: XCTestCase {
     let testInput = """
 seeds: 79 14 55 13

diff --git a/Tests/Day06Tests.swift b/Tests/Day06Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day06Tests: XCTestCase {
     let testInput = """
 Time:      7  15   30

diff --git a/Tests/Day07Tests.swift b/Tests/Day07Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day07Tests: XCTestCase {
     let testInput = """
 32T3K 765

diff --git a/Tests/Day08Tests.swift b/Tests/Day08Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day08Tests: XCTestCase {
     let testInput1a = """
 RL

diff --git a/Tests/Day09Tests.swift b/Tests/Day09Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day09Tests: XCTestCase {
     let testInput = """
 0 3 6 9 12 15

diff --git a/Tests/Day10Tests.swift b/Tests/Day10Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day10Tests: XCTestCase {
     let testInput1a = """
 -L|F7

diff --git a/Tests/Day11Tests.swift b/Tests/Day11Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day11Tests: XCTestCase {
     let testInput = """
 ...#......

diff --git a/Tests/Day12Tests.swift b/Tests/Day12Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day12Tests: XCTestCase {
     let testInput = """
 ???.### 1,1,3

diff --git a/Tests/Day13Tests.swift b/Tests/Day13Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day13Tests: XCTestCase {
     let testInput = """
 #.##..##.

diff --git a/Tests/Day14Tests.swift b/Tests/Day14Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day14Tests: XCTestCase {
     let testInput = """
 O....#....

diff --git a/Tests/Day15Tests.swift b/Tests/Day15Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day15Tests: XCTestCase {
     let testInput = """
 rn=1,cm-,qp=3,cm=2,qp-,pc=4,ot=9,ab=5,pc-,pc=6,ot=7

diff --git a/Tests/Day16Tests.swift b/Tests/Day16Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day16Tests: XCTestCase {
     let testInput = #"""
 .|...\....

diff --git a/Tests/Day17Tests.swift b/Tests/Day17Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day17Tests: XCTestCase {
     let testInput = """
 2413432311323

diff --git a/Tests/Day18Tests.swift b/Tests/Day18Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day18Tests: XCTestCase {
     let testInput = """
 R 6 (#70c710)

diff --git a/Tests/Day19Tests.swift b/Tests/Day19Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day19Tests: XCTestCase {
     let testInput = """
 px{a<2006:qkq,m>2090:A,rfg}

diff --git a/Tests/Day20Tests.swift b/Tests/Day20Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day20Tests: XCTestCase {
     let testInput1 = """
 broadcaster -> a, b, c

diff --git a/Tests/Day21Tests.swift b/Tests/Day21Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day21Tests: XCTestCase {
     let testInput = """
 ...........

diff --git a/Tests/Day22Tests.swift b/Tests/Day22Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day22Tests: XCTestCase {
     let testInput = """
 1,0,1~1,2,1

diff --git a/Tests/Day23Tests.swift b/Tests/Day23Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day23Tests: XCTestCase {
     let testInput = """
 #.#####################

diff --git a/Tests/Day24Tests.swift b/Tests/Day24Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day24Tests: XCTestCase {
     let testInput = """
 19, 13, 30 @ -2,  1, -2

diff --git a/Tests/Day25Tests.swift b/Tests/Day25Tests.swift
@@ -5,6 +5,7 @@
 import XCTest
 @testable import AdventOfCode
 
+@MainActor
 final class Day25Tests: XCTestCase {
     func testDay25_part1_solution() throws {
         let day = Day25(input: Day25.input)