Address build issues occurring when building with Library Evolution s…

…upport, Xcode 16 (#133) * Address build issues in Library Evolution mode Address build issues seen building for library evolution mode, Xcode 16 - i.e. `make build-for-library-evolution`. * Update ci.yml --------- Co-authored-by: Stephen Celis <[email protected]>
pointfreeco · Sep 23, 2024 · 6cbc73b · 6cbc73b
1 parent b22b6ae
commit 6cbc73b
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 83 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Select Xcode
-      run: sudo xcode-select -s /Applications/Xcode_15.4.app
+      run: sudo xcode-select -s /Applications/Xcode_16.0.app
     - name: Run tests
       run: make build-for-library-evolution
 

diff --git a/Sources/IssueReporting/ReportIssue.swift b/Sources/IssueReporting/ReportIssue.swift
@@ -34,22 +34,7 @@ public func reportIssue(
   line: UInt = #line,
   column: UInt = #column
 ) {
-  switch TestContext.current {
-  case .swiftTesting:
-    _recordIssue(
-      message: message(),
-      fileID: "\(IssueContext.current?.fileID ?? fileID)",
-      filePath: "\(IssueContext.current?.filePath ?? filePath)",
-      line: Int(IssueContext.current?.line ?? line),
-      column: Int(IssueContext.current?.column ?? column)
-    )
-  case .xcTest:
-    _XCTFail(
-      message().withAppHostWarningIfNeeded() ?? "",
-      file: IssueContext.current?.filePath ?? filePath,
-      line: IssueContext.current?.line ?? line
-    )
-  case nil:
+  guard let context = TestContext.current else {
     guard !isTesting else { return }
     if let observer = FailureObserver.current {
       observer.withLock { $0 += 1 }
@@ -73,6 +58,25 @@ public func reportIssue(
         )
       }
     }
+    return
+  }
+
+  switch context {
+  case .swiftTesting:
+    _recordIssue(
+      message: message(),
+      fileID: "\(IssueContext.current?.fileID ?? fileID)",
+      filePath: "\(IssueContext.current?.filePath ?? filePath)",
+      line: Int(IssueContext.current?.line ?? line),
+      column: Int(IssueContext.current?.column ?? column)
+    )
+  case .xcTest:
+    _XCTFail(
+      message().withAppHostWarningIfNeeded() ?? "",
+      file: IssueContext.current?.filePath ?? filePath,
+      line: IssueContext.current?.line ?? line
+    )
+  @unknown default: break
   }
 }
 
@@ -97,23 +101,7 @@ public func reportIssue(
   line: UInt = #line,
   column: UInt = #column
 ) {
-  switch TestContext.current {
-  case .swiftTesting:
-    _recordError(
-      error: error,
-      message: message(),
-      fileID: "\(IssueContext.current?.fileID ?? fileID)",
-      filePath: "\(IssueContext.current?.filePath ?? filePath)",
-      line: Int(IssueContext.current?.line ?? line),
-      column: Int(IssueContext.current?.column ?? column)
-    )
-  case .xcTest:
-    _XCTFail(
-      "Caught error: \(error)\(message().map { ": \($0)" } ?? "")".withAppHostWarningIfNeeded(),
-      file: IssueContext.current?.filePath ?? filePath,
-      line: IssueContext.current?.line ?? line
-    )
-  case nil:
+  guard let context = TestContext.current else {
     guard !isTesting else { return }
     if let observer = FailureObserver.current {
       observer.withLock { $0 += 1 }
@@ -139,5 +127,25 @@ public func reportIssue(
         )
       }
     }
+    return
+  }
+
+  switch context {
+  case .swiftTesting:
+    _recordError(
+      error: error,
+      message: message(),
+      fileID: "\(IssueContext.current?.fileID ?? fileID)",
+      filePath: "\(IssueContext.current?.filePath ?? filePath)",
+      line: Int(IssueContext.current?.line ?? line),
+      column: Int(IssueContext.current?.column ?? column)
+    )
+  case .xcTest:
+    _XCTFail(
+      "Caught error: \(error)\(message().map { ": \($0)" } ?? "")".withAppHostWarningIfNeeded(),
+      file: IssueContext.current?.filePath ?? filePath,
+      line: IssueContext.current?.line ?? line
+    )
+  @unknown default: break
   }
 }
diff --git a/Sources/IssueReporting/WithExpectedIssue.swift b/Sources/IssueReporting/WithExpectedIssue.swift
@@ -51,31 +51,7 @@ public func withExpectedIssue(
   column: UInt = #column,
   _ body: () throws -> Void
 ) {
-  switch TestContext.current {
-  case .swiftTesting:
-    _withKnownIssue(
-      message,
-      isIntermittent: isIntermittent,
-      fileID: fileID.description,
-      filePath: filePath.description,
-      line: Int(line),
-      column: Int(column),
-      body
-    )
-  case .xcTest:
-    _XCTExpectFailure(
-      message.withAppHostWarningIfNeeded(),
-      strict: !isIntermittent,
-      file: filePath,
-      line: line
-    ) {
-      do {
-        try body()
-      } catch {
-        reportIssue(error, fileID: fileID, filePath: filePath, line: line, column: column)
-      }
-    }
-  case nil:
+  guard let context = TestContext.current else {
     guard !isTesting else { return }
     let observer = FailureObserver()
     FailureObserver.$current.withValue(observer) {
@@ -107,6 +83,33 @@ public func withExpectedIssue(
     }
     return
   }
+
+  switch context {
+  case .swiftTesting:
+    _withKnownIssue(
+      message,
+      isIntermittent: isIntermittent,
+      fileID: fileID.description,
+      filePath: filePath.description,
+      line: Int(line),
+      column: Int(column),
+      body
+    )
+  case .xcTest:
+    _XCTExpectFailure(
+      message.withAppHostWarningIfNeeded(),
+      strict: !isIntermittent,
+      file: filePath,
+      line: line
+    ) {
+      do {
+        try body()
+      } catch {
+        reportIssue(error, fileID: fileID, filePath: filePath, line: line, column: column)
+      }
+    }
+  @unknown default: break
+  }
 }
 
 /// Invoke an asynchronous function that has an issue that is expected to occur during its
@@ -137,31 +140,8 @@ public func withExpectedIssue(
   column: UInt = #column,
   _ body: () async throws -> Void
 ) async {
-  switch TestContext.current {
-  case .swiftTesting:
-    await _withKnownIssue(
-      message,
-      isIntermittent: isIntermittent,
-      fileID: fileID.description,
-      filePath: filePath.description,
-      line: Int(line),
-      column: Int(column),
-      body
-    )
-  case .xcTest:
-    reportIssue(
-      """
-      Asynchronously expecting failures is unavailable in XCTest.
 
-      Omit this test from your XCTest suite, or consider using Swift Testing, instead.
-      """,
-      fileID: fileID,
-      filePath: filePath,
-      line: line,
-      column: column
-    )
-    try? await body()
-  case nil:
+  guard let context = TestContext.current else {
     guard !isTesting else { return }
     let observer = FailureObserver()
     await FailureObserver.$current.withValue(observer) {
@@ -193,4 +173,31 @@ public func withExpectedIssue(
     }
     return
   }
+
+  switch context {
+  case .swiftTesting:
+    await _withKnownIssue(
+      message,
+      isIntermittent: isIntermittent,
+      fileID: fileID.description,
+      filePath: filePath.description,
+      line: Int(line),
+      column: Int(column),
+      body
+    )
+  case .xcTest:
+    reportIssue(
+      """
+      Asynchronously expecting failures is unavailable in XCTest.
+      
+      Omit this test from your XCTest suite, or consider using Swift Testing, instead.
+      """,
+      fileID: fileID,
+      filePath: filePath,
+      line: line,
+      column: column
+    )
+    try? await body()
+  @unknown default: break
+  }
 }