Modernize code to not rely on deprecations and old behavior

AZero13 · AZero13 · commit f30fc0bbd8de · 2021-11-12T13:34:35.000-05:00
diff --git a/CoreFoundation/Base.subproj/CFPlatform.c b/CoreFoundation/Base.subproj/CFPlatform.c
@@ -733,7 +733,7 @@ static _CFThreadSpecificKey __CFTSDIndexKey;
 static void *__CFThreadSpecificData;
 #endif
 
-CF_PRIVATE void __CFTSDInitialize() {
+CF_PRIVATE void __CFTSDInitialize(void) {
 #if !TARGET_OS_WASI
     static dispatch_once_t once;
     dispatch_once(&once, ^{
diff --git a/CoreFoundation/Base.subproj/CFUtilities.c b/CoreFoundation/Base.subproj/CFUtilities.c
@@ -1664,7 +1664,7 @@ CF_EXPORT Boolean _CFExtensionIsValidToAppend(CFStringRef extension) {
 
 #if DEPLOYMENT_RUNTIME_SWIFT && !TARGET_OS_WASI
 
-CFDictionaryRef __CFGetEnvironment() {
+CFDictionaryRef __CFGetEnvironment(void) {
     static dispatch_once_t once = 0L;
     static CFMutableDictionaryRef envDict = NULL;
     dispatch_once(&once, ^{
@@ -1719,7 +1719,7 @@ CFDictionaryRef __CFGetEnvironment() {
     return envDict;
 }
 
-int32_t __CFGetPid() {
+int32_t __CFGetPid(void) {
     return getpid();
 }
 
diff --git a/CoreFoundation/RunLoop.subproj/CFRunLoop.c b/CoreFoundation/RunLoop.subproj/CFRunLoop.c
@@ -806,7 +806,7 @@ static CFStringRef __CFRunLoopCopyDescription(CFTypeRef cf) {
     return result;
 }
 
-CF_PRIVATE void __CFRunLoopDump() { // __private_extern__ to keep the compiler from discarding it
+CF_PRIVATE void __CFRunLoopDump(void) { // __private_extern__ to keep the compiler from discarding it
     CFStringRef desc = CFCopyDescription(CFRunLoopGetCurrent());
     CFShow(desc);
     CFRelease(desc);
diff --git a/Darwin/Foundation-swiftoverlay-Tests/FoundationBridge.m b/Darwin/Foundation-swiftoverlay-Tests/FoundationBridge.m
@@ -267,7 +267,7 @@ - (BOOL)verifyAutoupdatingLocale:(NSLocale *)locale {
 @implementation NumberBridgingTester
 
 - (BOOL)verifyKeysInRange:(NSRange)range existInDictionary:(NSDictionary *)dictionary {
-    for (NSUInteger i = 0; i < range.length; i += 1) {
+    for (NSUInteger i = 0; i < range.length; i++) {
         if (!dictionary[@(range.location + i)]) {
             return NO;
         }
diff --git a/Darwin/Foundation-swiftoverlay/DataThunks.m b/Darwin/Foundation-swiftoverlay/DataThunks.m
@@ -75,7 +75,7 @@ static NSInteger _NSWriteToFileDescriptor(int32_t fd, const void *buffer, NSUInt
 
 static NSError *_NSErrorWithFilePath(NSInteger code, id pathOrURL) {
     NSString *key = [pathOrURL isKindOfClass:[NSURL self]] ? NSURLErrorKey : NSFilePathErrorKey;
-    return [NSError errorWithDomain:NSCocoaErrorDomain code:code userInfo:[NSDictionary dictionaryWithObjectsAndKeys:pathOrURL, key, nil]];
+    return [NSError errorWithDomain:NSCocoaErrorDomain code:code userInfo:@{pathOrURL: key}];
 }
 
 static NSError *_NSErrorWithFilePathAndErrno(NSInteger posixErrno, id pathOrURL, BOOL reading) {
@@ -106,7 +106,7 @@ static NSInteger _NSWriteToFileDescriptor(int32_t fd, const void *buffer, NSUInt
     }
     
     NSString *key = [pathOrURL isKindOfClass:[NSURL self]] ? NSURLErrorKey : NSFilePathErrorKey;
-    NSDictionary *userInfo = [[NSDictionary alloc] initWithObjectsAndKeys:pathOrURL, key, [NSError errorWithDomain:NSPOSIXErrorDomain code:posixErrno userInfo:nil], NSUnderlyingErrorKey, nil];
+    NSDictionary *userInfo = @{pathOrURL : key, [NSError errorWithDomain:NSPOSIXErrorDomain code:posixErrno userInfo:nil] : NSUnderlyingErrorKey};
     NSError *error = [NSError errorWithDomain:NSCocoaErrorDomain code:code userInfo:userInfo];
     [userInfo release];
     return error;
diff --git a/Foundation.xcodeproj/project.pbxproj b/Foundation.xcodeproj/project.pbxproj
@@ -2703,7 +2703,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1130;
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1310;
 				ORGANIZATIONNAME = Swift;
 				TargetAttributes = {
 					5B5D885C1BBC938800234F36 = {
@@ -3831,6 +3831,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -3893,6 +3894,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -3914,13 +3916,15 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
+				LLVM_LTO = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_FORCE_DYNAMIC_LINK_STDLIB = YES;
 				SWIFT_FORCE_STATIC_LINK_STDLIB = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_OPTIMIZE_OBJECT_LIFETIME = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -4183,6 +4187,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				HEADER_SEARCH_PATHS = (
@@ -4213,6 +4218,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				HEADER_SEARCH_PATHS = (
@@ -4245,7 +4251,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(CONFIGURATION_BUILD_DIR)/usr/local/include",
@@ -4276,7 +4282,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(CONFIGURATION_BUILD_DIR)/usr/local/include",
@@ -4301,6 +4307,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CODE_SIGN_IDENTITY = "-";
 				HEADER_SEARCH_PATHS = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(TOOLCHAIN_DIR)/usr/lib/swift/macosx",
@@ -4319,6 +4326,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CODE_SIGN_IDENTITY = "-";
 				HEADER_SEARCH_PATHS = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(TOOLCHAIN_DIR)/usr/lib/swift/macosx",
@@ -4342,6 +4350,7 @@
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				HEADER_SEARCH_PATHS = "";
@@ -4365,6 +4374,7 @@
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				HEADER_SEARCH_PATHS = "";
diff --git a/Foundation.xcodeproj/xcshareddata/xcschemes/CFURLSessionInterface.xcscheme b/Foundation.xcodeproj/xcshareddata/xcschemes/CFURLSessionInterface.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation.xcodeproj/xcshareddata/xcschemes/CFXMLInterface.xcscheme b/Foundation.xcodeproj/xcshareddata/xcschemes/CFXMLInterface.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation.xcodeproj/xcshareddata/xcschemes/CoreFoundation.xcscheme b/Foundation.xcodeproj/xcshareddata/xcschemes/CoreFoundation.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
diff --git a/Foundation.xcodeproj/xcshareddata/xcschemes/GenerateTestFixtures.xcscheme b/Foundation.xcodeproj/xcshareddata/xcschemes/GenerateTestFixtures.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation.xcodeproj/xcshareddata/xcschemes/SwiftFoundation.xcscheme b/Foundation.xcodeproj/xcshareddata/xcschemes/SwiftFoundation.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
diff --git a/Foundation.xcodeproj/xcshareddata/xcschemes/SwiftFoundationNetworking.xcscheme b/Foundation.xcodeproj/xcshareddata/xcschemes/SwiftFoundationNetworking.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation.xcodeproj/xcshareddata/xcschemes/SwiftFoundationXML.xcscheme b/Foundation.xcodeproj/xcshareddata/xcschemes/SwiftFoundationXML.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Foundation.xcodeproj/xcshareddata/xcschemes/TestFoundation.xcscheme b/Foundation.xcodeproj/xcshareddata/xcschemes/TestFoundation.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
diff --git a/Foundation.xcodeproj/xcshareddata/xcschemes/plutil.xcscheme b/Foundation.xcodeproj/xcshareddata/xcschemes/plutil.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
diff --git a/Foundation.xcodeproj/xcshareddata/xcschemes/xdgTestHelper.xcscheme b/Foundation.xcodeproj/xcshareddata/xcschemes/xdgTestHelper.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Sources/Foundation/Process.swift b/Sources/Foundation/Process.swift
@@ -1144,7 +1144,7 @@ open class Process: NSObject {
     // convenience; create and launch
     open class func launchedProcess(launchPath path: String, arguments: [String]) -> Process {
         let process = Process()
-        process.launchPath = path
+        process.executableURL = URL(fileURLWithPath:path)
         process.arguments = arguments
         process.launch()
     
diff --git a/Tests/Foundation/Tests/TestProcess.swift b/Tests/Foundation/Tests/TestProcess.swift
@@ -18,7 +18,7 @@ class TestProcess : XCTestCase {
             // Fallback on earlier versions
             process.launchPath = executableURL.path
         }
-        XCTAssertEqual(executableURL.path, process.launchPath)
+        XCTAssertEqual(process.launchPath, executableURL.path)
         process.arguments = ["--exit", "0"]
         try process.run()
         process.waitUntilExit()
@@ -971,7 +971,12 @@ internal func runTask(_ arguments: [String], environment: [String: String]? = ni
     let process = Process()
 
     var arguments = arguments
-    process.launchPath = arguments.removeFirst()
+    if #available(OSX 10.13, *) {
+        process.executableURL = URL(fileURLWithPath:arguments.removeFirst())
+    } else {
+        // Fallback on earlier versions
+        process.launchPath = arguments.removeFirst()
+    }
     process.arguments = arguments
     // Darwin Foundation doesnt allow .environment to be set to nil although the documentation
     // says it is an optional. https://developer.apple.com/documentation/foundation/process/1409412-environment

Original file line number	Diff line number	Diff line change
`@@ -1664,7 +1664,7 @@ CF_EXPORT Boolean _CFExtensionIsValidToAppend(CFStringRef extension) {`
`1664`	`1664`
`1665`	`1665`	`#if DEPLOYMENT_RUNTIME_SWIFT && !TARGET_OS_WASI`
`1666`	`1666`
`1667`		`-CFDictionaryRef __CFGetEnvironment() {`
	`1667`	`+CFDictionaryRef __CFGetEnvironment(void) {`
`1668`	`1668`	`static dispatch_once_t once = 0L;`
`1669`	`1669`	`static CFMutableDictionaryRef envDict = NULL;`
`1670`	`1670`	`dispatch_once(&once, ^{`
`@@ -1719,7 +1719,7 @@ CFDictionaryRef __CFGetEnvironment() {`
`1719`	`1719`	`return envDict;`
`1720`	`1720`	`}`
`1721`	`1721`
`1722`		`-int32_t __CFGetPid() {`
	`1722`	`+int32_t __CFGetPid(void) {`
`1723`	`1723`	`return getpid();`
`1724`	`1724`	`}`
`1725`	`1725`
Original file line number	Diff line number	Diff line change
`@@ -806,7 +806,7 @@ static CFStringRef __CFRunLoopCopyDescription(CFTypeRef cf) {`
`806`	`806`	`return result;`
`807`	`807`	`}`
`808`	`808`
`809`		`-CF_PRIVATE void __CFRunLoopDump() { // __private_extern__ to keep the compiler from discarding it`
	`809`	`+CF_PRIVATE void __CFRunLoopDump(void) { // __private_extern__ to keep the compiler from discarding it`
`810`	`810`	`CFStringRef desc = CFCopyDescription(CFRunLoopGetCurrent());`
`811`	`811`	`CFShow(desc);`
`812`	`812`	`CFRelease(desc);`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ - (BOOL)verifyAutoupdatingLocale:(NSLocale *)locale {`
`267`	`267`	`@implementation NumberBridgingTester`
`268`	`268`
`269`	`269`	`- (BOOL)verifyKeysInRange:(NSRange)range existInDictionary:(NSDictionary *)dictionary {`
`270`		`- for (NSUInteger i = 0; i < range.length; i += 1) {`
	`270`	`+ for (NSUInteger i = 0; i < range.length; i++) {`
`271`	`271`	`if (!dictionary[@(range.location + i)]) {`
`272`	`272`	`return NO;`
`273`	`273`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ static NSInteger _NSWriteToFileDescriptor(int32_t fd, const void *buffer, NSUInt`
`75`	`75`
`76`	`76`	`static NSError *_NSErrorWithFilePath(NSInteger code, id pathOrURL) {`
`77`	`77`	`NSString *key = [pathOrURL isKindOfClass:[NSURL self]] ? NSURLErrorKey : NSFilePathErrorKey;`
`78`		`- return [NSError errorWithDomain:NSCocoaErrorDomain code:code userInfo:[NSDictionary dictionaryWithObjectsAndKeys:pathOrURL, key, nil]];`
	`78`	`+ return [NSError errorWithDomain:NSCocoaErrorDomain code:code userInfo:@{pathOrURL: key}];`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`static NSError *_NSErrorWithFilePathAndErrno(NSInteger posixErrno, id pathOrURL, BOOL reading) {`
`@@ -106,7 +106,7 @@ static NSInteger _NSWriteToFileDescriptor(int32_t fd, const void *buffer, NSUInt`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`NSString *key = [pathOrURL isKindOfClass:[NSURL self]] ? NSURLErrorKey : NSFilePathErrorKey;`
`109`		`- NSDictionary *userInfo = [[NSDictionary alloc] initWithObjectsAndKeys:pathOrURL, key, [NSError errorWithDomain:NSPOSIXErrorDomain code:posixErrno userInfo:nil], NSUnderlyingErrorKey, nil];`
	`109`	`+ NSDictionary *userInfo = @{pathOrURL : key, [NSError errorWithDomain:NSPOSIXErrorDomain code:posixErrno userInfo:nil] : NSUnderlyingErrorKey};`
`110`	`110`	`NSError *error = [NSError errorWithDomain:NSCocoaErrorDomain code:code userInfo:userInfo];`
`111`	`111`	`[userInfo release];`
`112`	`112`	`return error;`