From b1c93c8718203be16a600a942116e84aa22b2277 Mon Sep 17 00:00:00 2001 From: nfreeman Date: Mon, 22 Jun 2026 14:26:36 +0300 Subject: [PATCH 1/2] Project.swift: upgrade deployment target from iOS 13 to 15. --- Nimble.xcodeproj/project.pbxproj | 8 ++++---- Project.swift | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Nimble.xcodeproj/project.pbxproj b/Nimble.xcodeproj/project.pbxproj index 875353b23..be20cb29b 100644 --- a/Nimble.xcodeproj/project.pbxproj +++ b/Nimble.xcodeproj/project.pbxproj @@ -1023,7 +1023,7 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = Sources/Nimble/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 12.0; PRODUCT_BUNDLE_IDENTIFIER = net.jeffhui.Nimble; @@ -1046,7 +1046,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1 $(inherited)"; INFOPLIST_FILE = Tests/NimbleTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 12.0; METAL_ENABLE_DEBUG_INFO = YES; @@ -1077,7 +1077,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1 $(inherited)"; INFOPLIST_FILE = Tests/NimbleTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 12.0; METAL_ENABLE_DEBUG_INFO = YES; @@ -1105,7 +1105,7 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = Sources/Nimble/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 12.0; PRODUCT_BUNDLE_IDENTIFIER = net.jeffhui.Nimble; diff --git a/Project.swift b/Project.swift index 74c9a1a9e..a792d892c 100644 --- a/Project.swift +++ b/Project.swift @@ -2,7 +2,7 @@ import ProjectDescription let bundleIDPrefix = "net.jeffhui" let destinations: Destinations = .iOS.union(Destinations.macOS) -let deploymentTargets: DeploymentTargets = .multiplatform(iOS: "13.0", macOS: "12.0") +let deploymentTargets: DeploymentTargets = .multiplatform(iOS: "15.0", macOS: "12.0") let target: Target = .target( name: "Nimble", From 5077ff751476289074d51e8ce7773a89605de2c1 Mon Sep 17 00:00:00 2001 From: nfreeman Date: Sun, 28 Jun 2026 09:47:22 +0300 Subject: [PATCH 2/2] temporarily disable conformances --- Sources/Nimble/Matchers/BeLogical.swift | 60 +++++++++---------- Sources/Nimble/Utils/AsyncTimerSequence.swift | 2 +- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Sources/Nimble/Matchers/BeLogical.swift b/Sources/Nimble/Matchers/BeLogical.swift index ea04915e1..ff249dc09 100644 --- a/Sources/Nimble/Matchers/BeLogical.swift +++ b/Sources/Nimble/Matchers/BeLogical.swift @@ -41,36 +41,36 @@ extension Int64: Swift.ExpressibleByBooleanLiteral { self = NSNumber(value: value).int64Value } } - -extension UInt64: ExpressibleByBooleanLiteral { - public init(booleanLiteral value: Bool) { - self = NSNumber(value: value).uint64Value - } -} - -extension Float: ExpressibleByBooleanLiteral { - public init(booleanLiteral value: Bool) { - self = NSNumber(value: value).floatValue - } -} - -extension Double: ExpressibleByBooleanLiteral { - public init(booleanLiteral value: Bool) { - self = NSNumber(value: value).doubleValue - } -} - -extension Int: ExpressibleByBooleanLiteral { - public init(booleanLiteral value: Bool) { - self = NSNumber(value: value).intValue - } -} - -extension UInt: ExpressibleByBooleanLiteral { - public init(booleanLiteral value: Bool) { - self = NSNumber(value: value).uintValue - } -} +// +//extension UInt64: ExpressibleByBooleanLiteral { +// public init(booleanLiteral value: Bool) { +// self = NSNumber(value: value).uint64Value +// } +//} +// +//extension Float: ExpressibleByBooleanLiteral { +// public init(booleanLiteral value: Bool) { +// self = NSNumber(value: value).floatValue +// } +//} +// +//extension Double: ExpressibleByBooleanLiteral { +// public init(booleanLiteral value: Bool) { +// self = NSNumber(value: value).doubleValue +// } +//} +// +//extension Int: ExpressibleByBooleanLiteral { +// public init(booleanLiteral value: Bool) { +// self = NSNumber(value: value).intValue +// } +//} +// +//extension UInt: ExpressibleByBooleanLiteral { +// public init(booleanLiteral value: Bool) { +// self = NSNumber(value: value).uintValue +// } +//} internal func rename(_ matcher: Matcher, failureMessage message: ExpectationMessage) -> Matcher { return Matcher { actualExpression in diff --git a/Sources/Nimble/Utils/AsyncTimerSequence.swift b/Sources/Nimble/Utils/AsyncTimerSequence.swift index 83c2485f9..74036f893 100644 --- a/Sources/Nimble/Utils/AsyncTimerSequence.swift +++ b/Sources/Nimble/Utils/AsyncTimerSequence.swift @@ -47,7 +47,7 @@ internal struct DateClock: NimbleClockProtocol { // Date is Sendable as of at least iOS 16. // But as of Swift 5.9, it's still not Sendable in the open source version. -extension Date: @unchecked Sendable {} +//extension Date: @unchecked Sendable {} extension Date: NimbleInstantProtocol { typealias Interval = NimbleTimeInterval