Skip to content

Update OpenCombine integration to 0.16.0 #1027

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
Kyle-Ye merged 3 commits into from
Aug 26, 2026
Merged

Update OpenCombine integration to 0.16.0 #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81cd8d2
Bump OpenCombine version
Kyle-Ye Aug 26, 2026
ae24972
Fix tuist project issue for OpenCombine dependency
Kyle-Ye Aug 26, 2026
61ac29a
Fix OpenCombine build issue
Kyle-Ye Aug 26, 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
8 changes: 8 additions & 0 deletions Example/Tuist/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ configureOpenSwiftUIEnvironment(provider: PackageContextEnvironmentProvider())
let exampleServerConfiguration = OpenSwiftUIExampleServerConfiguration.resolve()
let enableLookInsideServer = exampleServerConfiguration.enableLookInsideServer
let enableLookInServer = exampleServerConfiguration.enableLookInServer
let openCombineCondition = envBoolValue("OPENCOMBINE")
#else
let enableLookInsideServer = Context.environment["OPENSWIFTUI_EXAMPLE_LOOKINSIDE_SERVER"] == "1"
let enableLookInServer = Context.environment["OPENSWIFTUI_EXAMPLE_LOOKIN_SERVER"] == "1"
let openCombineCondition = Context.environment["OPENSWIFTUI_OPENCOMBINE"] == "1"
#endif

var dependencies: [PackageDescription.Package.Dependency] = [
Expand All @@ -35,6 +37,12 @@ var dependencies: [PackageDescription.Package.Dependency] = [
.package(url: "https://github.com/OpenSwiftUIProject/swift-snapshot-testing.git", exact: "1.19.3"),
]

if openCombineCondition {
dependencies.append(
.package(url: "https://github.com/OpenSwiftUIProject/OpenCombine.git", from: "0.16.0")
)
}

if enableLookInsideServer {
dependencies.append(.package(url: "https://github.com/LookInsideApp/LookInside-Release.git", from: "0.2.2"))
}
Expand Down
2 changes: 1 addition & 1 deletion Package.resolved
View file
Open in desktop

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

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 @@ -936,7 +936,7 @@ if useLocalDeps {

if openCombineCondition {
package.dependencies.append(
.package(url: "https://github.com/OpenSwiftUIProject/OpenCombine.git", from: "0.15.0")
.package(url: "https://github.com/OpenSwiftUIProject/OpenCombine.git", from: "0.16.0")
)
cOpenSwiftUITarget.addOpenCombineCSettings()
openSwiftUICoreTarget.addOpenCombineSettings()
Expand Down
6 changes: 6 additions & 0 deletions Sources/OpenSwiftUI/Export.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@ package typealias UniqueID = OpenSwiftUICore.UniqueID
#if canImport(CoreGraphics)
@_exported import CoreGraphics
#endif

#if canImport(OpenCombine)
public import OpenCombine
public typealias Published = OpenCombine.Published
public typealias ObservableObject = OpenCombine.ObservableObject
#endif
8 changes: 4 additions & 4 deletions Sources/OpenSwiftUI/View/Control/ProgressView/ProgressView+Foundation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ extension Foundation.Progress {
)
}

#if !OPENSWIFTUI_OPENCOMBINE
#if canImport(ObjectiveC)
// OpenCombine also support this API on Darwin since 0.16.0
fileprivate typealias UIStatePublisher = Publishers.Map<
Publishers.CombineLatest4<
NSObject.KeyValueObservingPublisher<Foundation.Progress, Int64>,
Expand Down Expand Up @@ -70,12 +71,11 @@ extension Foundation.Progress {
}
}
#else
// TODO: Implement NSObject.KeyValueObservingPublisher in OpenCombine
fileprivate typealias UIStatePublisher = AnyPublisher<UIState, Never>

fileprivate var uiStatePublisher: UIStatePublisher {
// [AI] OpenCombineFoundation does not provide KVO publishers. Sample
// Progress while the graph-owned subscription is active instead.
// Sample Progress while the graph-owned subscription is active on
// platforms without Objective-C KVO support.
Foundation.Timer.publish(
every: 1.0 / 30.0,
on: .main,
Expand Down
Loading