Swift 6.0+

swhitty · swhitty · commit 242ff37e5099 · 2025-08-30T12:27:47.000+10:00
diff --git a/.github/workflows/build.yml b/.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
diff --git a/CommandLine/CommandLine.swift b/CommandLine/CommandLine.swift
@@ -31,6 +31,7 @@
 
 import Foundation
 import SwiftDraw
+import SwiftDrawDOM
 
 extension SwiftDraw.CommandLine {
     
diff --git a/DOM/Sources/TextOutputStream+StandardError.swift b/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, *) {
diff --git a/DOM/Tests/ValueParserTests.swift b/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")
diff --git a/Package.swift b/Package.swift
@@ -58,6 +58,7 @@ extension Array where Element == SwiftSetting {
     static var upcomingFeatures: [SwiftSetting] {
         [
             .enableUpcomingFeature("ExistentialAny"),
+            .enableUpcomingFeature("MemberImportVisibility"),
             .swiftLanguageMode(.v6)
         ]
     }
diff --git a/Package@swift-5.10.swift b/Package@swift-5.10.swift
diff --git a/SwiftDraw.podspec.json b/SwiftDraw.podspec.json
@@ -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"
   },
diff --git a/SwiftDraw/Sources/LayerTree/LayerTree.Builder.Text.swift b/SwiftDraw/Sources/LayerTree/LayerTree.Builder.Text.swift
@@ -31,6 +31,7 @@
 
 // Convert a DOM.SVG into a layer tree
 
+import SwiftDrawDOM
 import Foundation
 #if canImport(CoreText)
 import CoreText
diff --git a/SwiftDraw/Sources/LayerTree/LayerTree.CommandGenerator.swift b/SwiftDraw/Sources/LayerTree/LayerTree.CommandGenerator.swift
@@ -29,6 +29,7 @@
 //  3. This notice may not be removed or altered from any source distribution.
 //
 import Foundation
+import SwiftDrawDOM
 
 // Convert a LayerTree into RenderCommands
 
diff --git a/SwiftDraw/Sources/Renderer/Renderer.CGText.swift b/SwiftDraw/Sources/Renderer/Renderer.CGText.swift
@@ -28,6 +28,7 @@
 //
 //  3. This notice may not be removed or altered from any source distribution.
 //
+import SwiftDrawDOM
 import Foundation
 
 struct CGTextTypes: RendererTypes {
diff --git a/SwiftDraw/Sources/Renderer/Renderer.CoreGraphics.swift b/SwiftDraw/Sources/Renderer/Renderer.CoreGraphics.swift
@@ -38,6 +38,8 @@ import UIKit
 import AppKit
 #endif
 
+import SwiftDrawDOM
+
 struct CGTypes: RendererTypes, Sendable {
     typealias Float = CGFloat
     typealias Point = CGPoint
@@ -70,20 +72,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 {
diff --git a/SwiftDraw/Sources/SVG/SVG+Hashable.swift b/SwiftDraw/Sources/SVG/SVG+Hashable.swift
diff --git a/SwiftDraw/Sources/SVG/SVG.swift b/SwiftDraw/Sources/SVG/SVG.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)
diff --git a/SwiftDraw/Sources/UIImage+SVG.swift b/SwiftDraw/Sources/UIImage+SVG.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
 }
diff --git a/SwiftDraw/Tests/LayerTree/LayerTree.LayerTests.swift b/SwiftDraw/Tests/LayerTree/LayerTree.LayerTests.swift
@@ -31,6 +31,7 @@
 
 import XCTest
 @testable import SwiftDraw
+import SwiftDrawDOM
 
 final class LayerTreeLayerTests: XCTestCase {
 
diff --git a/SwiftDraw/Tests/Renderer/Renderer.CoreGraphicsTypesTests.swift b/SwiftDraw/Tests/Renderer/Renderer.CoreGraphicsTypesTests.swift
@@ -30,6 +30,7 @@ import XCTest
 #if canImport(CoreGraphics)
 import CoreGraphics
 @testable import SwiftDraw
+import SwiftDrawDOM
 
 final class RendererCoreGraphicsTypesTests: XCTestCase {
   
diff --git a/SwiftDraw/Tests/Renderer/Renderer.LayerTreeProviderTests.swift b/SwiftDraw/Tests/Renderer/Renderer.LayerTreeProviderTests.swift
diff --git a/SwiftDraw/Tests/Renderer/RendererTests.swift b/SwiftDraw/Tests/Renderer/RendererTests.swift
diff --git a/SwiftDrawDOM.podspec.json b/SwiftDrawDOM.podspec.json

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ final class ValueParserTests: XCTestCase {`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`func testUrl() {`
`129`		`-#if compiler(>=5.9) && canImport(Darwin)`
	`129`	`+#if canImport(Darwin)`
`130`	`130`	`XCTAssertEqual(try parser.parseUrl("#testing🐟").fragmentID, "testing🐟")`
`131`	`131`	`#else`
`132`	`132`	`XCTAssertEqual(try parser.parseUrl("#testing").fragmentID, "testing")`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ extension Array where Element == SwiftSetting {`
`58`	`58`	`static var upcomingFeatures: [SwiftSetting] {`
`59`	`59`	`[`
`60`	`60`	`.enableUpcomingFeature("ExistentialAny"),`
	`61`	`+ .enableUpcomingFeature("MemberImportVisibility"),`
`61`	`62`	`.swiftLanguageMode(.v6)`
`62`	`63`	`]`
`63`	`64`	`}`