Fix compilation on Swift <5.5 on Darwin platforms

Frizlab · Frizlab · commit e536ed4ee295 · 2025-09-23T16:32:35.000+02:00
diff --git a/Sources/NSLock+withLock.swift b/Sources/NSLock+withLock.swift
@@ -1,4 +1,4 @@
-#if (!canImport(Darwin) && swift(<6.0)) || swift(<5.7)
+#if swift(<5.7) || (!canImport(Darwin) && swift(<6.0))
 import Foundation
 
 
diff --git a/Tests/JSONLoggerTests/JSONLoggerTests.swift b/Tests/JSONLoggerTests/JSONLoggerTests.swift
@@ -12,7 +12,7 @@ final class JSONLoggerTests : XCTestCase {
 	public static let defaultJSONDecoder: JSONDecoder = {
 		let res = JSONDecoder()
 		if #available(macOS 12.0, tvOS 15.0, iOS 15.0, watchOS 8.0, *) {
-#if canImport(Darwin) || compiler(>=6)
+#if (canImport(Darwin) && swift(>=5.5)) || swift(>=6)
 			res.allowsJSON5 = false
 #endif
 		}
@@ -31,7 +31,7 @@ final class JSONLoggerTests : XCTestCase {
 		}
 		res.dataDecodingStrategy = .base64
 		if #available(macOS 12.0, tvOS 15.0, iOS 15.0, watchOS 8.0, *) {
-#if canImport(Darwin) || compiler(>=6)
+#if (canImport(Darwin) && swift(>=5.5)) || swift(>=6)
 			res.assumesTopLevelDictionary = false
 #endif
 		}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if (!canImport(Darwin) && swift(<6.0)) \|\| swift(<5.7)`
	`1`	`+#if swift(<5.7) \|\| (!canImport(Darwin) && swift(<6.0))`
`2`	`2`	`import Foundation`
`3`	`3`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ final class JSONLoggerTests : XCTestCase {`
`12`	`12`	`public static let defaultJSONDecoder: JSONDecoder = {`
`13`	`13`	`let res = JSONDecoder()`
`14`	`14`	`if #available(macOS 12.0, tvOS 15.0, iOS 15.0, watchOS 8.0, *) {`
`15`		`-#if canImport(Darwin) \|\| compiler(>=6)`
	`15`	`+#if (canImport(Darwin) && swift(>=5.5)) \|\| swift(>=6)`
`16`	`16`	`res.allowsJSON5 = false`
`17`	`17`	`#endif`
`18`	`18`	`}`
`@@ -31,7 +31,7 @@ final class JSONLoggerTests : XCTestCase {`
`31`	`31`	`}`
`32`	`32`	`res.dataDecodingStrategy = .base64`
`33`	`33`	`if #available(macOS 12.0, tvOS 15.0, iOS 15.0, watchOS 8.0, *) {`
`34`		`-#if canImport(Darwin) \|\| compiler(>=6)`
	`34`	`+#if (canImport(Darwin) && swift(>=5.5)) \|\| swift(>=6)`
`35`	`35`	`res.assumesTopLevelDictionary = false`
`36`	`36`	`#endif`
`37`	`37`	`}`