From 37e1a30115f252510a80a8f2e493419659c53bbb Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 19 Feb 2024 00:36:45 +0800 Subject: [PATCH 1/5] Update WASM CI to run for wasi target --- .github/workflows/wasm.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml index 47ceaecd..a899fc2b 100644 --- a/.github/workflows/wasm.yml +++ b/.github/workflows/wasm.yml @@ -25,7 +25,8 @@ jobs: swift-version: ${{ matrix.swift_version }} - name: build run: | - swift build ${{ matrix.extra_params }} + swift build --triple wasm32-unknown-wasi ${{ matrix.extra_params }} + # Blocked by upstream support for WASM. See https://github.com/apple/swift-testing/issues/228 # - name: test # run: | - # swift test \ No newline at end of file + # swift test --triple wasm32-unknown-wasi ${{ matrix.extra_params }} \ No newline at end of file From 7c8f6ea1c4fe14e2d39ec0f2529dfeee56000166 Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 19 Feb 2024 00:39:32 +0800 Subject: [PATCH 2/5] Fix swift-testing version --- Package.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 75882829..bc08e0a5 100644 --- a/Package.swift +++ b/Package.swift @@ -139,7 +139,8 @@ if swiftLogCondition { let swiftTestingCondition = envEnable("OPENSWIFTUI_SWIFT_TESTING", default: true) if swiftTestingCondition { package.dependencies.append( - .package(url: "https://github.com/apple/swift-testing", from: "0.3.0") + // Fix it to be 0.3.0 before we bump to Swift 5.10 + .package(url: "https://github.com/apple/swift-testing", exact: "0.3.0") ) openSwiftUITestTarget.dependencies.append( .product(name: "Testing", package: "swift-testing") From 52d08a96634aae3a2a9fba8f55d26cb9f27d307f Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 19 Feb 2024 00:43:44 +0800 Subject: [PATCH 3/5] Add test helper target --- Package.swift | 14 ++++++++++++++ Tests/OpenSwiftUITempTests/README.md | 7 +++++++ Tests/OpenSwiftUITempTests/Scaffolding.swift | 15 +++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 Tests/OpenSwiftUITempTests/README.md create mode 100644 Tests/OpenSwiftUITempTests/Scaffolding.swift diff --git a/Package.swift b/Package.swift index bc08e0a5..920b7317 100644 --- a/Package.swift +++ b/Package.swift @@ -27,6 +27,13 @@ let openSwiftUITestTarget = Target.testTarget( ], exclude: ["README.md"] ) +let openSwiftUITempTestTarget = Target.testTarget( + name: "OpenSwiftUITempTests", + dependencies: [ + "OpenSwiftUI", + ], + exclude: ["README.md"] +) let openSwiftUICompatibilityTestTarget = Target.testTarget( name: "OpenSwiftUICompatibilityTests", exclude: ["README.md"] @@ -98,6 +105,7 @@ extension Target { if attributeGraphCondition { openSwiftUITarget.addAGSettings() openSwiftUITestTarget.addAGSettings() + openSwiftUITempTestTarget.addAGSettings() openSwiftUICompatibilityTestTarget.addAGSettings() } @@ -146,6 +154,12 @@ if swiftTestingCondition { .product(name: "Testing", package: "swift-testing") ) package.targets.append(openSwiftUITestTarget) + + openSwiftUITempTestTarget.dependencies.append( + .product(name: "Testing", package: "swift-testing") + ) + package.targets.append(openSwiftUITempTestTarget) + openSwiftUICompatibilityTestTarget.dependencies.append( .product(name: "Testing", package: "swift-testing") ) diff --git a/Tests/OpenSwiftUITempTests/README.md b/Tests/OpenSwiftUITempTests/README.md new file mode 100644 index 00000000..1d7c5519 --- /dev/null +++ b/Tests/OpenSwiftUITempTests/README.md @@ -0,0 +1,7 @@ +## OpenSwiftUITempTests + +A temporary test target to iterate new test case. + +Remove this once the IDE support for swift-testing is provided. + +Please do not commit any new files to this folder. diff --git a/Tests/OpenSwiftUITempTests/Scaffolding.swift b/Tests/OpenSwiftUITempTests/Scaffolding.swift new file mode 100644 index 00000000..e3067ec8 --- /dev/null +++ b/Tests/OpenSwiftUITempTests/Scaffolding.swift @@ -0,0 +1,15 @@ +// +// Scaffolding.swift +// +// +// Created by Kyle on 2023/11/8. +// + +import Testing +import XCTest + +final class AllTests: XCTestCase { + func testAll() async { + await XCTestScaffold.runAllTests(hostedBy: self) + } +} From d44464128f1929c04bccf253e943132755811742 Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 19 Feb 2024 01:06:05 +0800 Subject: [PATCH 4/5] Update warning as errors config --- Package.resolved | 2 +- Package.swift | 53 +++++++++++++++++++++++++++++------------------- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/Package.resolved b/Package.resolved index 8118bb69..b0380e41 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,7 +6,7 @@ "location" : "https://github.com/OpenSwiftUIProject/OpenGraph", "state" : { "branch" : "main", - "revision" : "8f0376278186b6e24e8d7a07a560f3efaa2fef1d" + "revision" : "8cc89abc1fff74b387a083eab8ffa91f1b9fdca7" } }, { diff --git a/Package.swift b/Package.swift index 920b7317..6ba620d1 100644 --- a/Package.swift +++ b/Package.swift @@ -4,10 +4,34 @@ import Foundation import PackageDescription -let isXcodeEnv = ProcessInfo.processInfo.environment["__CFBundleIdentifier"] == "com.apple.dt.Xcode" +func envEnable(_ key: String, default defaultValue: Bool = false) -> Bool { + guard let value = Context.environment[key] else { + return defaultValue + } + if value == "1" { + return true + } else if value == "0" { + return false + } else { + return defaultValue + } +} + +let isXcodeEnv = Context.environment["__CFBundleIdentifier"] == "com.apple.dt.Xcode" + // Xcode use clang as linker which supports "-iframework" while SwiftPM use swiftc as linker which supports "-Fsystem" let systemFrameworkSearchFlag = isXcodeEnv ? "-iframework" : "-Fsystem" +var sharedSwiftSettings: [SwiftSetting] = [ + .enableExperimentalFeature("AccessLevelOnImport"), + .define("OPENSWIFTUI_SUPPRESS_DEPRECATED_WARNINGS"), +] + +let warningsAsErrorsCondition = envEnable("OPENSWIFTUI_WERROR", default: isXcodeEnv) +if warningsAsErrorsCondition { + sharedSwiftSettings.append(.unsafeFlags(["-warnings-as-errors"])) +} + let openSwiftUITarget = Target.target( name: "OpenSwiftUI", dependencies: [ @@ -15,28 +39,28 @@ let openSwiftUITarget = Target.target( .target(name: "CoreServices", condition: .when(platforms: [.iOS])), .product(name: "OpenGraphShims", package: "OpenGraph"), ], - swiftSettings: [ - .enableExperimentalFeature("AccessLevelOnImport"), - .define("OPENSWIFTUI_SUPPRESS_DEPRECATED_WARNINGS"), - ] + swiftSettings: sharedSwiftSettings ) let openSwiftUITestTarget = Target.testTarget( name: "OpenSwiftUITests", dependencies: [ "OpenSwiftUI", ], - exclude: ["README.md"] + exclude: ["README.md"], + swiftSettings: sharedSwiftSettings ) let openSwiftUITempTestTarget = Target.testTarget( name: "OpenSwiftUITempTests", dependencies: [ "OpenSwiftUI", ], - exclude: ["README.md"] + exclude: ["README.md"], + swiftSettings: sharedSwiftSettings ) let openSwiftUICompatibilityTestTarget = Target.testTarget( name: "OpenSwiftUICompatibilityTests", - exclude: ["README.md"] + exclude: ["README.md"], + swiftSettings: sharedSwiftSettings ) let package = Package( @@ -71,19 +95,6 @@ let package = Package( ] ) -func envEnable(_ key: String, default defaultValue: Bool = false) -> Bool { - guard let value = ProcessInfo.processInfo.environment[key] else { - return defaultValue - } - if value == "1" { - return true - } else if value == "0" { - return false - } else { - return defaultValue - } -} - #if os(macOS) let attributeGraphCondition = envEnable("OPENGRAPH_ATTRIBUTEGRAPH", default: true) #else From 2b3ce5b91d28db2d5d0cbbba6a8f366daf7a98fb Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 19 Feb 2024 02:01:44 +0800 Subject: [PATCH 5/5] Fix os(WASI) build issue --- .../AppOrganization/TODO/OpenSwiftUIApplication.swift | 4 +++- Sources/OpenSwiftUI/Internal/Graph/TODO/_GraphInputs.swift | 2 +- Sources/OpenSwiftUI/Internal/Other/EnvironmentHelper.swift | 2 ++ .../Layout/LayoutAdjustments/Alignment/AlignmentID.swift | 2 +- .../LayoutAdjustments/Alignment/HorizontalAlignment.swift | 2 +- .../LayoutAdjustments/Alignment/VerticalAlignment.swift | 2 +- .../Layout/LayoutAdjustments/Alignment/ViewDimensions.swift | 2 +- .../Layout/LayoutAdjustments/Edge/EdgeInsets.swift | 2 +- .../OpenSwiftUI/Layout/LayoutFundamentals/Stack/HStack.swift | 2 +- .../Layout/LayoutFundamentals/Stack/_HStackLayout.swift | 2 +- .../Layout/LayoutFundamentals/internal/LayoutComputer.swift | 2 +- .../Layout/LayoutFundamentals/internal/Spacing.swift | 2 +- .../Layout/LayoutFundamentals/internal/_ProposedSize.swift | 2 +- Sources/OpenSwiftUI/Test/_BenchmarkHost.swift | 2 +- Sources/OpenSwiftUI/UIElements/Font/TODO/Font.swift | 2 +- Sources/OpenSwiftUI/UIElements/Text/TODO/Text.swift | 2 +- Sources/OpenSwiftUI/Views/Animations/TODO/Animatable.swift | 2 +- Sources/OpenSwiftUI/Views/Animations/VectorArithmetic.swift | 2 +- Sources/OpenSwiftUI/Views/View/ViewTransform.swift | 2 +- Sources/OpenSwiftUI/Views/View/_IdentifiedViewProxy.swift | 2 +- Sources/OpenSwiftUIShims/include/LockedPointer.h | 2 +- .../Layout/LayoutAdjustments/Alignment/AlignmentIDTests.swift | 2 +- Tests/OpenSwiftUITests/_ViewDebugTests.swift | 2 +- 23 files changed, 26 insertions(+), 22 deletions(-) diff --git a/Sources/OpenSwiftUI/AppStructure/AppOrganization/TODO/OpenSwiftUIApplication.swift b/Sources/OpenSwiftUI/AppStructure/AppOrganization/TODO/OpenSwiftUIApplication.swift index eda95985..7d4beff2 100644 --- a/Sources/OpenSwiftUI/AppStructure/AppOrganization/TODO/OpenSwiftUIApplication.swift +++ b/Sources/OpenSwiftUI/AppStructure/AppOrganization/TODO/OpenSwiftUIApplication.swift @@ -61,12 +61,13 @@ private func KitRendererCommon() -> Never { #elseif os(macOS) // FIXME let code = NSApplicationMain(argc, argv) - #elseif os(Linux) + #else let code: Int32 = 1 #endif exit(code) } +#if canImport(Darwin) func currentAppName() -> String { if let name = Bundle.main.localizedValue(for: "CFBundleDisplayName") { return name @@ -90,3 +91,4 @@ extension Bundle { } } } +#endif diff --git a/Sources/OpenSwiftUI/Internal/Graph/TODO/_GraphInputs.swift b/Sources/OpenSwiftUI/Internal/Graph/TODO/_GraphInputs.swift index e31cfbb3..068891bc 100644 --- a/Sources/OpenSwiftUI/Internal/Graph/TODO/_GraphInputs.swift +++ b/Sources/OpenSwiftUI/Internal/Graph/TODO/_GraphInputs.swift @@ -9,7 +9,7 @@ public struct _GraphInputs { var changedDebugProperties: _ViewDebug.Properties var options: _GraphInputs.Options // FIXME: Compile crash on Linux - #if !os(Linux) + #if canImport(Darwin) var mergedInputs: Set #endif } diff --git a/Sources/OpenSwiftUI/Internal/Other/EnvironmentHelper.swift b/Sources/OpenSwiftUI/Internal/Other/EnvironmentHelper.swift index defccec9..64adc8b9 100644 --- a/Sources/OpenSwiftUI/Internal/Other/EnvironmentHelper.swift +++ b/Sources/OpenSwiftUI/Internal/Other/EnvironmentHelper.swift @@ -2,6 +2,8 @@ import Darwin #elseif canImport(Glibc) import Glibc +#elseif os(WASI) +import WASILibc #else #error("Unsupported Platform") #endif diff --git a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/AlignmentID.swift b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/AlignmentID.swift index ee414378..68a6afa6 100644 --- a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/AlignmentID.swift +++ b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/AlignmentID.swift @@ -8,7 +8,7 @@ #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/HorizontalAlignment.swift b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/HorizontalAlignment.swift index 47280838..aaabaa3b 100644 --- a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/HorizontalAlignment.swift +++ b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/HorizontalAlignment.swift @@ -9,7 +9,7 @@ #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/VerticalAlignment.swift b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/VerticalAlignment.swift index b2c4cdc5..087934b9 100644 --- a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/VerticalAlignment.swift +++ b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/VerticalAlignment.swift @@ -9,7 +9,7 @@ #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/ViewDimensions.swift b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/ViewDimensions.swift index 65864a0b..9fac57b5 100644 --- a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/ViewDimensions.swift +++ b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/ViewDimensions.swift @@ -8,7 +8,7 @@ #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Edge/EdgeInsets.swift b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Edge/EdgeInsets.swift index da6853a8..4892f909 100644 --- a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Edge/EdgeInsets.swift +++ b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Edge/EdgeInsets.swift @@ -8,7 +8,7 @@ #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/HStack.swift b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/HStack.swift index d0b796b7..ba1dde48 100644 --- a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/HStack.swift +++ b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/HStack.swift @@ -1,6 +1,6 @@ #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/_HStackLayout.swift b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/_HStackLayout.swift index af793661..537ba687 100644 --- a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/_HStackLayout.swift +++ b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/_HStackLayout.swift @@ -1,6 +1,6 @@ #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/LayoutComputer.swift b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/LayoutComputer.swift index 2896e1ad..f44055fc 100644 --- a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/LayoutComputer.swift +++ b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/LayoutComputer.swift @@ -8,7 +8,7 @@ #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/Spacing.swift b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/Spacing.swift index 593b2a92..c90a9518 100644 --- a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/Spacing.swift +++ b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/Spacing.swift @@ -9,7 +9,7 @@ #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/_ProposedSize.swift b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/_ProposedSize.swift index bbb9eb36..f4db35b1 100644 --- a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/_ProposedSize.swift +++ b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/_ProposedSize.swift @@ -8,7 +8,7 @@ #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/Test/_BenchmarkHost.swift b/Sources/OpenSwiftUI/Test/_BenchmarkHost.swift index a7f219a0..81a16c09 100644 --- a/Sources/OpenSwiftUI/Test/_BenchmarkHost.swift +++ b/Sources/OpenSwiftUI/Test/_BenchmarkHost.swift @@ -9,7 +9,7 @@ #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/UIElements/Font/TODO/Font.swift b/Sources/OpenSwiftUI/UIElements/Font/TODO/Font.swift index e96e9b7b..9555d1af 100644 --- a/Sources/OpenSwiftUI/UIElements/Font/TODO/Font.swift +++ b/Sources/OpenSwiftUI/UIElements/Font/TODO/Font.swift @@ -1,6 +1,6 @@ #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/UIElements/Text/TODO/Text.swift b/Sources/OpenSwiftUI/UIElements/Text/TODO/Text.swift index 600e1be8..9900bc25 100644 --- a/Sources/OpenSwiftUI/UIElements/Text/TODO/Text.swift +++ b/Sources/OpenSwiftUI/UIElements/Text/TODO/Text.swift @@ -8,7 +8,7 @@ #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/Views/Animations/TODO/Animatable.swift b/Sources/OpenSwiftUI/Views/Animations/TODO/Animatable.swift index 62ab7b53..3c23a81f 100644 --- a/Sources/OpenSwiftUI/Views/Animations/TODO/Animatable.swift +++ b/Sources/OpenSwiftUI/Views/Animations/TODO/Animatable.swift @@ -44,7 +44,7 @@ extension Animatable where AnimatableData == EmptyAnimatableData { #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/Views/Animations/VectorArithmetic.swift b/Sources/OpenSwiftUI/Views/Animations/VectorArithmetic.swift index 1b885044..4a7a6972 100644 --- a/Sources/OpenSwiftUI/Views/Animations/VectorArithmetic.swift +++ b/Sources/OpenSwiftUI/Views/Animations/VectorArithmetic.swift @@ -59,7 +59,7 @@ extension Double: VectorArithmetic { #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/Views/View/ViewTransform.swift b/Sources/OpenSwiftUI/Views/View/ViewTransform.swift index 529b3560..2ba88893 100644 --- a/Sources/OpenSwiftUI/Views/View/ViewTransform.swift +++ b/Sources/OpenSwiftUI/Views/View/ViewTransform.swift @@ -2,7 +2,7 @@ #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUI/Views/View/_IdentifiedViewProxy.swift b/Sources/OpenSwiftUI/Views/View/_IdentifiedViewProxy.swift index a8df020a..d39e1013 100644 --- a/Sources/OpenSwiftUI/Views/View/_IdentifiedViewProxy.swift +++ b/Sources/OpenSwiftUI/Views/View/_IdentifiedViewProxy.swift @@ -1,6 +1,6 @@ #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Sources/OpenSwiftUIShims/include/LockedPointer.h b/Sources/OpenSwiftUIShims/include/LockedPointer.h index d4754ad1..32200dfd 100644 --- a/Sources/OpenSwiftUIShims/include/LockedPointer.h +++ b/Sources/OpenSwiftUIShims/include/LockedPointer.h @@ -16,7 +16,7 @@ #define OPENSWIFTUI_LOCK_INIT OS_UNFAIR_LOCK_INIT #define OPENSWIFTUI_LOCK_LOCK(lock) os_unfair_lock_lock(lock) #define OPENSWIFTUI_LOCK_UNLOCK(lock) os_unfair_lock_unlock(lock) -#elif OPENSWIFTUI_TARGET_OS_LINUX +#else #define OPENSWIFTUI_LOCK_T int32_t #include #include diff --git a/Tests/OpenSwiftUITests/Layout/LayoutAdjustments/Alignment/AlignmentIDTests.swift b/Tests/OpenSwiftUITests/Layout/LayoutAdjustments/Alignment/AlignmentIDTests.swift index f09b3a89..72632a06 100644 --- a/Tests/OpenSwiftUITests/Layout/LayoutAdjustments/Alignment/AlignmentIDTests.swift +++ b/Tests/OpenSwiftUITests/Layout/LayoutAdjustments/Alignment/AlignmentIDTests.swift @@ -9,7 +9,7 @@ import Testing #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif diff --git a/Tests/OpenSwiftUITests/_ViewDebugTests.swift b/Tests/OpenSwiftUITests/_ViewDebugTests.swift index e2938a72..2e853356 100644 --- a/Tests/OpenSwiftUITests/_ViewDebugTests.swift +++ b/Tests/OpenSwiftUITests/_ViewDebugTests.swift @@ -9,7 +9,7 @@ import Testing #if canImport(Darwin) import CoreGraphics -#elseif os(Linux) +#else import Foundation #endif