diff --git a/.github/fastlane/Fastfile b/.github/fastlane/Fastfile index 32b79be17..ab7b7e622 100644 --- a/.github/fastlane/Fastfile +++ b/.github/fastlane/Fastfile @@ -128,7 +128,7 @@ platform :ios do end end -platform :macOS do +platform :mac do lane :CLI_test do scan( code_coverage: true, diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9006f512d..5dfd97241 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -49,7 +49,7 @@ jobs: - uses: actions/checkout@v2 - name: Run CLI TESTS run: | - bundle exec fastlane macOS CLI_test + bundle exec fastlane mac CLI_test working-directory: ${{ env.working-directory }} build_for_swift_package_manager: diff --git a/.github/workflows/PR_CI.yml b/.github/workflows/PR_CI.yml index 164626f5b..244cc21db 100644 --- a/.github/workflows/PR_CI.yml +++ b/.github/workflows/PR_CI.yml @@ -46,7 +46,7 @@ jobs: - uses: actions/checkout@v2 - name: Run CLI TESTS run: | - bundle exec fastlane macOS CLI_test + bundle exec fastlane mac CLI_test working-directory: ${{ env.working-directory }} build_for_swift_package_manager: diff --git a/ExampleApps/SwiftUIExample/SwiftUIExampleTests/UIKitInteropTests.swift b/ExampleApps/SwiftUIExample/SwiftUIExampleTests/UIKitInteropTests.swift index c9475df0a..154a2a92f 100644 --- a/ExampleApps/SwiftUIExample/SwiftUIExampleTests/UIKitInteropTests.swift +++ b/ExampleApps/SwiftUIExample/SwiftUIExampleTests/UIKitInteropTests.swift @@ -59,7 +59,6 @@ final class UIKitInteropTests: XCTestCase, View { } func testPuttingAUIKitViewInsideASwiftUIWorkflowWithOtherSwiftUIViews() async throws { - throw XCTSkip("Issue with environment objects being read, functionality appears to still work") struct FR1: View, FlowRepresentable, Inspectable { weak var _workflowPointer: AnyFlowRepresentable? let str: String diff --git a/Sources/SwiftCurrent_SwiftUI/Views/WorkflowItemWrapper.swift b/Sources/SwiftCurrent_SwiftUI/Views/WorkflowItemWrapper.swift index 0a67ce8d5..e9f62f30f 100644 --- a/Sources/SwiftCurrent_SwiftUI/Views/WorkflowItemWrapper.swift +++ b/Sources/SwiftCurrent_SwiftUI/Views/WorkflowItemWrapper.swift @@ -35,19 +35,18 @@ public struct WorkflowItemWrapper