Merge pull request #99 from swhitty/swift-6

Swift 6+

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

CommandLine/CommandLine.swift

@@ -31,6 +31,7 @@
 
 import Foundation
 import SwiftDraw
+import SwiftDrawDOM
 
 extension SwiftDraw.CommandLine {
 

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/DOM+Extensions.swift

@@ -84,7 +84,7 @@ extension DOM {
 // Equatable just for tests
 
 extension DOM.GraphicsElement: Swift.Equatable {
-  public static func ==(lhs: DOM.GraphicsElement, rhs: DOM.GraphicsElement) -> Bool {
+  static func ==(lhs: DOM.GraphicsElement, rhs: DOM.GraphicsElement) -> Bool {
     let toString: (Any) -> String = { var text = ""; dump($0, to: &text); return text }
     return toString(lhs) == toString(rhs)
   }

DOM/Tests/Parser.XML.PathTests.swift

@@ -272,7 +272,7 @@ private func arc(_ rx: Coordinate, _ ry: Coordinate, _ rotate: Coordinate,
 
 
 extension DOM.Path.Segment: Swift.Equatable {
-  public static func ==(lhs: DOM.Path.Segment, rhs: DOM.Path.Segment) -> Bool {
+  static func ==(lhs: DOM.Path.Segment, rhs: DOM.Path.Segment) -> Bool {
     let toString: (Any) -> String = { var text = ""; dump($0, to: &text); return text }
     return toString(lhs) == toString(rhs)
   }

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")

DOM/Tests/XML.Parser.ScannerTests.swift

@@ -29,6 +29,7 @@
 //  3. This notice may not be removed or altered from any source distribution.
 //
 
+public import Foundation
 import XCTest
 @testable import SwiftDrawDOM
 
@@ -234,9 +235,10 @@ private func AssertScanPercentageFloat(_ text: String, _ expected: Float?, file:
   XCTAssertEqual(try? scanner.scanPercentageFloat(), expected, file: file, line: line)
 }
 
+extension CharacterSet: @retroactive ExpressibleByExtendedGraphemeClusterLiteral {}
+extension CharacterSet: @retroactive ExpressibleByUnicodeScalarLiteral {}
+extension CharacterSet: @retroactive ExpressibleByStringLiteral {
 
-extension Foundation.CharacterSet: Swift.ExpressibleByStringLiteral {
-  
   static let hexadecimal: Foundation.CharacterSet = "0123456789ABCDEFabcdef"
 
   public init(stringLiteral value: String) {

Package.swift

@@ -58,6 +58,8 @@ extension Array where Element == SwiftSetting {
     static var upcomingFeatures: [SwiftSetting] {
         [
             .enableUpcomingFeature("ExistentialAny"),
+            .enableUpcomingFeature("InternalImportsByDefault"),
+            .enableUpcomingFeature("MemberImportVisibility"),
             .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"
   },