Modernize code to not rely on deprecations and old behavior

Author: AZero13

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, ^{

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();
 }
 

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);

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;

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()
 

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