Skip to content

Commit da2fffb

Browse files
authored
Add -no-verify-emitted-module-interface (#282)
1 parent a6e1540 commit da2fffb

File tree

5 files changed

+7
-12
lines changed

5 files changed

+7
-12
lines changed

.github/workflows/compatibility_tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,10 @@ jobs:
2323
OPENSWIFTUI_SWIFT_CRYPTO: 0
2424
OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
2525
OPENSWIFTUI_USE_LOCAL_DEPS: 1
26-
OPENSWIFTUI_LIBRARY_EVOLUTION: 0
2726
OPENGRAPH_USE_LOCAL_DEPS: 1
2827
OPENGRAPH_TARGET_RELEASE: ${{ matrix.release }}
29-
OPENGRAPH_LIBRARY_EVOLUTION: 0
3028
OPENBOX_USE_LOCAL_DEPS: 1
3129
OPENBOX_TARGET_RELEASE: ${{ matrix.release }}
32-
OPENBOX_LIBRARY_EVOLUTION: 0
3330
DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }}
3431
GH_TOKEN: ${{ github.token }}
3532
steps:

.github/workflows/macos.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,10 @@ jobs:
2424
OPENSWIFTUI_SWIFT_CRYPTO: 0
2525
OPENSWIFTUI_TARGET_RELEASE: ${{ matrix.release }}
2626
OPENSWIFTUI_USE_LOCAL_DEPS: 1
27-
OPENSWIFTUI_LIBRARY_EVOLUTION: 0
2827
OPENGRAPH_USE_LOCAL_DEPS: 1
2928
OPENGRAPH_TARGET_RELEASE: ${{ matrix.release }}
30-
OPENGRAPH_LIBRARY_EVOLUTION: 0
3129
OPENBOX_USE_LOCAL_DEPS: 1
3230
OPENBOX_TARGET_RELEASE: ${{ matrix.release }}
33-
OPENBOX_LIBRARY_EVOLUTION: 0
3431
DARWIN_PRIVATE_FRAMEWORKS_TARGET_RELEASE: ${{ matrix.release }}
3532
GH_TOKEN: ${{ github.token }}
3633
steps:

Package.resolved

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"originHash" : "b8dba5018ecd3b79f322feb006138a2525dcd0f4c48de35ff3b0b8786ebe71e3",
2+
"originHash" : "1df077467751f44b627f08159392681d925d1fefdccc1e49aa5e0006d811e9ff",
33
"pins" : [
44
{
55
"identity" : "darwinprivateframeworks",
@@ -16,7 +16,7 @@
1616
"location" : "https://github.com/OpenSwiftUIProject/OpenBox",
1717
"state" : {
1818
"branch" : "main",
19-
"revision" : "fb184f50625b66bfab4c6cb629621734a36e5e95"
19+
"revision" : "7ef2877a64b30ccf5b42297d2871b57b4b3e4cdd"
2020
}
2121
},
2222
{
@@ -25,7 +25,7 @@
2525
"location" : "https://github.com/OpenSwiftUIProject/OpenGraph",
2626
"state" : {
2727
"branch" : "main",
28-
"revision" : "b71c1d472b2dd054ebc4eae32243e47f78404168"
28+
"revision" : "5d2296f685b461c53432be78373a5c9a4f80fff3"
2929
}
3030
},
3131
{

Package.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,9 @@ let libraryEvolutionCondition = envEnable("OPENSWIFTUI_LIBRARY_EVOLUTION")
139139
#endif
140140

141141
if libraryEvolutionCondition {
142-
// NOTE: -enable-library-evolution is not supported on `swift build` yet.
143-
sharedSwiftSettings.append(.unsafeFlags(["-enable-library-evolution"]))
142+
// NOTE: -enable-library-evolution will cause module verify failure for `swift build`.
143+
// Either set OPENSWIFTUI_LIBRARY_EVOLUTION=0 or add `-Xswiftc -no-verify-emitted-module-interface` after `swift build`
144+
sharedSwiftSettings.append(.unsafeFlags(["-enable-library-evolution", "-no-verify-emitted-module-interface"]))
144145
}
145146

146147
// MARK: - CoreGraphicsShims Target

Scripts/openswiftui_swiftinterface.sh renamed to Scripts/build_swiftinterface.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ OPENSWIFTUI_ROOT="$(dirname $(dirname $(filepath $0)))"
99

1010
cd $OPENSWIFTUI_ROOT
1111

12-
swift build -Xswiftc -emit-module-interface -Xswiftc -enable-library-evolution -Xswiftc -no-verify-emitted-module-interface
12+
swift build -Xswiftc -emit-module-interface -Xswiftc -enable-library-evolution -Xswiftc -no-verify-emitted-module-interface

0 commit comments

Comments
 (0)