Swift 6.0+

Author: swhitty

.github/workflows/build.yml

@@ -41,7 +41,7 @@ jobs:
       - name: Test
         run: swift test --skip-build
 
-  xcode_16_2:
+  xcode_16_3:
     runs-on: macos-15
     env:
       DEVELOPER_DIR: /Applications/Xcode_16.2.app/Contents/Developer
@@ -55,32 +55,6 @@ jobs:
       - name: Test
         run: swift test --skip-build
 
-  xcode_15_4:
-    runs-on: macos-14
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Version
-        run: swift --version
-      - name: Build
-        run: swift build --build-tests
-      - name: Test
-        run: swift test --skip-build
-
-  linux_5_10:
-    runs-on: ubuntu-latest
-    container: swift:5.10
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Version
-        run: swift --version
-      - name: Build
-        run: swift build --build-tests
-      - name: Test
-        run: swift test --skip-build
 
   linux_6:
     runs-on: ubuntu-latest

DOM/Sources/TextOutputStream+StandardError.swift

@@ -44,12 +44,8 @@ package extension TextOutputStream where Self == StandardErrorStream {
 
 package struct StandardErrorStream: TextOutputStream {
 
-#if compiler(<6.0)
-    fileprivate static var shared = StandardErrorStream()
-#else
     nonisolated(unsafe)
     fileprivate static var shared = StandardErrorStream()
-#endif
 
     package func write(_ string: String) {
         if #available(macOS 10.15.4, iOS 13.4, tvOS 13.4, watchOS 6.2, *) {

DOM/Tests/ValueParserTests.swift

@@ -126,7 +126,7 @@ final class ValueParserTests: XCTestCase {
   }
 
   func testUrl() {
-#if compiler(>=5.9) && canImport(Darwin)
+#if canImport(Darwin)
     XCTAssertEqual(try parser.parseUrl("#testing🐟").fragmentID, "testing🐟")
 #else
       XCTAssertEqual(try parser.parseUrl("#testing").fragmentID, "testing")

Package.swift

@@ -57,6 +57,7 @@ extension Array where Element == SwiftSetting {
 
     static var upcomingFeatures: [SwiftSetting] {
         [
+            .enableUpcomingFeature("ExistentialAny"),
             .enableUpcomingFeature("ExistentialAny"),
             .swiftLanguageMode(.v6)
         ]

[email protected]

@@ -40,7 +40,7 @@
     "exclude_files": "SwiftDraw/Sources/NSImage+Image.swift",
     "frameworks": ["UIKit", "Foundation"]
   },
-  "swift_version": "5.10",
+  "swift_version": "6.0",
   "pod_target_xcconfig": {
     "OTHER_SWIFT_FLAGS": "-package-name SwiftDraw"
   },

SwiftDraw.podspec.json

@@ -70,20 +70,6 @@ struct CGTransformingPattern: Hashable {
         let renderer = CGRenderer(context: ctx)
         renderer.perform(contents)
     }
-
-#if compiler(<6.0)
-    func hash(into hasher: inout Hasher) {
-        bounds.origin.x.hash(into: &hasher)
-        bounds.origin.y.hash(into: &hasher)
-        bounds.size.width.hash(into: &hasher)
-        bounds.size.height.hash(into: &hasher)
-        contents.hash(into: &hasher)
-    }
-
-    static func == (lhs: CGTransformingPattern, rhs: CGTransformingPattern) -> Bool {
-        lhs.bounds == rhs.bounds && lhs.contents == rhs.contents
-    }
-#endif
 }
 
 struct CGProvider: RendererTypeProvider {

SwiftDraw/Sources/Renderer/Renderer.CoreGraphics.swift

@@ -33,7 +33,7 @@ import SwiftDrawDOM
 import Foundation
 
 #if compiler(<6.0)
-#warning("SwiftDraw will soon remove support for Swift 5.10")
+#warning("SwiftDraw will soon remove support for Swift 6.0")
 #endif
 
 #if canImport(CoreGraphics)

SwiftDraw/Sources/SVG/SVG+Hashable.swift

@@ -146,17 +146,11 @@ extension SVG {
 
 private extension MainActor {
 
-#if compiler(<6.0)
-    nonisolated static func syncIsolated<T>(operation: () -> T) -> T {
-        operation()
-    }
-#else
     static func syncIsolated<T: Sendable>(operation: @MainActor () -> T) -> T {
         if Thread.isMainThread {
             return MainActor.assumeIsolated { operation() }
         } else {
             return DispatchQueue.main.sync { operation() }
         }
     }
-#endif
 }