@mainactor defaultScale

Author: swhitty

SwiftDraw/UIImage+SVG.swift

@@ -29,6 +29,7 @@
 //  3. This notice may not be removed or altered from any source distribution.
 //
 
+import Foundation
 #if canImport(UIKit)
 import UIKit
 #if canImport(WatchKit)
@@ -126,7 +127,7 @@ extension SVG {
 #if os(watchOS)
         WKInterfaceDevice.current().screenScale
 #else
-        UIScreen.main.scale
+        MainActor.syncIsolated { UIScreen.main.scale }
 #endif
     }
 
@@ -140,3 +141,20 @@ extension SVG {
 }
 
 #endif
+
+private extension MainActor {
+
+#if compiler(<6.0)
+    static func syncIsolated<T: Sendable>(operation: @MainActor () -> 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
+}

SwiftDrawTests/Renderer.CoreGraphicsTypesTests.swift

@@ -109,7 +109,8 @@ final class RendererCoreGraphicsTypesTests: XCTestCase {
     let segments: [CGPath.Segment] = [.move(CGPoint(0, 0)), .line(CGPoint(10, 20)), .line(CGPoint(30, 40))]
     XCTAssertEqual(path.segments(), segments)
   }
-  
+
+  @MainActor
   func testShapeRect() {
     let path = CGProvider().createPath(from: .rect(within: Rect(x: 10, y: 20, width: 30, height: 40),
                                                    radii: Size(2, 4)))