Skip to content

Commit 9938504

Browse files
Kyle-YeKyle-Ye
authored
[Bugfix] Remove werror (#623)
1 parent 48a1db0 commit 9938504

File tree

9 files changed

+24
-55
lines changed

9 files changed

+24
-55
lines changed

‎.github/workflows/compatibility_tests.yml‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,12 @@ jobs:
1717
release: [2024]
1818
runs-on: ${{ matrix.os }}
1919
env:
20-
OPENSWIFTUI_WERROR: 1
21-
OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1
20+
OPENSWIFTUI_WERROR: 0 # Disable it to avoid enable OAG's werror and hit conflicts
21+
OPENSWIFTUI_ATTRIBUTEGRAPH: 1
2222
OPENSWIFTUI_SWIFT_LOG: 0
2323
OPENSWIFTUI_SWIFT_CRYPTO: 0
2424
OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
2525
OPENSWIFTUI_USE_LOCAL_DEPS: 1
26-
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
27-
OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }}
28-
OPENRENDERBOX_USE_LOCAL_DEPS: 1
29-
OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }}
30-
DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }}
3126
OPENSWIFTUI_LINK_TESTING: 1
3227
GH_TOKEN: ${{ github.token }}
3328
steps:
@@ -67,18 +62,13 @@ jobs:
6762
ios-simulator-name: "iPhone 16 Pro"
6863
runs-on: ${{ matrix.os }}
6964
env:
70-
OPENSWIFTUI_WERROR: 1
71-
OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1
65+
OPENSWIFTUI_WERROR: 0 # Disable it to avoid enable OAG's werror and hit conflicts
66+
OPENSWIFTUI_ATTRIBUTEGRAPH: 1
7267
OPENSWIFTUI_SWIFT_LOG: 0
7368
OPENSWIFTUI_SWIFT_CRYPTO: 0
7469
OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
7570
OPENSWIFTUI_SUPPORT_MULTI_PRODUCTS: 0
7671
OPENSWIFTUI_USE_LOCAL_DEPS: 1
77-
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
78-
OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }}
79-
OPENRENDERBOX_USE_LOCAL_DEPS: 1
80-
OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }}
81-
DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }}
8272
OPENSWIFTUI_LINK_TESTING: 1
8373
GH_TOKEN: ${{ github.token }}
8474
steps:

‎.github/workflows/ios.yml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,14 @@ jobs:
2121
ios-simulator-name: "iPhone 16 Pro"
2222
runs-on: ${{ matrix.os }}
2323
env:
24-
OPENSWIFTUI_WERROR: 1
25-
OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1
24+
OPENSWIFTUI_WERROR: 0 # Disable it to avoid enable OAG's werror and hit conflicts
25+
OPENSWIFTUI_ATTRIBUTEGRAPH: 1
2626
OPENSWIFTUI_COMPATIBILITY_TEST: 0
2727
OPENSWIFTUI_SWIFT_LOG: 0
2828
OPENSWIFTUI_SWIFT_CRYPTO: 0
2929
OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
3030
OPENSWIFTUI_SUPPORT_MULTI_PRODUCTS: 0
3131
OPENSWIFTUI_USE_LOCAL_DEPS: 1
32-
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
33-
OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }}
34-
OPENRENDERBOX_USE_LOCAL_DEPS: 1
35-
OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }}
36-
DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }}
3732
OPENSWIFTUI_LINK_TESTING: 1
3833
GH_TOKEN: ${{ github.token }}
3934
steps:

‎.github/workflows/macos.yml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,13 @@ jobs:
1717
release: [2024]
1818
runs-on: ${{ matrix.os }}
1919
env:
20-
OPENSWIFTUI_WERROR: 1
21-
OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1
20+
OPENSWIFTUI_WERROR: 0 # Disable it to avoid enable OAG's werror and hit conflicts
21+
OPENSWIFTUI_ATTRIBUTEGRAPH: 1
2222
OPENSWIFTUI_COMPATIBILITY_TEST: 0
2323
OPENSWIFTUI_SWIFT_LOG: 0
2424
OPENSWIFTUI_SWIFT_CRYPTO: 0
2525
OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
2626
OPENSWIFTUI_USE_LOCAL_DEPS: 1
27-
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
28-
OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }}
29-
OPENRENDERBOX_USE_LOCAL_DEPS: 1
30-
OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }}
31-
DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }}
3227
OPENSWIFTUI_LINK_TESTING: 1
3328
GH_TOKEN: ${{ github.token }}
3429
steps:

‎.github/workflows/ubuntu.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
swift_version: ["6.1.0"]
1616
runs-on: ubuntu-22.04
1717
env:
18-
OPENSWIFTUI_WERROR: 1
19-
OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 0
18+
OPENSWIFTUI_WERROR: 0 # Disable it to avoid enable OAG's werror and hit conflicts
19+
OPENSWIFTUI_ATTRIBUTEGRAPH: 0
2020
OPENSWIFTUI_COMPATIBILITY_TEST: 0
2121
OPENSWIFTUI_SWIFT_LOG: 1
2222
OPENSWIFTUI_SWIFT_CRYPTO: 1

