Skip to content

Commit cdcc9f6

Browse files
committed
Update header layout
1 parent 8ca3584 commit cdcc9f6

24 files changed

+12
-8
lines changed

Package.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ default:
6868
}
6969

7070
var sharedSwiftSettings: [SwiftSetting] = [
71-
.enableExperimentalFeature("AccessLevelOnImport"),
71+
.enableUpcomingFeature("BareSlashRegexLiterals"),
72+
// .enableUpcomingFeature("InternalImportsByDefault"),
7273
.define("OPENSWIFTUI_SUPPRESS_DEPRECATED_WARNINGS"),
7374
.define("OPENSWIFTUI_RELEASE_\(releaseVersion)"),
7475
.swiftLanguageMode(.v5),
75-
.enableUpcomingFeature("BareSlashRegexLiterals"),
7676
]
7777

7878
if releaseVersion >= 2021 {
@@ -144,7 +144,8 @@ let package = Package(
144144
products: [
145145
.library(name: "OpenSwiftUI", targets: ["OpenSwiftUI", "OpenSwiftUIExtension"]),
146146
// FIXME: This will block xcodebuild build(iOS CI) somehow
147-
// .library(name: "COpenSwiftUI", targets: ["COpenSwiftUI"]),
147+
.library(name: "COpenSwiftUI", targets: ["COpenSwiftUI"]),
148+
.library(name: "COpenSwiftUICore", targets: ["COpenSwiftUICore"]),
148149
],
149150
targets: [
150151
// TODO: Add SwiftGTK as an backend alternative for UIKit/AppKit on Linux and macOS
@@ -169,6 +170,7 @@ let package = Package(
169170
),
170171
.target(
171172
name: "COpenSwiftUICore",
173+
publicHeadersPath: ".",
172174
cSettings: [
173175
.unsafeFlags(["-I", includePath], .when(platforms: .nonDarwinPlatforms)),
174176
.define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),

[email protected]

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,11 @@ default:
6565
}
6666

6767
var sharedSwiftSettings: [SwiftSetting] = [
68+
.enableUpcomingFeature("BareSlashRegexLiterals"),
6869
.enableExperimentalFeature("AccessLevelOnImport"),
70+
// .enableUpcomingFeature("InternalImportsByDefault"),
6971
.define("OPENSWIFTUI_SUPPRESS_DEPRECATED_WARNINGS"),
7072
.define("OPENSWIFTUI_RELEASE_\(releaseVersion)"),
71-
.enableUpcomingFeature("BareSlashRegexLiterals"),
7273
]
7374

7475
if releaseVersion >= 2021 {

Sources/OpenSwiftUI/Integration/UIKit/UIGraphicsView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Status: Complete
77

88
#if os(iOS)
9-
internal import COpenSwiftUI
9+
internal import COpenSwiftUICore
1010
import UIKit
1111

1212
class _UIGraphicsView: UIView {

Sources/OpenSwiftUI/Test/_PerformanceTest.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import UIKit
1111
import AppKit
1212
#endif
1313

14-
internal import COpenSwiftUI
14+
internal import COpenSwiftUICore
1515

1616
public protocol _PerformanceTest: _Test {
1717
var name: String { get }

Sources/OpenSwiftUI/View/Control/Button/ButtonStyle/ButtonDefaultRenderingModeModifier.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Status: Complete
77
// ID: 6C985860B64B768EC9A2691B5DBA71A0
88

9-
internal import COpenSwiftUI
9+
internal import COpenSwiftUICore
1010

1111
extension View {
1212
func buttonDefaultRenderingMode() -> some View {

Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ package final class ViewGraph: GraphHost {
8080
let rootView = _GraphValue<Body>(view.unsafeCast(to: Body.self))
8181
return Body._makeView(view: rootView, inputs: inputs)
8282
}
83+
fatalError()
8384
super.init(data: data)
8485
OGSubgraph.current = nil
8586
#else
@@ -107,7 +108,7 @@ package final class ViewGraph: GraphHost {
107108
#if canImport(Darwin)
108109
instantiateIfNeeded()
109110

110-
let oldCachedSizeThatFits = cachedSizeThatFits
111+
// let oldCachedSizeThatFits = cachedSizeThatFits
111112

112113
var preferencesChanged = false
113114
var observedSizeThatFitsChanged = false

0 commit comments

Comments
 (0)