Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions .github/workflows/compatibility_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ jobs:
runs-on: ${{ matrix.os }}
env:
OPENSWIFTUI_WERROR: 1
OPENGRAPH_ATTRIBUTEGRAPH: 1
OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1
OPENSWIFTUI_SWIFT_LOG: 0
OPENSWIFTUI_SWIFT_CRYPTO: 0
OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
OPENSWIFTUI_USE_LOCAL_DEPS: 1
OPENGRAPH_USE_LOCAL_DEPS: 1
OPENGRAPH_TARGET_RELEASE: ${{ matrix.release }}
OPENBOX_USE_LOCAL_DEPS: 1
OPENBOX_TARGET_RELEASE: ${{ matrix.release }}
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }}
OPENRENDERBOX_USE_LOCAL_DEPS: 1
OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }}
DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }}
GH_TOKEN: ${{ github.token }}
steps:
Expand Down Expand Up @@ -67,16 +67,16 @@ jobs:
runs-on: ${{ matrix.os }}
env:
OPENSWIFTUI_WERROR: 1
OPENGRAPH_ATTRIBUTEGRAPH: 1
OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1
OPENSWIFTUI_SWIFT_LOG: 0
OPENSWIFTUI_SWIFT_CRYPTO: 0
OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
OPENSWIFTUI_SUPPORT_MULTI_PRODUCTS: 0
OPENSWIFTUI_USE_LOCAL_DEPS: 1
OPENGRAPH_USE_LOCAL_DEPS: 1
OPENGRAPH_TARGET_RELEASE: ${{ matrix.release }}
OPENBOX_USE_LOCAL_DEPS: 1
OPENBOX_TARGET_RELEASE: ${{ matrix.release }}
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }}
OPENRENDERBOX_USE_LOCAL_DEPS: 1
OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }}
DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }}
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ jobs:
runs-on: ${{ matrix.os }}
env:
OPENSWIFTUI_WERROR: 1
OPENGRAPH_ATTRIBUTEGRAPH: 1
OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1
OPENSWIFTUI_COMPATIBILITY_TEST: 0
OPENSWIFTUI_SWIFT_LOG: 0
OPENSWIFTUI_SWIFT_CRYPTO: 0
OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
OPENSWIFTUI_SUPPORT_MULTI_PRODUCTS: 0
OPENSWIFTUI_USE_LOCAL_DEPS: 1
OPENGRAPH_USE_LOCAL_DEPS: 1
OPENGRAPH_TARGET_RELEASE: ${{ matrix.release }}
OPENBOX_USE_LOCAL_DEPS: 1
OPENBOX_TARGET_RELEASE: ${{ matrix.release }}
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }}
OPENRENDERBOX_USE_LOCAL_DEPS: 1
OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }}
DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }}
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ jobs:
runs-on: ${{ matrix.os }}
env:
OPENSWIFTUI_WERROR: 1
OPENGRAPH_ATTRIBUTEGRAPH: 1
OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1
OPENSWIFTUI_COMPATIBILITY_TEST: 0
OPENSWIFTUI_SWIFT_LOG: 0
OPENSWIFTUI_SWIFT_CRYPTO: 0
OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
OPENSWIFTUI_USE_LOCAL_DEPS: 1
OPENGRAPH_USE_LOCAL_DEPS: 1
OPENGRAPH_TARGET_RELEASE: ${{ matrix.release }}
OPENBOX_USE_LOCAL_DEPS: 1
OPENBOX_TARGET_RELEASE: ${{ matrix.release }}
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }}
OPENRENDERBOX_USE_LOCAL_DEPS: 1
OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }}
DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }}
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-22.04
env:
OPENSWIFTUI_WERROR: 1
OPENGRAPH_ATTRIBUTEGRAPH: 0
OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 0
OPENSWIFTUI_COMPATIBILITY_TEST: 0
OPENSWIFTUI_SWIFT_LOG: 1
OPENSWIFTUI_SWIFT_CRYPTO: 1
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/uitests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ jobs:
runs-on: ${{ matrix.os }}
env:
OPENSWIFTUI_WERROR: 1
OPENGRAPH_ATTRIBUTEGRAPH: 1
OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1
OPENSWIFTUI_COMPATIBILITY_TEST: 0
OPENSWIFTUI_SWIFT_LOG: 0
OPENSWIFTUI_SWIFT_CRYPTO: 0
OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
OPENSWIFTUI_SUPPORT_MULTI_PRODUCTS: 0
OPENSWIFTUI_USE_LOCAL_DEPS: 1
OPENGRAPH_USE_LOCAL_DEPS: 1
OPENGRAPH_TARGET_RELEASE: ${{ matrix.release }}
OPENBOX_USE_LOCAL_DEPS: 1
OPENBOX_TARGET_RELEASE: ${{ matrix.release }}
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }}
OPENRENDERBOX_USE_LOCAL_DEPS: 1
OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }}
DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }}
GH_TOKEN: ${{ github.token }}
steps:
Expand Down Expand Up @@ -74,17 +74,17 @@ jobs:
runs-on: ${{ matrix.os }}
env:
OPENSWIFTUI_WERROR: 1
OPENGRAPH_ATTRIBUTEGRAPH: 1
OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1
OPENSWIFTUI_COMPATIBILITY_TEST: 0
OPENSWIFTUI_SWIFT_LOG: 0
OPENSWIFTUI_SWIFT_CRYPTO: 0
OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
OPENSWIFTUI_SUPPORT_MULTI_PRODUCTS: 0
OPENSWIFTUI_USE_LOCAL_DEPS: 1
OPENGRAPH_USE_LOCAL_DEPS: 1
OPENGRAPH_TARGET_RELEASE: ${{ matrix.release }}
OPENBOX_USE_LOCAL_DEPS: 1
OPENBOX_TARGET_RELEASE: ${{ matrix.release }}
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }}
OPENRENDERBOX_USE_LOCAL_DEPS: 1
OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }}
DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }}
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion Benchmarks/Package.resolved

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

