wip

Author: mbrandonw

.github/workflows/ci.yml

@@ -76,31 +76,36 @@ jobs:
   #       run: CONFIG=${{ matrix.config }} make build-for-static-stdlib
 
   # NB: Downloading the toolchain gets rate-limited by GitHub
-  # wasm:
-  #   name: Wasm
-  #   runs-on: macos-14
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - name: Select Xcode
-  #       run: sudo xcode-select -s /Applications/Xcode_15.4.app
-  #     - name: Select Swift version
-  #       run: echo 'wasm-DEVELOPMENT-SNAPSHOT-2024-07-08-a' > .swift-version
-  #     - name: Build
-  #       run: swift run carton bundle
-
   wasm:
-    name: SwiftWasm
-    runs-on: ubuntu-latest
+    name: Wasm
+    runs-on: macos-14
     steps:
-      - uses: actions/checkout@v4
-      - uses: bytecodealliance/actions/wasmtime/setup@v1
-      - uses: swiftwasm/setup-swiftwasm@v1
+      - name: Cache Gradle packages
+        uses: actions/cache@v3
         with:
-          swift-version: "wasm-DEVELOPMENT-SNAPSHOT-2024-07-16-a"
-      - name: Build tests
-        run: swift build --triple wasm32-unknown-wasi --build-tests
-      - name: Run tests
-        run: wasmtime .build/debug/swift-custom-dumpPackageTests.wasm
+          path: |
+            ~/Library/Developer/Toolchains
+      - uses: actions/checkout@v4
+      - name: Select Xcode
+        run: sudo xcode-select -s /Applications/Xcode_15.4.app
+      - name: Select Swift version
+        run: echo 'wasm-DEVELOPMENT-SNAPSHOT-2024-07-08-a' > .swift-version
+      - name: Build
+        run: swift run carton bundle
+
+  # wasm:
+  #   name: SwiftWasm
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: bytecodealliance/actions/wasmtime/setup@v1
+  #     - uses: swiftwasm/setup-swiftwasm@v1
+  #       with:
+  #         swift-version: "wasm-DEVELOPMENT-SNAPSHOT-2024-07-16-a"
+  #     - name: Build tests
+  #       run: swift build --triple wasm32-unknown-wasi --build-tests
+  #     - name: Run tests
+  #       run: wasmtime .build/debug/swift-custom-dumpPackageTests.wasm
 
   # windows:
   #   name: Windows

Sources/IssueReporting/Internal/AppHostWarning.swift

@@ -1,4 +1,3 @@
-#if canImport(Foundation)
 import Foundation
 
 extension String? {
@@ -78,4 +77,3 @@ extension String {
     }
   #endif
 }
-#endif

Sources/IssueReporting/Internal/FailureObserver.swift

@@ -1,4 +1,3 @@
-#if canImport(Foundation)
 import Foundation
 
 @usableFromInline
@@ -20,4 +19,3 @@ final class FailureObserver: @unchecked Sendable {
     return body(&count)
   }
 }
-#endif

Sources/IssueReporting/Internal/LockIsolated.swift

@@ -1,4 +1,3 @@
-#if canImport(Foundation)
 import Foundation
 
 @usableFromInline
@@ -20,4 +19,3 @@ final class LockIsolated<Value>: @unchecked Sendable {
     return try operation(&value)
   }
 }
-#endif

Sources/IssueReporting/Internal/SwiftTesting.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 #if canImport(WinSDK)
   import WinSDK
 #endif

Sources/IssueReporting/Internal/Warn.swift

@@ -1,18 +1,14 @@
-#if canImport(Foundation)
 #if os(Linux)
   @preconcurrency import Foundation
 #else
   import Foundation
 #endif
-#endif
 
 #if canImport(WinSDK)
   import WinSDK
 #endif
 
 @usableFromInline
 func printError(_ message: String) {
-#if canImport(Foundation)
   fputs("\(message)\n", stderr)
-  #endif
 }

Sources/IssueReporting/Internal/XCTest.swift

@@ -1,4 +1,3 @@
-#if canImport(Foundation)
 #if _runtime(_ObjC)
   import Foundation
 #endif
@@ -125,4 +124,3 @@ func _XCTExpectFailure<R>(
     @TaskLocal public static var isInFailingBlock = false
   }
 #endif
-#endif

Sources/IssueReporting/IssueReporters/RuntimeWarningReporter.swift

@@ -1,6 +1,4 @@
-#if canImport(Foundation)
 import Foundation
-#endif
 
 #if canImport(os)
   import os

Sources/XCTestDynamicOverlay/Internal/Deprecations.swift

@@ -1,6 +1,4 @@
-#if canImport(Foundation)
 import Foundation
-#endif
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking

Tests/XCTestDynamicOverlayTests/TestHelpers.swift

@@ -1,3 +1,4 @@
+import Foundation
 import XCTestDynamicOverlay
 
 func MyXCTFail(_ message: String) {