From b0587d2cab9b2f9fcc28b89130c006e886fbd44c Mon Sep 17 00:00:00 2001 From: Max Howell Date: Thu, 10 Jun 2021 11:04:04 -0400 Subject: [PATCH] wip --- Package.swift | 6 +++--- Sources/PromiseKit/Guarantee.swift | 11 ----------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Package.swift b/Package.swift index 1ef5915bb..4159af2b3 100644 --- a/Package.swift +++ b/Package.swift @@ -11,7 +11,7 @@ pkg.platforms = [ ] pkg.swiftLanguageVersions = [.v5] -#if !os(Linux) +#if !os(Linux) && !os(Windows) pkg.dependencies = [ .package(url: "https://github.com/AliSoftware/OHHTTPStubs", from: "9.1.0") ] @@ -30,7 +30,7 @@ func has(tests name: String) -> Target? { switch name { case "PMKFoundation": var deps = [Target.Dependency.target(name: "PMKFoundation")] - #if !os(Linux) + #if !os(Linux) && !os(Windows) deps.append(.product(name: "OHHTTPStubsSwift", package: "OHHTTPStubs")) #endif return .testTarget(name: "\(name)Tests", dependencies: deps, path: "Tests/\(name)") @@ -43,7 +43,7 @@ func has(tests name: String) -> Target? { for name in ["PMKCloudKit", "PMKCoreLocation", "PMKFoundation", "PMKHealthKit", "PMKHomeKit", "PMKMapKit", "PMKPhotos", "PMKStoreKit", "PromiseKit"] { - #if os(Linux) + #if os(Linux) || os(Windows) guard name == "PromiseKit" || name == "PMKFoundation" else { continue } #endif diff --git a/Sources/PromiseKit/Guarantee.swift b/Sources/PromiseKit/Guarantee.swift index 668eb0252..21901d8bb 100644 --- a/Sources/PromiseKit/Guarantee.swift +++ b/Sources/PromiseKit/Guarantee.swift @@ -380,14 +380,3 @@ public extension Dispatcher { return rg } } - -#if os(Linux) -import func CoreFoundation._CFIsMainThread - -extension Thread { - // `isMainThread` is not implemented yet in swift-corelibs-foundation. - static var isMainThread: Bool { - return _CFIsMainThread() - } -} -#endif