8 changes: 4 additions & 4 deletions Example/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
271D81642BB1E8E300A6D543 /* OpenGraph */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = OpenGraph; path = ../../OpenGraph; sourceTree = "<group>"; };
271D81642BB1E8E300A6D543 /* OpenAttributeGraph */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = OpenAttributeGraph; path = ../../OpenAttributeGraph; sourceTree = "<group>"; };
275751E32DEE1441003E467C /* TestingHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestingHost.app; sourceTree = BUILT_PRODUCTS_DIR; };
279283B92DFF11CE00234D64 /* OpenSwiftUIUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OpenSwiftUIUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
27B7FC802BB31FF500272BA5 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
27CD0B492AFC8D37003665EB /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
27CD0B612AFC8E0E003665EB /* OpenSwiftUI */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = OpenSwiftUI; path = ..; sourceTree = "<group>"; };
27D49DF82BA604FB00F6E2E2 /* HostingExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HostingExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
27E6C4D02D2842530010502F /* OpenBox */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = OpenBox; path = ../../OpenBox; sourceTree = "<group>"; };
27E6C4D02D2842530010502F /* OpenRenderBox */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = OpenRenderBox; path = ../../OpenRenderBox; sourceTree = "<group>"; };
27E6C4D12D2842740010502F /* AttributeGraph.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = AttributeGraph.xcframework; path = ../../DarwinPrivateFrameworks/AG/2024/AttributeGraph.xcframework; sourceTree = "<group>"; };
27E6C4D42D2842810010502F /* RenderBox.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RenderBox.xcframework; path = ../../DarwinPrivateFrameworks/RB/2024/RenderBox.xcframework; sourceTree = "<group>"; };
27E6C4F72D2844470010502F /* DarwinPrivateFrameworks */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = DarwinPrivateFrameworks; path = ../../DarwinPrivateFrameworks; sourceTree = "<group>"; };
Expand Down Expand Up @@ -181,8 +181,8 @@
27E6C4F62D2842D80010502F /* Configurations */,
27B7FC802BB31FF500272BA5 /* README.md */,
27E6C4F72D2844470010502F /* DarwinPrivateFrameworks */,
27E6C4D02D2842530010502F /* OpenBox */,
271D81642BB1E8E300A6D543 /* OpenGraph */,
27E6C4D02D2842530010502F /* OpenRenderBox */,
271D81642BB1E8E300A6D543 /* OpenAttributeGraph */,
27CD0B612AFC8E0E003665EB /* OpenSwiftUI */,
27FFF0422E08850C0060A4DA /* SharedExample */,
275751AF2DEE136A003E467C /* Example */,
Expand Down
10 changes: 5 additions & 5 deletions Example/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ let package = Package(
products: [.executable(name: "Example", targets: ["Example"])],
dependencies: [
.package(path: "../"),
.package(path: "../../OpenGraph")
.package(path: "../../OpenAttributeGraph")
],
targets: [
exampleTarget,
Expand All @@ -43,19 +43,19 @@ func envEnable(_ key: String, default defaultValue: Bool = false) -> Bool {
}

#if os(macOS)
let attributeGraphCondition = envEnable("OPENGRAPH_ATTRIBUTEGRAPH", default: true)
let attributeGraphCondition = envEnable("OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH", default: true)
#else
let attributeGraphCondition = envEnable("OPENGRAPH_ATTRIBUTEGRAPH")
let attributeGraphCondition = envEnable("OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH")
#endif

extension Target {
func addAGSettings() {
// FIXME: Weird SwiftPM behavior for binary Target. Otherwize we'll get the following error message
// "could not determine executable path for bundle 'AttributeGraph.framework'"
dependencies.append(.product(name: "AttributeGraph", package: "OpenGraph"))
dependencies.append(.product(name: "AttributeGraph", package: "OpenAttributeGraph"))

var swiftSettings = swiftSettings ?? []
swiftSettings.append(.define("OPENGRAPH_ATTRIBUTEGRAPH"))
swiftSettings.append(.define("OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH"))
self.swiftSettings = swiftSettings
}
}
Expand Down
4 changes: 2 additions & 2 deletions Example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Clone other components to the same directory of `OpenSwiftUI`

```shell
cd ..
git clone https://github.com/OpenSwiftUIProject/OpenGraph.git
git clone https://github.com/OpenSwiftUIProject/OpenBox.git
git clone https://github.com/OpenSwiftUIProject/OpenAttributeGraph.git
git clone https://github.com/OpenSwiftUIProject/OpenRenderBox.git
git clone https://github.com/OpenSwiftUIProject/DarwinPrivateFrameworks.git
```

Expand Down
14 changes: 7 additions & 7 deletions Package.resolved

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

26 changes: 13 additions & 13 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ sharedSwiftSettings.append(contentsOf: [SwiftSetting].availabilityMacroSettings(
let openSwiftUISPITarget = Target.target(
name: "OpenSwiftUI_SPI",
dependencies: [
.product(name: "OpenBox", package: "OpenBox"),
.product(name: "OpenRenderBox", package: "OpenRenderBox"),
],
publicHeadersPath: ".",
cSettings: sharedCSettings + [.define("_GNU_SOURCE", .when(platforms: .nonDarwinPlatforms))],
Expand Down Expand Up @@ -222,8 +222,8 @@ let openSwiftUICoreTarget = Target.target(
"OpenSwiftUI_SPI",
.product(name: "OpenCoreGraphicsShims", package: "OpenCoreGraphics"),
.product(name: "OpenQuartzCoreShims", package: "OpenCoreGraphics"),
.product(name: "OpenGraphShims", package: "OpenGraph"),
.product(name: "OpenBoxShims", package: "OpenBox"),
.product(name: "OpenAttributeGraphShims", package: "OpenAttributeGraph"),
.product(name: "OpenRenderBoxShims", package: "OpenRenderBox"),
] + (swiftUIRenderCondition && symbolLocatorCondition ? ["OpenSwiftUISymbolDualTestsSupport"] : []),
cSettings: sharedCSettings,
cxxSettings: sharedCxxSettings,
Expand Down Expand Up @@ -263,8 +263,8 @@ let openSwiftUITarget = Target.target(
"COpenSwiftUI",
.product(name: "OpenCoreGraphicsShims", package: "OpenCoreGraphics"),
.product(name: "OpenQuartzCoreShims", package: "OpenCoreGraphics"),
.product(name: "OpenGraphShims", package: "OpenGraph"),
.product(name: "OpenBoxShims", package: "OpenBox"),
.product(name: "OpenAttributeGraphShims", package: "OpenAttributeGraph"),
.product(name: "OpenRenderBoxShims", package: "OpenRenderBox"),
],
cSettings: sharedCSettings,
cxxSettings: sharedCxxSettings,
Expand Down Expand Up @@ -454,7 +454,7 @@ extension Target {
// "could not determine executable path for bundle 'AttributeGraph.framework'"
dependencies.append(.product(name: "AttributeGraph", package: "DarwinPrivateFrameworks"))
var swiftSettings = swiftSettings ?? []
swiftSettings.append(.define("OPENGRAPH_ATTRIBUTEGRAPH"))
swiftSettings.append(.define("OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH"))
self.swiftSettings = swiftSettings
}

Expand All @@ -463,7 +463,7 @@ extension Target {
// "could not determine executable path for bundle 'RenderBox.framework'"
dependencies.append(.product(name: "RenderBox", package: "DarwinPrivateFrameworks"))
var swiftSettings = swiftSettings ?? []
swiftSettings.append(.define("OPENBOX_RENDERBOX"))
swiftSettings.append(.define("OPENRENDERBOX_RENDERBOX"))
self.swiftSettings = swiftSettings
}

Expand Down Expand Up @@ -497,7 +497,7 @@ extension Target {

let useLocalDeps = envEnable("OPENSWIFTUI_USE_LOCAL_DEPS")

let attributeGraphCondition = envEnable("OPENGRAPH_ATTRIBUTEGRAPH", default: buildForDarwinPlatform && !isSPIBuild)
let attributeGraphCondition = envEnable("OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH", default: buildForDarwinPlatform && !isSPIBuild)
if attributeGraphCondition {
openSwiftUICoreTarget.addAGSettings()
openSwiftUITarget.addAGSettings()
Expand All @@ -509,7 +509,7 @@ if attributeGraphCondition {
openSwiftUIBridgeTestTarget.addAGSettings()
}

let renderBoxCondition = envEnable("OPENBOX_RENDERBOX", default: buildForDarwinPlatform && !isSPIBuild)
let renderBoxCondition = envEnable("OPENRENDERBOX_RENDERBOX", default: buildForDarwinPlatform && !isSPIBuild)
if renderBoxCondition {
openSwiftUICoreTarget.addRBSettings()
openSwiftUITarget.addRBSettings()
Expand Down Expand Up @@ -540,8 +540,8 @@ if linkCoreUI {
if useLocalDeps {
var dependencies: [Package.Dependency] = [
.package(path: "../OpenCoreGraphics"),
.package(path: "../OpenGraph"),
.package(path: "../OpenBox"),
.package(path: "../OpenAttributeGraph"),
.package(path: "../OpenRenderBox"),
]
if attributeGraphCondition || renderBoxCondition || linkCoreUI {
dependencies.append(.package(path: "../DarwinPrivateFrameworks"))
Expand All @@ -551,8 +551,8 @@ if useLocalDeps {
var dependencies: [Package.Dependency] = [
.package(url: "https://github.com/OpenSwiftUIProject/OpenCoreGraphics", branch: "main"),
// FIXME: on Linux platform: OG contains unsafe build flags which prevents us using version dependency
.package(url: "https://github.com/OpenSwiftUIProject/OpenGraph", branch: "main"),
.package(url: "https://github.com/OpenSwiftUIProject/OpenBox", branch: "main"),
.package(url: "https://github.com/OpenSwiftUIProject/OpenAttributeGraph", branch: "main"),
.package(url: "https://github.com/OpenSwiftUIProject/OpenRenderBox", branch: "main"),
]
if attributeGraphCondition || renderBoxCondition || linkCoreUI {
dependencies.append(.package(url: "https://github.com/OpenSwiftUIProject/DarwinPrivateFrameworks.git", branch: "main"))
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The author of this project is not responsible for any consequences that may aris
See Example folder and try it with ExampleApp

> [!IMPORTANT]
> Clone OpenGraph in the same directory before running the example.
> Clone OpenAttributeGraph in the same directory before running the example.
>
> See [Example/README.md](Example/README.md) for more detail.

Expand Down Expand Up @@ -99,7 +99,7 @@ for various platforms:
[^4]: Build is supported. Test is not supported yet dut to upstream issue.

> [!NOTE]
> The cross-platform OpenGraph is not fully implemented.
> The cross-platform OpenAttributeGraph is not fully implemented.
>
> It is only API compatible with AttributeGraph now.
>
Expand Down
4 changes: 2 additions & 2 deletions Scripts/CI/darwin_setup_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ REPO_ROOT="$(dirname $(dirname $(dirname $(filepath $0))))"
cd $REPO_ROOT

Scripts/CI/opencoregraphics_setup.sh
Scripts/CI/og_setup.sh
Scripts/CI/ob_setup.sh
Scripts/CI/openattributegraph_setup.sh
Scripts/CI/openrenderbox_setup.sh
Scripts/CI/framework_setup.sh
Loading
Loading