Skip to content

Commit 6950bea

Browse files
e78le78l
committed
Fix macOS build errors, Swift 4
1 parent 1b58627 commit 6950bea

File tree

11 files changed

+258
-33
lines changed

11 files changed

+258
-33
lines changed

‎CoreFoundation/Base.subproj/CFRuntime.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ void __CFInitialize(void) {
10101010
#if TARGET_OS_LINUX
10111011
#define __CFSwiftGetBaseClass _T010Foundation21__CFSwiftGetBaseClassyXlXpyF
10121012
#elif TARGET_OS_MAC
1013-
#define __CFSwiftGetBaseClass _T015SwiftFoundation21__CFSwiftGetBaseClassyXlXpyF
1013+
#define __CFSwiftGetBaseClass _T015SwiftFoundation21__CFSwiftGetBaseClasss9AnyObject_pXpyF
10141014
#endif
10151015
#endif
10161016
extern uintptr_t __CFSwiftGetBaseClass();

‎CoreFoundation/Base.subproj/SymbolAliases

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22

33
# This is specific to Swift open source; Foundation's NSCFConstantString is used as our constant string class reference
4-
__TMC15SwiftFoundation19_NSCFConstantString ___CFConstantStringClassReference
4+
__T015SwiftFoundation19_NSCFConstantStringCN ___CFConstantStringClassReference
55

66
_kCFCalendarIdentifierBuddhist _kCFBuddhistCalendar
77
_kCFCalendarIdentifierChinese _kCFChineseCalendar

‎Foundation.xcodeproj/project.pbxproj

Lines changed: 130 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
5BDC3FCE1BCF17D300ED97BB /* NSCFDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BDC3FCD1BCF17D300ED97BB /* NSCFDictionary.swift */; };
267267
5BDC3FD01BCF17E600ED97BB /* NSCFSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BDC3FCF1BCF17E600ED97BB /* NSCFSet.swift */; };
268268
5BDC406C1BD6D89300ED97BB /* SwiftFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B5D885D1BBC938800234F36 /* SwiftFoundation.framework */; };
269-
5BDC406E1BD6D8C400ED97BB /* SwiftFoundation.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5B5D885D1BBC938800234F36 /* SwiftFoundation.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
269+
5BDC406E1BD6D8C400ED97BB /* SwiftFoundation.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5B5D885D1BBC938800234F36 /* SwiftFoundation.framework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
270270
5BDF62901C1A550800A89075 /* CFRegularExpression.c in Sources */ = {isa = PBXBuildFile; fileRef = 5BDF628E1C1A550800A89075 /* CFRegularExpression.c */; };
271271
5BDF62911C1A550800A89075 /* CFRegularExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = 5BDF628F1C1A550800A89075 /* CFRegularExpression.h */; settings = {ATTRIBUTES = (Private, ); }; };
272272
5BECBA361D1CACC500B39B1F /* NSMeasurementFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B628EDE1D1C995C00CA9570 /* NSMeasurementFormatter.swift */; };
@@ -315,6 +315,9 @@
315315
7900433B1CACD33E00ECCBF1 /* TestNSCompoundPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790043391CACD33E00ECCBF1 /* TestNSCompoundPredicate.swift */; };
316316
7900433C1CACD33E00ECCBF1 /* TestNSPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7900433A1CACD33E00ECCBF1 /* TestNSPredicate.swift */; };
317317
90E645DF1E4C89A400D0D47C /* TestNSCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90E645DE1E4C89A400D0D47C /* TestNSCache.swift */; };
318+
9F0DD3521ECD73D000F68030 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0041781ECD5962004138BD /* main.swift */; };
319+
9F0DD3531ECD73D200F68030 /* XDGTestHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F4ADBD21ECD506E001F0B3D /* XDGTestHelper.swift */; };
320+
9F0DD3571ECD783500F68030 /* SwiftFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B5D885D1BBC938800234F36 /* SwiftFoundation.framework */; };
318321
AE35A1861CBAC85E0042DB84 /* SwiftFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = AE35A1851CBAC85E0042DB84 /* SwiftFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
319322
BD8042161E09857800487EB8 /* TestNSLengthFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD8042151E09857800487EB8 /* TestNSLengthFormatter.swift */; };
320323
BDBB65901E256BFA001A7286 /* TestNSEnergyFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDBB658F1E256BFA001A7286 /* TestNSEnergyFormatter.swift */; };
@@ -763,6 +766,11 @@
763766
84BA558D1C16F90900F48C54 /* TestNSTimeZone.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSTimeZone.swift; sourceTree = "<group>"; };
764767
88D28DE61C13AE9000494606 /* TestNSGeometry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSGeometry.swift; sourceTree = "<group>"; };
765768
90E645DE1E4C89A400D0D47C /* TestNSCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSCache.swift; sourceTree = "<group>"; };
769+
9F0041781ECD5962004138BD /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
770+
9F0DD33F1ECD734200F68030 /* xdgTestHelper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = xdgTestHelper.app; sourceTree = BUILT_PRODUCTS_DIR; };
771+
9F0DD34F1ECD737B00F68030 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
772+
9F4ADBB61ECD445E001F0B3D /* SymbolAliases */ = {isa = PBXFileReference; lastKnownFileType = text; path = SymbolAliases; sourceTree = "<group>"; };
773+
9F4ADBD21ECD506E001F0B3D /* XDGTestHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = XDGTestHelper.swift; path = ../XDGTestHelper.swift; sourceTree = "<group>"; };
766774
A5A34B551C18C85D00FD972B /* TestNSByteCountFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSByteCountFormatter.swift; sourceTree = "<group>"; };
767775
AE35A1851CBAC85E0042DB84 /* SwiftFoundation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SwiftFoundation.h; sourceTree = "<group>"; };
768776
BD8042151E09857800487EB8 /* TestNSLengthFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSLengthFormatter.swift; sourceTree = "<group>"; };
@@ -922,6 +930,14 @@
922930
);
923931
runOnlyForDeploymentPostprocessing = 0;
924932
};
933+
9F0DD33C1ECD734200F68030 /* Frameworks */ = {
934+
isa = PBXFrameworksBuildPhase;
935+
buildActionMask = 2147483647;
936+
files = (
937+
9F0DD3571ECD783500F68030 /* SwiftFoundation.framework in Frameworks */,
938+
);
939+
runOnlyForDeploymentPostprocessing = 0;
940+
};
925941
EA66F66C1BF56CCB00136161 /* Frameworks */ = {
926942
isa = PBXFrameworksBuildPhase;
927943
buildActionMask = 2147483647;
@@ -976,6 +992,7 @@
976992
5BDC405C1BD6D83B00ED97BB /* TestFoundation.app */,
977993
5B7C8A6E1BEA7F8F00C5B690 /* libCoreFoundation.a */,
978994
EA66F66F1BF56CCB00136161 /* plutil */,
995+
9F0DD33F1ECD734200F68030 /* xdgTestHelper.app */,
979996
);
980997
name = Products;
981998
sourceTree = "<group>";
@@ -1017,6 +1034,7 @@
10171034
5B5D895B1BBDAB7E00234F36 /* CoreFoundation.h */,
10181035
5B5D88C61BBC983600234F36 /* ForFoundationOnly.h */,
10191036
5BF7AEC21BCD568D008F214A /* ForSwiftFoundationOnly.h */,
1037+
9F4ADBB61ECD445E001F0B3D /* SymbolAliases */,
10201038
EA66F6321BEECC7400136161 /* SwiftRuntime */,
10211039
);
10221040
name = Base;
@@ -1296,6 +1314,16 @@
12961314
path = Foundation;
12971315
sourceTree = "<group>";
12981316
};
1317+
9F4ADBCF1ECD4F56001F0B3D /* xdgTestHelper */ = {
1318+
isa = PBXGroup;
1319+
children = (
1320+
9F0DD34F1ECD737B00F68030 /* Info.plist */,
1321+
9F4ADBD21ECD506E001F0B3D /* XDGTestHelper.swift */,
1322+
9F0041781ECD5962004138BD /* main.swift */,
1323+
);
1324+
path = xdgTestHelper;
1325+
sourceTree = "<group>";
1326+
};
12991327
EA66F6321BEECC7400136161 /* SwiftRuntime */ = {
13001328
isa = PBXGroup;
13011329
children = (
@@ -1311,6 +1339,7 @@
13111339
children = (
13121340
1520469A1D8AEABE00D02E36 /* HTTPServer.swift */,
13131341
EA66F6381BF1619600136161 /* main.swift */,
1342+
9F4ADBCF1ECD4F56001F0B3D /* xdgTestHelper */,
13141343
EA66F65A1BF1976100136161 /* Tests */,
13151344
EA66F6391BF1619600136161 /* Resources */,
13161345
);
@@ -1893,6 +1922,23 @@
18931922
productReference = 5BDC405C1BD6D83B00ED97BB /* TestFoundation.app */;
18941923
productType = "com.apple.product-type.bundle";
18951924
};
1925+
9F0DD33E1ECD734200F68030 /* xdgTestHelper */ = {
1926+
isa = PBXNativeTarget;
1927+
buildConfigurationList = 9F0DD34B1ECD734200F68030 /* Build configuration list for PBXNativeTarget "xdgTestHelper" */;
1928+
buildPhases = (
1929+
9F0DD33B1ECD734200F68030 /* Sources */,
1930+
9F0DD33C1ECD734200F68030 /* Frameworks */,
1931+
9F0DD33D1ECD734200F68030 /* Resources */,
1932+
);
1933+
buildRules = (
1934+
);
1935+
dependencies = (
1936+
);
1937+
name = xdgTestHelper;
1938+
productName = xdgTestHelper;
1939+
productReference = 9F0DD33F1ECD734200F68030 /* xdgTestHelper.app */;
1940+
productType = "com.apple.product-type.application";
1941+
};
18961942
EA66F66E1BF56CCB00136161 /* plutil */ = {
18971943
isa = PBXNativeTarget;
18981944
buildConfigurationList = EA66F6751BF56CCB00136161 /* Build configuration list for PBXNativeTarget "plutil" */;
@@ -1916,7 +1962,7 @@
19161962
5B5D88541BBC938800234F36 /* Project object */ = {
19171963
isa = PBXProject;
19181964
attributes = {
1919-
LastSwiftUpdateCheck = 0720;
1965+
LastSwiftUpdateCheck = 0830;
19201966
LastUpgradeCheck = 0800;
19211967
ORGANIZATIONNAME = Apple;
19221968
TargetAttributes = {
@@ -1937,6 +1983,10 @@
19371983
LastSwiftUpdateCheck = 0800;
19381984
ProvisioningStyle = Manual;
19391985
};
1986+
9F0DD33E1ECD734200F68030 = {
1987+
CreatedOnToolsVersion = 8.3.2;
1988+
ProvisioningStyle = Automatic;
1989+
};
19401990
EA66F66E1BF56CCB00136161 = {
19411991
CreatedOnToolsVersion = 7.1;
19421992
LastSwiftMigration = 0800;
@@ -1951,6 +2001,7 @@
19512001
hasScannedForEncodings = 0;
19522002
knownRegions = (
19532003
en,
2004+
Base,
19542005
);
19552006
mainGroup = 5B5D88531BBC938800234F36;
19562007
productRefGroup = 5B5D885E1BBC938800234F36 /* Products */;
@@ -1961,6 +2012,7 @@
19612012
5BDC405B1BD6D83B00ED97BB /* TestFoundation */,
19622013
5B7C8A6D1BEA7F8F00C5B690 /* CoreFoundation */,
19632014
EA66F66E1BF56CCB00136161 /* plutil */,
2015+
9F0DD33E1ECD734200F68030 /* xdgTestHelper */,
19642016
);
19652017
};
19662018
/* End PBXProject section */
@@ -1996,6 +2048,13 @@
19962048
);
19972049
runOnlyForDeploymentPostprocessing = 0;
19982050
};
2051+
9F0DD33D1ECD734200F68030 /* Resources */ = {
2052+
isa = PBXResourcesBuildPhase;
2053+
buildActionMask = 2147483647;
2054+
files = (
2055+
);
2056+
runOnlyForDeploymentPostprocessing = 0;
2057+
};
19992058
/* End PBXResourcesBuildPhase section */
20002059

20012060
/* Begin PBXSourcesBuildPhase section */
@@ -2321,6 +2380,15 @@
23212380
);
23222381
runOnlyForDeploymentPostprocessing = 0;
23232382
};
2383+
9F0DD33B1ECD734200F68030 /* Sources */ = {
2384+
isa = PBXSourcesBuildPhase;
2385+
buildActionMask = 2147483647;
2386+
files = (
2387+
9F0DD3521ECD73D000F68030 /* main.swift in Sources */,
2388+
9F0DD3531ECD73D200F68030 /* XDGTestHelper.swift in Sources */,
2389+
);
2390+
runOnlyForDeploymentPostprocessing = 0;
2391+
};
23242392
EA66F66B1BF56CCB00136161 /* Sources */ = {
23252393
isa = PBXSourcesBuildPhase;
23262394
buildActionMask = 2147483647;
@@ -2498,7 +2566,7 @@
24982566
r,
24992567
r,
25002568
);
2501-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
2569+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -swift-version 3";
25022570
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation;
25032571
PRODUCT_NAME = "$(TARGET_NAME)";
25042572
SKIP_INSTALL = YES;
@@ -2570,7 +2638,7 @@
25702638
r,
25712639
r,
25722640
);
2573-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
2641+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -swift-version 3";
25742642
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation;
25752643
PRODUCT_NAME = "$(TARGET_NAME)";
25762644
SKIP_INSTALL = YES;
@@ -2612,6 +2680,8 @@
26122680
"-DCF_CHARACTERSET_UNICODE_DATA_B=\\\\\"CoreFoundation/CharacterSets/CFUnicodeData-B.mapping\\\\\"",
26132681
"-DCF_CHARACTERSET_UNICHAR_DB=\\\\\"CoreFoundation/CharacterSets/CFUniCharPropertyDatabase.data\\\\\"",
26142682
"-DCF_CHARACTERSET_BITMAP=\\\\\"CoreFoundation/CharacterSets/CFCharacterSetBitmaps.bitmap\\\\\"",
2683+
"-Wno-nullability-completeness-on-arrays",
2684+
"-Wno-format-security",
26152685
);
26162686
PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/CoreFoundation;
26172687
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2652,6 +2722,8 @@
26522722
"-DCF_CHARACTERSET_UNICODE_DATA_B=\\\\\"CoreFoundation/CharacterSets/CFUnicodeData-B.mapping\\\\\"",
26532723
"-DCF_CHARACTERSET_UNICHAR_DB=\\\\\"CoreFoundation/CharacterSets/CFUniCharPropertyDatabase.data\\\\\"",
26542724
"-DCF_CHARACTERSET_BITMAP=\\\\\"CoreFoundation/CharacterSets/CFCharacterSetBitmaps.bitmap\\\\\"",
2725+
"-Wno-nullability-completeness-on-arrays",
2726+
"-Wno-format-security",
26552727
);
26562728
PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/CoreFoundation;
26572729
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2673,8 +2745,9 @@
26732745
);
26742746
INFOPLIST_FILE = TestFoundation/Resources/Info.plist;
26752747
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
2748+
LIBRARY_SEARCH_PATHS = "$(inherited)";
26762749
MACH_O_TYPE = mh_execute;
2677-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH";
2750+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -swift-version 3";
26782751
PRODUCT_BUNDLE_IDENTIFIER = org.swift.TestFoundation;
26792752
PRODUCT_NAME = "$(TARGET_NAME)";
26802753
SKIP_INSTALL = YES;
@@ -2697,8 +2770,9 @@
26972770
);
26982771
INFOPLIST_FILE = TestFoundation/Resources/Info.plist;
26992772
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
2773+
LIBRARY_SEARCH_PATHS = "$(inherited)";
27002774
MACH_O_TYPE = mh_execute;
2701-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH";
2775+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -swift-version 3";
27022776
PRODUCT_BUNDLE_IDENTIFIER = org.swift.TestFoundation;
27032777
PRODUCT_NAME = "$(TARGET_NAME)";
27042778
SKIP_INSTALL = YES;
@@ -2707,6 +2781,48 @@
27072781
};
27082782
name = Release;
27092783
};
2784+
9F0DD34C1ECD734200F68030 /* Debug */ = {
2785+
isa = XCBuildConfiguration;
2786+
buildSettings = {
2787+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
2788+
CLANG_ANALYZER_NONNULL = YES;
2789+
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
2790+
CLANG_ENABLE_MODULES = YES;
2791+
CLANG_ENABLE_OBJC_ARC = YES;
2792+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
2793+
CODE_SIGN_IDENTITY = "";
2794+
COMBINE_HIDPI_IMAGES = YES;
2795+
INFOPLIST_FILE = TestFoundation/xdgTestHelper/Info.plist;
2796+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../../.. @loader_path/../../.. @executable_path/../Frameworks";
2797+
MACOSX_DEPLOYMENT_TARGET = 10.12;
2798+
PRODUCT_BUNDLE_IDENTIFIER = org.swift.xdgTestHelper;
2799+
PRODUCT_NAME = "$(TARGET_NAME)";
2800+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
2801+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
2802+
SWIFT_VERSION = 3.0;
2803+
};
2804+
name = Debug;
2805+
};
2806+
9F0DD34D1ECD734200F68030 /* Release */ = {
2807+
isa = XCBuildConfiguration;
2808+
buildSettings = {
2809+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
2810+
CLANG_ANALYZER_NONNULL = YES;
2811+
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
2812+
CLANG_ENABLE_MODULES = YES;
2813+
CLANG_ENABLE_OBJC_ARC = YES;
2814+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
2815+
CODE_SIGN_IDENTITY = "";
2816+
COMBINE_HIDPI_IMAGES = YES;
2817+
INFOPLIST_FILE = TestFoundation/xdgTestHelper/Info.plist;
2818+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../../.. @loader_path/../../.. @executable_path/../Frameworks";
2819+
MACOSX_DEPLOYMENT_TARGET = 10.12;
2820+
PRODUCT_BUNDLE_IDENTIFIER = org.swift.xdgTestHelper;
2821+
PRODUCT_NAME = "$(TARGET_NAME)";
2822+
SWIFT_VERSION = 3.0;
2823+
};
2824+
name = Release;
2825+
};
27102826
EA66F6731BF56CCB00136161 /* Debug */ = {
27112827
isa = XCBuildConfiguration;
27122828
buildSettings = {
@@ -2769,6 +2885,14 @@
27692885
defaultConfigurationIsVisible = 0;
27702886
defaultConfigurationName = Release;
27712887
};
2888+
9F0DD34B1ECD734200F68030 /* Build configuration list for PBXNativeTarget "xdgTestHelper" */ = {
2889+
isa = XCConfigurationList;
2890+
buildConfigurations = (
2891+
9F0DD34C1ECD734200F68030 /* Debug */,
2892+
9F0DD34D1ECD734200F68030 /* Release */,
2893+
);
2894+
defaultConfigurationIsVisible = 0;
2895+
};
27722896
EA66F6751BF56CCB00136161 /* Build configuration list for PBXNativeTarget "plutil" */ = {
27732897
isa = XCConfigurationList;
27742898
buildConfigurations = (

‎Foundation.xcodeproj/xcshareddata/xcschemes/TestFoundation.xcscheme

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,20 @@
4848
ReferencedContainer = "container:Foundation.xcodeproj">
4949
</BuildableReference>
5050
</BuildActionEntry>
51+
<BuildActionEntry
52+
buildForTesting = "YES"
53+
buildForRunning = "YES"
54+
buildForProfiling = "YES"
55+
buildForArchiving = "YES"
56+
buildForAnalyzing = "YES">
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "9F0DD33E1ECD734200F68030"
60+
BuildableName = "xdgTestHelper.app"
61+
BlueprintName = "xdgTestHelper"
62+
ReferencedContainer = "container:Foundation.xcodeproj">
63+
</BuildableReference>
64+
</BuildActionEntry>
5165
</BuildActionEntries>
5266
</BuildAction>
5367
<TestAction

‎TestFoundation/TestNSCompoundPredicate.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class TestNSCompoundPredicate: XCTestCase {
9292
var shortCircuited = true
9393

9494
let bOK = NSPredicate(value: false)
95-
let bDontEval = NSPredicate(block: { _ in
95+
let bDontEval = NSPredicate(block: { (_, _) in
9696
shortCircuited = false
9797
return true
9898
})
@@ -106,7 +106,7 @@ class TestNSCompoundPredicate: XCTestCase {
106106
var shortCircuited = true
107107

108108
let bOK = NSPredicate(value: true)
109-
let bDontEval = NSPredicate(block: { _ in
109+
let bDontEval = NSPredicate(block: { (_, _) in
110110
shortCircuited = false
111111
return true
112112
})

‎TestFoundation/TestNSHTTPCookieStorage.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,11 @@ class TestNSHTTPCookieStorage: XCTestCase {
241241
let bundlePath = bundle.bundlePath
242242
let pathIndex = bundlePath.range(of: "/", options: .backwards)?.lowerBound
243243
let task = Process()
244-
task.launchPath = bundlePath.substring(to: pathIndex!) + "/xdgTestHelper/xdgTestHelper"
244+
#if os(macOS)
245+
task.launchPath = bundlePath.substring(to: pathIndex!) + "/xdgTestHelper.app/Contents/MacOS/xdgTestHelper"
246+
#else
247+
task.launchPath = bundlePath.substring(to: pathIndex!) + "/xdgTestHelper/xdgTestHelper"
248+
#endif
245249
var environment = ProcessInfo.processInfo.environment
246250
environment["XDG_CONFIG_HOME"] = NSHomeDirectory() + "/TestXDG"
247251
task.environment = environment

‎TestFoundation/TestNSURLSession.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ class TestURLSession : XCTestCase {
261261
let session = URLSession(configuration: URLSessionConfiguration.default,
262262
delegate: delegate, delegateQueue: nil)
263263
let completionExpectation = expectation(description: "dataTask completion block wasn't called")
264-
let task = session.dataTask(with: url) { _ in
264+
let task = session.dataTask(with: url) { (_, _, _) in
265265
completionExpectation.fulfill()
266266
}
267267
task.resume()
@@ -275,8 +275,8 @@ class TestURLSession : XCTestCase {
275275
delegate: nil,
276276
delegateQueue: nil)
277277
let completionExpectation = expectation(description: "dataTask completion block wasn't called")
278-
let task = session.dataTask(with: url) { result in
279-
let error = result.2 as? URLError
278+
let task = session.dataTask(with: url) { (_, _, error) in
279+
let error = error as? URLError
280280
XCTAssertNotNil(error)
281281
XCTAssertEqual(error?.code, .badURL)
282282
completionExpectation.fulfill()

0 commit comments

Comments
 (0)