From b8bc56685a0a147e1de217ace8f2afb459dbd4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20Franze=CC=81n?= Date: Sun, 7 Jul 2024 20:54:31 +0200 Subject: [PATCH] Enable StrictConcurrency and fix its emitted warnings --- Package.swift | 10 ++++++++-- .../SwiftSCAD/Environment/EnvironmentTransform.swift | 2 +- Sources/SwiftSCAD/Environment/Facets.swift | 2 +- .../SwiftSCAD/Shapes/2D/Text/Environment+Text.swift | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Package.swift b/Package.swift index feb0586..6bfd897 100644 --- a/Package.swift +++ b/Package.swift @@ -27,13 +27,19 @@ let package = Package( .product(name: "Collections", package: "swift-collections"), .product(name: "Logging", package: "swift-log"), ], - swiftSettings: [.enableUpcomingFeature("ExistentialAny")] + swiftSettings: [ + .enableUpcomingFeature("ExistentialAny"), + .enableExperimentalFeature("StrictConcurrency") + ] ), .testTarget( name: "Tests", dependencies: ["SwiftSCAD"], resources: [.copy("SCAD")], - swiftSettings: [.enableUpcomingFeature("ExistentialAny")] + swiftSettings: [ + .enableUpcomingFeature("ExistentialAny"), + .enableExperimentalFeature("StrictConcurrency") + ] ) ] ) diff --git a/Sources/SwiftSCAD/Environment/EnvironmentTransform.swift b/Sources/SwiftSCAD/Environment/EnvironmentTransform.swift index fdfc370..fe5f55b 100644 --- a/Sources/SwiftSCAD/Environment/EnvironmentTransform.swift +++ b/Sources/SwiftSCAD/Environment/EnvironmentTransform.swift @@ -1,7 +1,7 @@ import Foundation public extension Environment { - static fileprivate var environmentKey: Environment.ValueKey = .init(rawValue: "SwiftSCAD.Transform") + static fileprivate let environmentKey: Environment.ValueKey = .init(rawValue: "SwiftSCAD.Transform") /// Accesses the current affine transformation applied to this environment. /// diff --git a/Sources/SwiftSCAD/Environment/Facets.swift b/Sources/SwiftSCAD/Environment/Facets.swift index 3532268..8a7bd0f 100644 --- a/Sources/SwiftSCAD/Environment/Facets.swift +++ b/Sources/SwiftSCAD/Environment/Facets.swift @@ -35,7 +35,7 @@ public extension Environment { } } - static internal var environmentKey: Environment.ValueKey = .init(rawValue: "SwiftSCAD.Facets") + static internal let environmentKey: Environment.ValueKey = .init(rawValue: "SwiftSCAD.Facets") } /// Accesses the current facets setting from the environment. diff --git a/Sources/SwiftSCAD/Shapes/2D/Text/Environment+Text.swift b/Sources/SwiftSCAD/Shapes/2D/Text/Environment+Text.swift index c2265d4..0f18c2d 100644 --- a/Sources/SwiftSCAD/Shapes/2D/Text/Environment+Text.swift +++ b/Sources/SwiftSCAD/Shapes/2D/Text/Environment+Text.swift @@ -11,7 +11,7 @@ internal extension Environment { var characterSpacing: Double? } - static private var environmentKey: Environment.ValueKey = .init(rawValue: "SwiftSCAD.TextAttributes") + static private let environmentKey: Environment.ValueKey = .init(rawValue: "SwiftSCAD.TextAttributes") var textAttributes: TextAttributes { self[Self.environmentKey] as? TextAttributes ?? .init()