Skip to content

Switch up compiler directives for concurrency #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 22, 2021
Merged

Switch up compiler directives for concurrency #111

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
600b981
Switch up compiler directives for concurrency
joshuawright11 Sep 21, 2021
8ca5257
Also check for Swift 5.5
joshuawright11 Sep 21, 2021
73fe501
Kill import
joshuawright11 Sep 22, 2021
0bb93f5
Break up conditional
joshuawright11 Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Sources/Lifecycle/Lifecycle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

#if compiler(>=5.5)
#if compiler(>=5.5) && canImport(_Concurrency)
import _Concurrency
#endif

Expand Down Expand Up @@ -99,7 +99,7 @@ public struct LifecycleHandler {
}
}

#if compiler(>=5.5)
#if compiler(>=5.5) && canImport(_Concurrency)
@available(macOS 12.0, *)
extension LifecycleHandler {
public init(_ handler: @escaping () async throws -> Void) {
Expand Down Expand Up @@ -163,7 +163,7 @@ public struct LifecycleStartHandler<State> {
}
}

#if compiler(>=5.5)
#if compiler(>=5.5) && canImport(_Concurrency)
@available(macOS 12.0, *)
extension LifecycleStartHandler {
public init(_ handler: @escaping () async throws -> State) {
Expand Down Expand Up @@ -225,7 +225,7 @@ public struct LifecycleShutdownHandler<State> {
}
}

#if compiler(>=5.5)
#if compiler(>=5.5) && canImport(_Concurrency)
@available(macOS 12.0, *)
extension LifecycleShutdownHandler {
public init(_ handler: @escaping (State) async throws -> Void) {
Expand Down
10 changes: 5 additions & 5 deletions Tests/LifecycleTests/ComponentLifecycleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1401,7 +1401,7 @@ final class ComponentLifecycleTests: XCTestCase {
func testAsyncAwait() throws {
#if compiler(<5.2)
return
#elseif compiler(<5.5)
#elseif compiler(<5.5) || !canImport(_Concurrency)
throw XCTSkip()
#else
guard #available(macOS 12.0, *) else {
Expand Down Expand Up @@ -1435,7 +1435,7 @@ final class ComponentLifecycleTests: XCTestCase {
func testAsyncAwaitStateful() throws {
#if compiler(<5.2)
return
#elseif compiler(<5.5)
#elseif compiler(<5.5) || !canImport(_Concurrency)
throw XCTSkip()
#else
guard #available(macOS 12.0, *) else {
Expand Down Expand Up @@ -1473,7 +1473,7 @@ final class ComponentLifecycleTests: XCTestCase {
func testAsyncAwaitErrorOnStart() throws {
#if compiler(<5.2)
return
#elseif compiler(<5.5)
#elseif compiler(<5.5) || !canImport(_Concurrency)
throw XCTSkip()
#else
guard #available(macOS 12.0, *) else {
Expand Down Expand Up @@ -1509,7 +1509,7 @@ final class ComponentLifecycleTests: XCTestCase {
func testAsyncAwaitErrorOnStartShutdownRequested() throws {
#if compiler(<5.2)
return
#elseif compiler(<5.5)
#elseif compiler(<5.5) || !canImport(_Concurrency)
throw XCTSkip()
#else
guard #available(macOS 12.0, *) else {
Expand Down Expand Up @@ -1545,7 +1545,7 @@ final class ComponentLifecycleTests: XCTestCase {
func testAsyncAwaitErrorOnShutdown() throws {
#if compiler(<5.2)
return
#elseif compiler(<5.5)
#elseif compiler(<5.5) || !canImport(_Concurrency)
throw XCTSkip()
#else
guard #available(macOS 12.0, *) else {
Expand Down