‎.github/workflows/uitests.yml‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,14 @@ jobs:
2121
ios-simulator-name: "iPhone 16 Pro"
2222
runs-on: ${{ matrix.os }}
2323
env:
24-
OPENSWIFTUI_WERROR: 1
25-
OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1
24+
OPENSWIFTUI_WERROR: 0 # Disable it to avoid enable OAG's werror and hit conflicts
25+
OPENSWIFTUI_ATTRIBUTEGRAPH: 1
2626
OPENSWIFTUI_COMPATIBILITY_TEST: 0
2727
OPENSWIFTUI_SWIFT_LOG: 0
2828
OPENSWIFTUI_SWIFT_CRYPTO: 0
2929
OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
3030
OPENSWIFTUI_SUPPORT_MULTI_PRODUCTS: 0
3131
OPENSWIFTUI_USE_LOCAL_DEPS: 1
32-
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
33-
OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }}
34-
OPENRENDERBOX_USE_LOCAL_DEPS: 1
35-
OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }}
36-
DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }}
3732
OPENSWIFTUI_LINK_TESTING: 0
3833
GH_TOKEN: ${{ github.token }}
3934
steps:
@@ -74,19 +69,14 @@ jobs:
7469
release: [2024]
7570
runs-on: ${{ matrix.os }}
7671
env:
77-
OPENSWIFTUI_WERROR: 1
78-
OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH: 1
72+
OPENSWIFTUI_WERROR: 0 # Disable it to avoid enable OAG's werror and hit conflicts
73+
OPENSWIFTUI_ATTRIBUTEGRAPH: 1
7974
OPENSWIFTUI_COMPATIBILITY_TEST: 0
8075
OPENSWIFTUI_SWIFT_LOG: 0
8176
OPENSWIFTUI_SWIFT_CRYPTO: 0
8277
OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
8378
OPENSWIFTUI_SUPPORT_MULTI_PRODUCTS: 0
8479
OPENSWIFTUI_USE_LOCAL_DEPS: 1
85-
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
86-
OPENATTRIBUTEGRAPH_TARGET_RELEASE: ${{ matrix.release }}
87-
OPENRENDERBOX_USE_LOCAL_DEPS: 1
88-
OPENRENDERBOX_TARGET_RELEASE: ${{ matrix.release }}
89-
DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }}
9080
GH_TOKEN: ${{ github.token }}
9181
steps:
9282
- uses: actions/checkout@v4

‎Example/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ extension Target {
5555
dependencies.append(.product(name: "AttributeGraph", package: "OpenAttributeGraph"))
5656

5757
var swiftSettings = swiftSettings ?? []
58-
swiftSettings.append(.define("OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH"))
58+
swiftSettings.append(.define("OPENSWIFTUI_ATTRIBUTEGRAPH"))
5959
self.swiftSettings = swiftSettings
6060
}
6161
}

‎Package.resolved‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.swift‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,6 @@ if releaseVersion >= 2021 {
268268
sharedSwiftSettings.append(.define("OPENSWIFTUI_SUPPORT_\(year)_API"))
269269
}
270270
}
271-
if warningsAsErrorsCondition {
272-
sharedSwiftSettings.append(.unsafeFlags(["-warnings-as-errors"]))
273-
}
274271
if libraryEvolutionCondition {
275272
// NOTE: -enable-library-evolution will cause module verify failure for `swift build`.
276273
// Either set OPENSWIFTUI_LIBRARY_EVOLUTION=0 or add `-Xswiftc -no-verify-emitted-module-interface` after `swift build`
@@ -384,7 +381,7 @@ extension Target {
384381
// "could not determine executable path for bundle 'AttributeGraph.framework'"
385382
dependencies.append(.product(name: "AttributeGraph", package: "DarwinPrivateFrameworks"))
386383
var swiftSettings = swiftSettings ?? []
387-
swiftSettings.append(.define("OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH"))
384+
swiftSettings.append(.define("OPENSWIFTUI_ATTRIBUTEGRAPH"))
388385
self.swiftSettings = swiftSettings
389386
}
390387

@@ -796,7 +793,9 @@ if renderBoxCondition {
796793
}
797794

798795
if attributeGraphCondition || renderBoxCondition {
799-
let release = Context.environment["DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE"].flatMap { Int($0) } ?? 2024
796+
let release = EnvManager.shared.withDomain("DarwinPrivateFrameworks") {
797+
envIntValue("TARGET_RELEASE", default: 2024)
798+
}
800799
package.platforms = switch release {
801800
case 2024: [.iOS(.v18), .macOS(.v15), .macCatalyst(.v18), .tvOS(.v18), .watchOS(.v10), .visionOS(.v2)]
802801
default: nil

‎Tests/OpenSwiftUICoreTests/Data/Environment/EnvironmentKeyTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ struct EnvironmentKeyTests {
3333
#expect(OptionalStringEnvironmentKey._valuesEqual(nil, "test") == false)
3434
}
3535

36-
#if OPENATTRIBUTEGRAPH_ATTRIBUTEGRAPH // FIXME: compareValues is not implemented on OAG yet
36+
#if OPENSWIFTUI_ATTRIBUTEGRAPH // FIXME: compareValues is not implemented on OAG yet
3737
@Test
3838
func nonEquatableValuesComparison() {
3939
let struct1 = CustomStructEnvironmentKey.CustomStruct(value: 100)

0 commit comments

Comments
 (0)