Improve object diffing tools (#111)

* wip * wip * wip * wip * wip * wip * wip * wip * fix * Swift 5.7 fix * wip * wip * wip * wip * wip * wip * wip * wip * wip
pointfreeco · Mar 12, 2024 · f01efb2 · f01efb2
1 parent 3e905e7
commit f01efb2
Show file tree

Hide file tree

Showing 10 changed files with 694 additions and 1,209 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,42 +14,35 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  macos-13:
-    name: macOS 13 (Xcode ${{ matrix.xcode }})
+  macos-14:
+    name: macOS 14 (Xcode ${{ matrix.xcode }})
     runs-on: macOS-13
     strategy:
       matrix:
         xcode:
-          - '14.3.1'
+          - '15.2'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Select Xcode ${{ matrix.xcode }}
         run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
       - name: Print Swift version
         run: swift --version
-      - name: Run tests (Swift)
-        run: make test-swift
       - name: Run tests (platforms)
         run: make test-platforms
 
-  macos-12:
-    name: macOS 12 (Xcode ${{ matrix.xcode }})
-    runs-on: macOS-12
+  macos-13:
+    name: macOS 13 (Xcode ${{ matrix.xcode }})
+    runs-on: macOS-13
     strategy:
       matrix:
         xcode:
-          - '13.3.1'
-          - '13.4.1'
-          - '14.0.1'
-          - '14.1'
+          - '14.3.1'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Select Xcode ${{ matrix.xcode }}
         run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
       - name: Print Swift version
         run: swift --version
-      - name: Run tests (Swift)
-        run: make test-swift
       - name: Run tests (platforms)
         run: make test-platforms
 
@@ -59,20 +52,17 @@ jobs:
     strategy:
       matrix:
         swift:
-          - 5.5
-          - 5.6
-          - 5.7
-          - 5.8
+          - '5.10'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run tests
         run: make test-linux SWIFT_VERSION=${{ matrix.swift }}
 
   wasm:
     name: SwiftWasm
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: bytecodealliance/actions/wasmtime/setup@v1
       - uses: swiftwasm/setup-swiftwasm@v1
         with:
@@ -92,15 +82,10 @@ jobs:
     steps:
       - uses: compnerd/gha-setup-swift@main
         with:
-          branch: swift-5.8.1-release
-          tag: 5.8.1-RELEASE
-      - uses: actions/checkout@v3
+          branch: swift-5.10-release
+          tag: 5.10-RELEASE
+      - uses: actions/checkout@v4
       - name: Build All Configurations
         run: swift build -c ${{ matrix.config }}
       - name: Run tests (debug only)
-        # There is an issue that exists in the 5.8.1 toolchain
-        # which fails on release configuration testing, but
-        # this issue is fixed 5.9 so we can remove the if once
-        # that is generally available.
-        if: ${{ matrix.config == 'debug' }}
         run: swift test
diff --git a/Makefile b/Makefile
@@ -2,10 +2,7 @@ PLATFORM_IOS = iOS Simulator,name=iPhone 11 Pro Max
 PLATFORM_MACOS = macOS
 PLATFORM_MAC_CATALYST = macOS,variant=Mac Catalyst
 PLATFORM_TVOS = tvOS Simulator,name=Apple TV
-SWIFT_VERSION = 5.5
-ifeq ($(SWIFT_VERSION),5.3)
-SWIFT_BUILD_ARGS = --enable-test-discovery
-endif
+SWIFT_VERSION = 5.7
 SWIFT_TEST_ARGS = --parallel
 
 test-all: test-linux test-swift test-platforms
@@ -19,8 +16,8 @@ test-linux:
 		bash -c 'apt-get update && apt-get -y install make && make test-swift SWIFT_VERSION=$(SWIFT_VERSION)'
 
 test-swift:
-	swift test $(SWIFT_BUILD_ARGS) $(SWIFT_TEST_ARGS)
-	swift test --configuration release $(SWIFT_BUILD_ARGS) $(SWIFT_TEST_ARGS)
+	swift test $(SWIFT_TEST_ARGS)
+	swift test --configuration release $(SWIFT_TEST_ARGS)
 
 test-platforms:
 	xcodebuild test \

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.7
 
 import PackageDescription
 

diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift