Merge branch 'main' into swift-6.1

swhitty · swhitty · commit a455b2958f3d · 2025-04-13T21:14:59.000+10:00
# Conflicts:
#	SwiftDraw/UIImage+SVG.swift
diff --git a/SwiftDraw/UIImage+SVG.swift b/SwiftDraw/UIImage+SVG.swift
@@ -144,11 +144,17 @@ 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
 }

Original file line number	Diff line number	Diff line change
`@@ -144,11 +144,17 @@ extension SVG {`
`144`	`144`
`145`	`145`	`private extension MainActor {`
`146`	`146`
	`147`	`+#if compiler(<6.0)`
	`148`	`+ nonisolated static func syncIsolated<T>(operation: () -> T) -> T {`
	`149`	`+ operation()`
	`150`	`+ }`
	`151`	`+#else`
`147`	`152`	`static func syncIsolated<T: Sendable>(operation: @MainActor () -> T) -> T {`
`148`	`153`	`if Thread.isMainThread {`
`149`	`154`	`return MainActor.assumeIsolated { operation() }`
`150`	`155`	`} else {`
`151`	`156`	`return DispatchQueue.main.sync { operation() }`
`152`	`157`	`}`
`153`	`158`	`}`
	`159`	`+#endif`
`154`	`160`	`}`