Skip to content

Update Workflow to 6.0 and account for ReactiveSwift removal #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amorde merged 2 commits into from
Jul 17, 2026
Merged

Update Workflow to 6.0 and account for ReactiveSwift removal #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
faec846
Update Workflow to 6.0 and account for ReactiveSwift removal
amorde Jul 15, 2026
1f84a69
Bump Xcode and macOS versions on CI workflows
amorde Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/docs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ on:
branches: [ main ]

env:
# Xcode 16.3 gets us Swift 6.1, required for docc merge
XCODE_VERSION: 16.3
XCODE_VERSION: 26.5

jobs:
build:
name: Generate API docs and publish to GitHub pages
# macos-15 is required for Xcode 16.3
runs-on: macos-15
runs-on: macos-26

steps:
- name: Checkout
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/validations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ on:
pull_request:

env:
XCODE_VERSION: 26.2
TUIST_TEST_DEVICE: iPad (10th generation)
XCODE_VERSION: 26.5
TUIST_TEST_DEVICE: iPad Pro 11-inch (M5)
TUIST_TEST_PLATFORM: iOS
TUIST_TEST_OS: 18.6
TUIST_TEST_OS: 26.2

jobs:
development-tests:
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/apple/swift-log", from: "1.4.4"),
.package(url: "https://github.com/square/swift-keyboard-observer", from: "1.1.0"),
.package(url: "https://github.com/square/workflow-swift", "4.0.1"..<"6.0.0"),
.package(url: "https://github.com/square/workflow-swift", from: "6.0.0"),
],
targets: [
.target(
Expand Down
16 changes: 8 additions & 8 deletions Samples/Tuist/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 11 additions & 14 deletions WorkflowModals/Sources/WorkflowModalListProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Combine
import Modals
import ReactiveSwift
import ViewEnvironment
import Workflow
import WorkflowUI
Expand All @@ -20,12 +19,12 @@ final class WorkflowModalListProvider<WorkflowType, ModalContent, ToastContent>:

private let workflowHost: WorkflowHost<RootWorkflow<WorkflowType.Rendering, WorkflowType.Output>>

private let (lifetime, token) = Lifetime.make()

private let manager = Manager()

private let _modalListDidChange = PassthroughSubject<Void, Never>()

private var cancellables: Set<AnyCancellable> = []

private var contents: Manager.Contents {
didSet { update() }
}
Expand All @@ -40,27 +39,25 @@ final class WorkflowModalListProvider<WorkflowType, ModalContent, ToastContent>:
) {
workflowHost = .init(workflow: RootWorkflow(workflow))

workflowHost.output
.signal
.take(during: lifetime)
.observeValues(onOutput)
workflowHost.outputPublisher
.sink(receiveValue: onOutput)
.store(in: &cancellables)
Comment on lines -43 to +44

@johnnewman-square johnnewman-square Jul 17, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At first I thought we'd need to dropFirst() here, but outputPublisher is a PassthroughSubject, so we're all good!

@amorde amorde Jul 17, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep luckily for output we don't need it


contents = .init(
modals: workflowHost.rendering.value.modals,
toasts: workflowHost.rendering.value.toasts
modals: workflowHost.rendering.modals,
toasts: workflowHost.rendering.toasts
)
workflowHost
.rendering
.signal
.take(during: lifetime)
.observeValues { [weak self] value in
.renderingPublisher
.dropFirst()
.sink { [weak self] value in
guard let self else { return }

contents = .init(
modals: value.modals,
toasts: value.toasts
)
}
}.store(in: &cancellables)
}

func update(environment: ViewEnvironment) {
Expand Down
Loading