diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index c008fba..0bbf70c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -35,13 +35,6 @@ jobs: -instr-profile=.build-test-debug/debug/codecov/default.profdata \ .build-test-debug/debug/OpenSwiftUIPackageTests.xctest/Contents/MacOS/OpenSwiftUIPackageTests \ > coverage.txt - - name: Build and run tests in debug mode with TSan - run: | - swift test \ - -c debug \ - --sanitize thread \ - -Xswiftc -warnings-as-errors \ - --build-path .build-test-debug-sanitize-thread - name: Build and run tests in release mode run: | swift test \ @@ -51,4 +44,5 @@ jobs: --build-path .build-test-release - uses: codecov/codecov-action@v3 with: + token: ${{ secrets.CODECOV_TOKEN }} verbose: true diff --git a/Package.resolved b/Package.resolved index 6277f17..8b0c5a8 100644 --- a/Package.resolved +++ b/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/OpenSwiftUIProject/OpenGraph", "state" : { - "branch" : "main", - "revision" : "52266b713cf60eb23f4d7113fade9a79f4f47ff9" + "revision" : "4adbc0e5d44f1a5861a97b942d903635e25c9e00", + "version" : "0.0.1" } } ], diff --git a/Package.swift b/Package.swift index e622ca7..b221159 100644 --- a/Package.swift +++ b/Package.swift @@ -42,9 +42,6 @@ let openSwiftUITestTarget = Target.testTarget( ) let openSwiftUICompatibilityTestTarget = Target.testTarget( name: "OpenSwiftUICompatibilityTests", - dependencies: [ - "OpenSwiftUI", - ], exclude: ["README.md"] ) @@ -63,7 +60,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/OpenSwiftUIProject/OpenFoundation", from: "0.0.1"), - .package(url: "https://github.com/OpenSwiftUIProject/OpenGraph", branch: "main"), + .package(url: "https://github.com/OpenSwiftUIProject/OpenGraph", from: "0.0.1"), ], targets: [ // TODO: Add SwiftGTK as an backend alternative for UIKit/AppKit on Linux and macOS @@ -167,9 +164,11 @@ if swiftTestingCondition { openSwiftUITestTarget.swiftSettings = swiftSettings } -let swiftUICompatibilityTestCondition = envEnable("OPENSWIFTUI_SWIFTUI_COMPATIBILITY_TEST") -if swiftUICompatibilityTestCondition { +let compatibilityTestCondition = envEnable("OPENSWIFTUI_COMPATIBILITY_TEST") +if compatibilityTestCondition { var swiftSettings: [SwiftSetting] = (openSwiftUICompatibilityTestTarget.swiftSettings ?? []) - swiftSettings.append(.define("OPENSWIFTUI_SWIFTUI_COMPATIBILITY_TEST")) + swiftSettings.append(.define("OPENSWIFTUI_COMPATIBILITY_TEST")) openSwiftUICompatibilityTestTarget.swiftSettings = swiftSettings +} else { + openSwiftUICompatibilityTestTarget.dependencies.append("OpenSwiftUI") } diff --git a/Tests/OpenSwiftUICompatibilityTests/DummyTests.swift b/Tests/OpenSwiftUICompatibilityTests/DummyTests.swift index 9972d96..1e7693f 100644 --- a/Tests/OpenSwiftUICompatibilityTests/DummyTests.swift +++ b/Tests/OpenSwiftUICompatibilityTests/DummyTests.swift @@ -6,7 +6,7 @@ // import XCTest -#if OPENSWIFTUI_SWIFTUI_COMPATIBILITY_TEST +#if OPENSWIFTUI_COMPATIBILITY_TEST import SwiftUI #else import OpenSwiftUI diff --git a/Tests/OpenSwiftUICompatibilityTests/README.md b/Tests/OpenSwiftUICompatibilityTests/README.md index de1c24c..f6a5a6b 100644 --- a/Tests/OpenSwiftUICompatibilityTests/README.md +++ b/Tests/OpenSwiftUICompatibilityTests/README.md @@ -3,7 +3,7 @@ Test public API of OpenSwiftUI and run it against with SwiftUI on Apple Platform. ```swift -#if OPENSWIFTUI_SWIFTUI_COMPATIBILITY_TEST +#if OPENSWIFTUI_COMPATIBILITY_TEST import SwiftUI #else import OpenSwiftUI