Skip to content

Commit 8bbe54f

Browse files
authored
Merge pull request swiftlang#257 from apple/enable-new-build-system
Enable new build system
2 parents ed225d6 + 4258c59 commit 8bbe54f

File tree

2 files changed

+3
-40
lines changed

2 files changed

+3
-40
lines changed

project_future.py

-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ def get_build_command(self, incremental=False):
118118
+ ['CODE_SIGN_IDENTITY=',
119119
'CODE_SIGNING_REQUIRED=NO',
120120
'ENABLE_BITCODE=NO',
121-
'-UseNewBuildSystem=NO',
122121
'INDEX_ENABLE_DATA_STORE=NO',
123122
'GCC_TREAT_WARNINGS_AS_ERRORS=NO',
124123
'SWIFT_TREAT_WARNINGS_AS_ERRORS=NO'])

projects.json

+3-39
Original file line numberDiff line numberDiff line change
@@ -1500,17 +1500,7 @@
15001500
"project": "ProcedureKit.xcodeproj",
15011501
"target": "ProcedureKit",
15021502
"destination": "generic/platform=watchOS",
1503-
"configuration": "Release",
1504-
"xfail": {
1505-
"compatibility": {
1506-
"3.0": {
1507-
"branch": {
1508-
"master": "https://bugs.swift.org/browse/SR-8780",
1509-
"swift-4.2-branch": "https://bugs.swift.org/browse/SR-8780"
1510-
}
1511-
}
1512-
}
1513-
}
1503+
"configuration": "Release"
15141504
},
15151505
{
15161506
"action": "BuildXcodeProjectTarget",
@@ -1581,17 +1571,7 @@
15811571
"project": "PromiseKit.xcodeproj",
15821572
"target": "PromiseKit",
15831573
"destination": "generic/platform=watchOS",
1584-
"configuration": "Release",
1585-
"xfail": {
1586-
"compatibility": {
1587-
"4.0.3": {
1588-
"branch": {
1589-
"master": "https://bugs.swift.org/browse/SR-8781",
1590-
"swift-4.2-branch": "https://bugs.swift.org/browse/SR-8781"
1591-
}
1592-
}
1593-
}
1594-
}
1574+
"configuration": "Release"
15951575
},
15961576
{
15971577
"action": "BuildXcodeProjectTarget",
@@ -2637,23 +2617,7 @@
26372617
"project": "Mapper.xcodeproj",
26382618
"target": "Mapper",
26392619
"destination": "generic/platform=watchOS",
2640-
"configuration": "Release",
2641-
"xfail": {
2642-
"compatibility": {
2643-
"4.0": {
2644-
"branch": {
2645-
"master": "https://bugs.swift.org/browse/SR-8778",
2646-
"swift-4.2-branch": "https://bugs.swift.org/browse/SR-8778"
2647-
}
2648-
},
2649-
"4.2": {
2650-
"branch": {
2651-
"master": "https://bugs.swift.org/browse/SR-8778",
2652-
"swift-4.2-branch": "https://bugs.swift.org/browse/SR-8778"
2653-
}
2654-
}
2655-
}
2656-
}
2620+
"configuration": "Release"
26572621
},
26582622
{
26592623
"action": "BuildSwiftPackage",

0 commit comments

Comments
 (0)