Support Xcode 15's separate runtime bundles (#115)

ksuther · web-flow · commit 07e70084d1b5 · 2023-09-28T14:38:00.000+03:00
* Enable tabs in the Xcode project file

* Support Xcode 15's separate runtime bundles
Added a runtimeBundleURL parameter to +[SimUtils launchDaemonPlistURLForDaemon:] to pass the simulator runtime URL dynamically rather than assuming the runtime is within Xcode
diff --git a/applesimutils/applesimutils.xcodeproj/project.pbxproj b/applesimutils/applesimutils.xcodeproj/project.pbxproj
@@ -164,6 +164,7 @@
 				391EBF361E91212B0009AACD /* Frameworks */,
 			);
 			sourceTree = "<group>";
+			usesTabs = 1;
 		};
 		391596DD1E8CBAA900FDD6F5 /* Products */ = {
 			isa = PBXGroup;
diff --git a/applesimutils/applesimutils/ClearKeychain.h b/applesimutils/applesimutils/ClearKeychain.h
@@ -8,6 +8,6 @@
 
 #import <Foundation/Foundation.h>
 
-extern NSURL* securitydURL(void);
+extern NSURL* securitydURL(NSURL* runtimeBundleURL);
 
-extern void performClearKeychainPass(NSString* simulatorIdentifier);
+extern void performClearKeychainPass(NSString* simulatorIdentifier, NSURL* runtimeBundleURL);
diff --git a/applesimutils/applesimutils/ClearKeychain.m b/applesimutils/applesimutils/ClearKeychain.m
@@ -9,19 +9,19 @@
 #import "ClearKeychain.h"
 #import "SimUtils.h"
 
-extern NSURL* securitydURL(void)
+extern NSURL* securitydURL(NSURL* runtimeBundleURL)
 {
 	static NSURL *securitydDaemonURL;
 	static dispatch_once_t onceToken;
 	dispatch_once(&onceToken, ^{
-		 securitydDaemonURL = [SimUtils launchDaemonPlistURLForDaemon:@"com.apple.securityd"];
+		 securitydDaemonURL = [SimUtils launchDaemonPlistURLForDaemon:@"com.apple.securityd" runtimeBundleURL:runtimeBundleURL];
 	});
 	return securitydDaemonURL;
 }
 
-static void securitydCtl(NSString* simulatorId, BOOL stop)
+static void securitydCtl(NSString* simulatorId, NSURL* runtimeBundleURL, BOOL stop)
 {
-	NSURL *locationdDaemonURL = securitydURL();
+	NSURL *locationdDaemonURL = securitydURL(runtimeBundleURL);
 	NSCAssert(locationdDaemonURL != nil, @"Launch daemon “com.apple.securityd” not found. Please open an issue.");
 	
 	NSTask* rebootTask = [NSTask new];
@@ -31,14 +31,14 @@ static void securitydCtl(NSString* simulatorId, BOOL stop)
 	[rebootTask waitUntilExit];
 }
 
-void performClearKeychainPass(NSString* simulatorIdentifier)
+void performClearKeychainPass(NSString* simulatorIdentifier, NSURL* runtimeBundleURL)
 {
-	securitydCtl(simulatorIdentifier, YES);
+	securitydCtl(simulatorIdentifier, runtimeBundleURL, YES);
 	
 	NSURL* keychainDirURL = [[SimUtils libraryURLForSimulatorId:simulatorIdentifier] URLByAppendingPathComponent:@"Keychains"];
 	[[NSFileManager.defaultManager contentsOfDirectoryAtURL:keychainDirURL includingPropertiesForKeys:nil options:0 error:NULL] enumerateObjectsUsingBlock:^(NSURL * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
 		[NSFileManager.defaultManager removeItemAtURL:obj error:NULL];
 	}];
 	
-	securitydCtl(simulatorIdentifier, NO);
+	securitydCtl(simulatorIdentifier, runtimeBundleURL, NO);
 }
diff --git a/applesimutils/applesimutils/ClearMedia.h b/applesimutils/applesimutils/ClearMedia.h
@@ -8,4 +8,4 @@
 
 #import <Foundation/Foundation.h>
 
-extern void performClearMediaPass(NSString* simulatorIdentifier);
+extern void performClearMediaPass(NSString* simulatorIdentifier, NSURL* runtimeBundleURL);
diff --git a/applesimutils/applesimutils/ClearMedia.m b/applesimutils/applesimutils/ClearMedia.m
@@ -9,19 +9,19 @@
 #import "ClearMedia.h"
 #import "SimUtils.h"
 
-extern NSURL* assetsdURL(void)
+extern NSURL* assetsdURL(NSURL* runtimeBundleURL)
 {
 	static NSURL *assetsdURL;
 	static dispatch_once_t onceToken;
 	dispatch_once(&onceToken, ^{
-		assetsdURL = [SimUtils launchDaemonPlistURLForDaemon:@"com.apple.assetsd"];
+		assetsdURL = [SimUtils launchDaemonPlistURLForDaemon:@"com.apple.assetsd" runtimeBundleURL:runtimeBundleURL];
 	});
 	return assetsdURL;
 }
 
-static void assetsdCtl(NSString* simulatorId, BOOL stop)
+static void assetsdCtl(NSString* simulatorId, NSURL* runtimeBundleURL, BOOL stop)
 {
-	NSURL *locationdDaemonURL = assetsdURL();
+	NSURL *locationdDaemonURL = assetsdURL(runtimeBundleURL);
 	NSCAssert(locationdDaemonURL != nil, @"Launch daemon “com.apple.mobileassetd” not found. Please open an issue.");
 	
 	NSTask* rebootTask = [NSTask new];
@@ -31,11 +31,11 @@ static void assetsdCtl(NSString* simulatorId, BOOL stop)
 	[rebootTask waitUntilExit];
 }
 
-void performClearMediaPass(NSString* simulatorIdentifier)
+void performClearMediaPass(NSString* simulatorIdentifier, NSURL* runtimeBundleURL)
 {
-	assetsdCtl(simulatorIdentifier, YES);
+	assetsdCtl(simulatorIdentifier, runtimeBundleURL, YES);
 	NSURL* mediaURL = [[SimUtils dataURLForSimulatorId:simulatorIdentifier] URLByAppendingPathComponent:@"Media"];
 	[NSFileManager.defaultManager removeItemAtURL:[mediaURL URLByAppendingPathComponent:@"DCIM"] error:NULL];
 	[NSFileManager.defaultManager removeItemAtURL:[mediaURL URLByAppendingPathComponent:@"PhotoData"] error:NULL];
-	assetsdCtl(simulatorIdentifier, NO);
+	assetsdCtl(simulatorIdentifier, runtimeBundleURL, NO);
 }
diff --git a/applesimutils/applesimutils/SetLocationPermission.h b/applesimutils/applesimutils/SetLocationPermission.h
@@ -10,8 +10,8 @@
 
 @interface SetLocationPermission : NSObject
 
-+ (NSURL*)locationdURL;
++ (NSURL*)locationdURLForRuntimeBundleURL:(NSURL*)runtimeBundleURL;
 
-+ (BOOL)setLocationPermission:(NSString*)permission forBundleIdentifier:(NSString*)bundleIdentifier simulatorIdentifier:(NSString*)simulatorId error:(NSError**)error;
++ (BOOL)setLocationPermission:(NSString*)permission forBundleIdentifier:(NSString*)bundleIdentifier simulatorIdentifier:(NSString*)simulatorId runtimeBundleURL:(NSURL*)runtimeBundleURL error:(NSError**)error;
 
 @end
diff --git a/applesimutils/applesimutils/SetLocationPermission.m b/applesimutils/applesimutils/SetLocationPermission.m
@@ -9,9 +9,9 @@
 #import "SetLocationPermission.h"
 #import "SimUtils.h"
 
-static void startStopLocationdCtl(NSString* simulatorId, BOOL stop)
+static void startStopLocationdCtl(NSString* simulatorId, NSURL* runtimeBundleURL, BOOL stop)
 {
-	NSURL *locationdDaemonURL = [SetLocationPermission locationdURL];
+	NSURL *locationdDaemonURL = [SetLocationPermission locationdURLForRuntimeBundleURL:runtimeBundleURL];
 	NSCAssert(locationdDaemonURL != nil, @"Launch daemon “com.apple.locationd” not found. Please open an issue.");
 	
 	NSTask* rebootTask = [NSTask new];
@@ -23,17 +23,17 @@ static void startStopLocationdCtl(NSString* simulatorId, BOOL stop)
 
 @implementation SetLocationPermission
 
-+ (NSURL*)locationdURL
++ (NSURL*)locationdURLForRuntimeBundleURL:(NSURL*)runtimeBundleURL
 {
 	static NSURL *locationdDaemonURL;
 	static dispatch_once_t onceToken;
 	dispatch_once(&onceToken, ^{
-		 locationdDaemonURL = [SimUtils launchDaemonPlistURLForDaemon:@"com.apple.locationd"];
+		 locationdDaemonURL = [SimUtils launchDaemonPlistURLForDaemon:@"com.apple.locationd" runtimeBundleURL:runtimeBundleURL];
 	});
 	return locationdDaemonURL;
 }
 
-+ (BOOL)setLocationPermission:(NSString*)permission forBundleIdentifier:(NSString*)bundleIdentifier simulatorIdentifier:(NSString*)simulatorId error:(NSError**)error
++ (BOOL)setLocationPermission:(NSString*)permission forBundleIdentifier:(NSString*)bundleIdentifier simulatorIdentifier:(NSString*)simulatorId runtimeBundleURL:(NSURL*)runtimeBundleURL error:(NSError**)error
 {
 	LNLog(LNLogLevelDebug, @"Setting location permission");
 	
@@ -86,11 +86,11 @@ + (BOOL)setLocationPermission:(NSString*)permission forBundleIdentifier:(NSStrin
 		locationClients[bundleIdentifier] = bundlePermissions;
 	}
 	
-	startStopLocationdCtl(simulatorId, YES);
+	startStopLocationdCtl(simulatorId, runtimeBundleURL, YES);
 	
 	[[NSPropertyListSerialization dataWithPropertyList:locationClients format:NSPropertyListBinaryFormat_v1_0 options:0 error:NULL] writeToURL:plistURL atomically:YES];
 	
-	startStopLocationdCtl(simulatorId, NO);
+	startStopLocationdCtl(simulatorId, runtimeBundleURL, NO);
 	
 	return YES;
 }
diff --git a/applesimutils/applesimutils/SimUtils.h b/applesimutils/applesimutils/SimUtils.h
@@ -18,7 +18,7 @@ extern const NSTimeInterval AppleSimUtilsRetryTimeout;
 + (NSURL*)dataURLForSimulatorId:(NSString*)simulatorId;
 + (NSURL*)libraryURLForSimulatorId:(NSString*)simulatorId;
 + (NSURL*)binaryURLForBundleId:(NSString*)bundleId simulatorId:(NSString*)simulatorId;
-+ (NSURL*)launchDaemonPlistURLForDaemon:(NSString*)daemon;
++ (NSURL*)launchDaemonPlistURLForDaemon:(NSString*)daemon runtimeBundleURL:(NSURL*)runtimeBundleURL;
 + (void)restartSpringBoardForSimulatorId:(NSString*)simulatorId;
 
 + (void)registerCleanupBlock:(dispatch_block_t)block;
diff --git a/applesimutils/applesimutils/SimUtils.m b/applesimutils/applesimutils/SimUtils.m
@@ -117,37 +117,42 @@ + (NSURL *)binaryURLForBundleId:(NSString*)bundleId simulatorId:(NSString*)simul
 	return [bundleURL URLByAppendingPathComponent:executableName];
 }
 
-+ (NSURL*)launchDaemonPlistURLForDaemon:(NSString*)daemon
++ (NSURL*)launchDaemonPlistURLForDaemon:(NSString*)daemon runtimeBundleURL:(NSURL*)runtimeBundleURL
 {
 	if([daemon hasSuffix:@".plist"] == NO)
 	{
 		daemon = [daemon stringByAppendingString:@".plist"];
 	}
-	
-	NSFileManager *fileManager = [NSFileManager defaultManager];
-	NSURL* developerTools = [SimUtils developerURL];
-	
+
+	//Xcode 14 and 15 (using runtimeBundleURL)
+	NSURL *daemonURL = [runtimeBundleURL URLByAppendingPathComponent:[NSString stringWithFormat:@"Contents/Resources/RuntimeRoot/System/Library/LaunchDaemons/%@", daemon]];
+
 	//Xcode 11
-	NSURL *locationdDaemonURL = [developerTools URLByAppendingPathComponent:[NSString stringWithFormat:@"Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/System/Library/LaunchDaemons/%@", daemon]];
-	
+	NSURL* developerTools = [SimUtils developerURL];
+
+	if ([daemonURL checkResourceIsReachableAndReturnError:NULL] == NO)
+	{
+		daemonURL = [developerTools URLByAppendingPathComponent:[NSString stringWithFormat:@"Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/System/Library/LaunchDaemons/%@", daemon]];
+	}
+
 	//Xcode 9
-	if ([fileManager fileExistsAtPath:locationdDaemonURL.path] == NO)
+	if ([daemonURL checkResourceIsReachableAndReturnError:NULL] == NO)
 	{
-		locationdDaemonURL = [developerTools URLByAppendingPathComponent:[NSString stringWithFormat:@"Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/System/Library/LaunchDaemons/%@", daemon]];
+		daemonURL = [developerTools URLByAppendingPathComponent:[NSString stringWithFormat:@"Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/System/Library/LaunchDaemons/%@", daemon]];
 	}
-	
+
 	//Older
-	if ([fileManager fileExistsAtPath:locationdDaemonURL.path] == NO)
+	if ([daemonURL checkResourceIsReachableAndReturnError:NULL] == NO)
 	{
-		locationdDaemonURL = [developerTools URLByAppendingPathComponent:[NSString stringWithFormat:@"Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/LaunchDaemons/%@", daemon]];
+		daemonURL = [developerTools URLByAppendingPathComponent:[NSString stringWithFormat:@"Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/LaunchDaemons/%@", daemon]];
 	}
-	
-	if ([fileManager fileExistsAtPath:locationdDaemonURL.path] == NO)
+
+	if ([daemonURL checkResourceIsReachableAndReturnError:NULL] == NO)
 	{
 		return nil;
 	}
 	
-	return locationdDaemonURL;
+	return daemonURL;
 }
 
 + (void)restartSpringBoardForSimulatorId:(NSString*)simulatorId
@@ -171,7 +176,7 @@ + (void)registerCleanupBlock:(dispatch_block_t)block
 }
 
 __attribute__((destructor))
-static void cleanup()
+static void cleanup(void)
 {
 	[_blocks enumerateObjectsUsingBlock:^(dispatch_block_t  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
 		obj();
diff --git a/applesimutils/applesimutils/main.m b/applesimutils/applesimutils/main.m
@@ -56,7 +56,7 @@ static void shutdownSimulator(NSString* simulatorId)
 	[shutdownTask waitUntilExit];
 }
 
-static NSArray* simulatorDevicesList()
+static NSArray* simulatorDevicesList(void)
 {
 	LNLog(LNLogLevelDebug, @"Obtaining simulator device list");
 	
@@ -114,7 +114,7 @@ static void shutdownSimulator(NSString* simulatorId)
 	return allDevices;
 }
 
-static NSPredicate* predicateByBooted()
+static NSPredicate* predicateByBooted(void)
 {
 	return [NSPredicate predicateWithFormat:@"state ==[c] %@", @"Booted"];
 }
@@ -274,6 +274,7 @@ static BOOL performPermissionsPass(NSString* permissionsArgument, NSString* simu
 		@"speech": @"kTCCServiceSpeechRecognition",
 		@"userTracking": @"kTCCServiceUserTracking",
 	};
+	NSURL *runtimeBundleURL = [NSURL fileURLWithPath:simulator[@"os"][@"bundlePath"]];
 	
 	NSArray<NSString*>* parsedArguments = [permissionsArgument componentsSeparatedByString:@","];
 	
@@ -317,7 +318,7 @@ static BOOL performPermissionsPass(NSString* permissionsArgument, NSString* simu
 		{
 			assertStringInArrayValues(value, @[@"never", @"always", @"inuse", @"unset"], -10, [NSString stringWithFormat:@"Error: Illegal value “%@” parsed for permission “%@”.", value, permission]);
 			
-			success = [SetLocationPermission setLocationPermission:value forBundleIdentifier:bundleIdentifier simulatorIdentifier:simulatorIdentifier error:&err];
+			success = [SetLocationPermission setLocationPermission:value forBundleIdentifier:bundleIdentifier simulatorIdentifier:simulatorIdentifier runtimeBundleURL:runtimeBundleURL error:&err];
 			
 			needsSpringBoardRestart |= NO;
 		}
@@ -640,7 +641,8 @@ int main(int argc, const char* argv[]) {
 			{
 				[filteredSimulators enumerateObjectsUsingBlock:^(NSDictionary*  _Nonnull simulator, NSUInteger idx, BOOL * _Nonnull stop) {
 					NSString* simulatorId = simulator[@"udid"];
-				
+                    NSURL *runtimeBundleURL = [NSURL fileURLWithPath:simulator[@"os"][@"bundlePath"]];
+
 					NSString* title = [NSString stringWithFormat:@"%@ (%@, %@)", simulator[@"name"], simulatorId, simulator[@"state"]];
 					NSString* underline = [@"" stringByPaddingToLength:title.length withString:@"-" startingAtIndex:0];
 					LNLog(LNLogLevelStdOut, @"%@\n%@", title, underline);
@@ -676,13 +678,13 @@ int main(int argc, const char* argv[]) {
 						simPaths[@"TCC Database Path"] = [url URLByAppendingPathComponent:@"TCC/TCC.db"].path;
 					}
 					
-					url = [SetLocationPermission locationdURL];
+					url = [SetLocationPermission locationdURLForRuntimeBundleURL:runtimeBundleURL];
 					if(url.path != nil)
 					{
 						simPaths[@"locationd Daemon Info Plist Path"] = url.path;
 					}
 					
-					url = securitydURL();
+					url = securitydURL(runtimeBundleURL);
 					if(url.path != nil)
 					{
 						simPaths[@"securityd Daemon Info Plist Path"] = url.path;
@@ -742,6 +744,7 @@ int main(int argc, const char* argv[]) {
 			
 			[filteredSimulators enumerateObjectsUsingBlock:^(NSDictionary*  _Nonnull simulator, NSUInteger idx, BOOL * _Nonnull stop) {
 				NSString* simulatorId = simulator[@"udid"];
+				NSURL *runtimeBundleURL = [NSURL fileURLWithPath:simulator[@"os"][@"bundlePath"]];
 				
 				BOOL needsSimShutdown = NO;
 				if([simulator[@"state"] isEqualToString:@"Shutdown"] && [settings objectForKey:@"setPermissions"] != nil)
@@ -769,14 +772,14 @@ int main(int argc, const char* argv[]) {
 				
 				if([settings boolForKey:@"clearKeychain"])
 				{
-					performClearKeychainPass(simulatorId);
+					performClearKeychainPass(simulatorId, runtimeBundleURL);
 					
 					needsSpringBoardRestart = YES;
 				}
 				
 				if([settings boolForKey:@"clearMedia"])
 				{
-					performClearMediaPass(simulatorId);
+					performClearMediaPass(simulatorId, runtimeBundleURL);
 					
 					needsSpringBoardRestart = YES;
 				}

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@`
`8`	`8`
`9`	`9`	`#import <Foundation/Foundation.h>`
`10`	`10`
`11`		`-extern void performClearMediaPass(NSString* simulatorIdentifier);`
	`11`	`+extern void performClearMediaPass(NSString* simulatorIdentifier, NSURL* runtimeBundleURL);`
Original file line number	Diff line number	Diff line change
`@@ -9,19 +9,19 @@`
`9`	`9`	`#import "ClearMedia.h"`
`10`	`10`	`#import "SimUtils.h"`
`11`	`11`
`12`		`-extern NSURL* assetsdURL(void)`
	`12`	`+extern NSURL* assetsdURL(NSURL* runtimeBundleURL)`
`13`	`13`	`{`
`14`	`14`	`static NSURL *assetsdURL;`
`15`	`15`	`static dispatch_once_t onceToken;`
`16`	`16`	`dispatch_once(&onceToken, ^{`
`17`		`- assetsdURL = [SimUtils launchDaemonPlistURLForDaemon:@"com.apple.assetsd"];`
	`17`	`+ assetsdURL = [SimUtils launchDaemonPlistURLForDaemon:@"com.apple.assetsd" runtimeBundleURL:runtimeBundleURL];`
`18`	`18`	`});`
`19`	`19`	`return assetsdURL;`
`20`	`20`	`}`
`21`	`21`
`22`		`-static void assetsdCtl(NSString* simulatorId, BOOL stop)`
	`22`	`+static void assetsdCtl(NSString* simulatorId, NSURL* runtimeBundleURL, BOOL stop)`
`23`	`23`	`{`
`24`		`- NSURL *locationdDaemonURL = assetsdURL();`
	`24`	`+ NSURL *locationdDaemonURL = assetsdURL(runtimeBundleURL);`
`25`	`25`	`NSCAssert(locationdDaemonURL != nil, @"Launch daemon “com.apple.mobileassetd” not found. Please open an issue.");`
`26`	`26`
`27`	`27`	`NSTask* rebootTask = [NSTask new];`
`@@ -31,11 +31,11 @@ static void assetsdCtl(NSString* simulatorId, BOOL stop)`
`31`	`31`	`[rebootTask waitUntilExit];`
`32`	`32`	`}`
`33`	`33`
`34`		`-void performClearMediaPass(NSString* simulatorIdentifier)`
	`34`	`+void performClearMediaPass(NSString* simulatorIdentifier, NSURL* runtimeBundleURL)`
`35`	`35`	`{`
`36`		`- assetsdCtl(simulatorIdentifier, YES);`
	`36`	`+ assetsdCtl(simulatorIdentifier, runtimeBundleURL, YES);`
`37`	`37`	`NSURL* mediaURL = [[SimUtils dataURLForSimulatorId:simulatorIdentifier] URLByAppendingPathComponent:@"Media"];`
`38`	`38`	`[NSFileManager.defaultManager removeItemAtURL:[mediaURL URLByAppendingPathComponent:@"DCIM"] error:NULL];`
`39`	`39`	`[NSFileManager.defaultManager removeItemAtURL:[mediaURL URLByAppendingPathComponent:@"PhotoData"] error:NULL];`
`40`		`- assetsdCtl(simulatorIdentifier, NO);`
	`40`	`+ assetsdCtl(simulatorIdentifier, runtimeBundleURL, NO);`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,37 +117,42 @@ + (NSURL )binaryURLForBundleId:(NSString)bundleId simulatorId:(NSString*)simul`
`117`	`117`	`return [bundleURL URLByAppendingPathComponent:executableName];`
`118`	`118`	`}`
`119`	`119`
`120`		`-+ (NSURL)launchDaemonPlistURLForDaemon:(NSString)daemon`
	`120`	`++ (NSURL)launchDaemonPlistURLForDaemon:(NSString)daemon runtimeBundleURL:(NSURL*)runtimeBundleURL`
`121`	`121`	`{`
`122`	`122`	`if([daemon hasSuffix:@".plist"] == NO)`
`123`	`123`	`{`
`124`	`124`	`daemon = [daemon stringByAppendingString:@".plist"];`
`125`	`125`	`}`
`126`		`-`
`127`		`- NSFileManager *fileManager = [NSFileManager defaultManager];`
`128`		`- NSURL* developerTools = [SimUtils developerURL];`
`129`		`-`
	`126`	`+`
	`127`	`+ //Xcode 14 and 15 (using runtimeBundleURL)`
	`128`	`+ NSURL *daemonURL = [runtimeBundleURL URLByAppendingPathComponent:[NSString stringWithFormat:@"Contents/Resources/RuntimeRoot/System/Library/LaunchDaemons/%@", daemon]];`
	`129`	`+`
`130`	`130`	`//Xcode 11`
`131`		`- NSURL *locationdDaemonURL = [developerTools URLByAppendingPathComponent:[NSString stringWithFormat:@"Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/System/Library/LaunchDaemons/%@", daemon]];`
`132`		`-`
	`131`	`+ NSURL* developerTools = [SimUtils developerURL];`
	`132`	`+`
	`133`	`+ if ([daemonURL checkResourceIsReachableAndReturnError:NULL] == NO)`
	`134`	`+ {`
	`135`	`+ daemonURL = [developerTools URLByAppendingPathComponent:[NSString stringWithFormat:@"Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/System/Library/LaunchDaemons/%@", daemon]];`
	`136`	`+ }`
	`137`	`+`
`133`	`138`	`//Xcode 9`
`134`		`- if ([fileManager fileExistsAtPath:locationdDaemonURL.path] == NO)`
	`139`	`+ if ([daemonURL checkResourceIsReachableAndReturnError:NULL] == NO)`
`135`	`140`	`{`
`136`		`- locationdDaemonURL = [developerTools URLByAppendingPathComponent:[NSString stringWithFormat:@"Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/System/Library/LaunchDaemons/%@", daemon]];`
	`141`	`+ daemonURL = [developerTools URLByAppendingPathComponent:[NSString stringWithFormat:@"Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/System/Library/LaunchDaemons/%@", daemon]];`
`137`	`142`	`}`
`138`		`-`
	`143`	`+`
`139`	`144`	`//Older`
`140`		`- if ([fileManager fileExistsAtPath:locationdDaemonURL.path] == NO)`
	`145`	`+ if ([daemonURL checkResourceIsReachableAndReturnError:NULL] == NO)`
`141`	`146`	`{`
`142`		`- locationdDaemonURL = [developerTools URLByAppendingPathComponent:[NSString stringWithFormat:@"Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/LaunchDaemons/%@", daemon]];`
	`147`	`+ daemonURL = [developerTools URLByAppendingPathComponent:[NSString stringWithFormat:@"Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/LaunchDaemons/%@", daemon]];`
`143`	`148`	`}`
`144`		`-`
`145`		`- if ([fileManager fileExistsAtPath:locationdDaemonURL.path] == NO)`
	`149`	`+`
	`150`	`+ if ([daemonURL checkResourceIsReachableAndReturnError:NULL] == NO)`
`146`	`151`	`{`
`147`	`152`	`return nil;`
`148`	`153`	`}`
`149`	`154`
`150`		`- return locationdDaemonURL;`
	`155`	`+ return daemonURL;`
`151`	`156`	`}`
`152`	`157`
`153`	`158`	`+ (void)restartSpringBoardForSimulatorId:(NSString*)simulatorId`
`@@ -171,7 +176,7 @@ + (void)registerCleanupBlock:(dispatch_block_t)block`
`171`	`176`	`}`
`172`	`177`
`173`	`178`	`__attribute__((destructor))`
`174`		`-static void cleanup()`
	`179`	`+static void cleanup(void)`
`175`	`180`	`{`
`176`	`181`	`[_blocks enumerateObjectsUsingBlock:^(dispatch_block_t _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {`
`177`	`182`	`obj();`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ static void shutdownSimulator(NSString* simulatorId)`
`56`	`56`	`[shutdownTask waitUntilExit];`
`57`	`57`	`}`
`58`	`58`
`59`		`-static NSArray* simulatorDevicesList()`
	`59`	`+static NSArray* simulatorDevicesList(void)`
`60`	`60`	`{`
`61`	`61`	`LNLog(LNLogLevelDebug, @"Obtaining simulator device list");`
`62`	`62`
`@@ -114,7 +114,7 @@ static void shutdownSimulator(NSString* simulatorId)`
`114`	`114`	`return allDevices;`
`115`	`115`	`}`
`116`	`116`
`117`		`-static NSPredicate* predicateByBooted()`
	`117`	`+static NSPredicate* predicateByBooted(void)`
`118`	`118`	`{`
`119`	`119`	`return [NSPredicate predicateWithFormat:@"state ==[c] %@", @"Booted"];`
`120`	`120`	`}`
`@@ -274,6 +274,7 @@ static BOOL performPermissionsPass(NSString* permissionsArgument, NSString* simu`
`274`	`274`	`@"speech": @"kTCCServiceSpeechRecognition",`
`275`	`275`	`@"userTracking": @"kTCCServiceUserTracking",`
`276`	`276`	`};`
	`277`	`+ NSURL *runtimeBundleURL = [NSURL fileURLWithPath:simulator[@"os"][@"bundlePath"]];`
`277`	`278`
`278`	`279`	`NSArray<NSString> parsedArguments = [permissionsArgument componentsSeparatedByString:@","];`
`279`	`280`
`@@ -317,7 +318,7 @@ static BOOL performPermissionsPass(NSString* permissionsArgument, NSString* simu`
`317`	`318`	`{`
`318`	`319`	`assertStringInArrayValues(value, @[@"never", @"always", @"inuse", @"unset"], -10, [NSString stringWithFormat:@"Error: Illegal value “%@” parsed for permission “%@”.", value, permission]);`
`319`	`320`
`320`		`- success = [SetLocationPermission setLocationPermission:value forBundleIdentifier:bundleIdentifier simulatorIdentifier:simulatorIdentifier error:&err];`
	`321`	`+ success = [SetLocationPermission setLocationPermission:value forBundleIdentifier:bundleIdentifier simulatorIdentifier:simulatorIdentifier runtimeBundleURL:runtimeBundleURL error:&err];`
`321`	`322`
`322`	`323`	`needsSpringBoardRestart \|= NO;`
`323`	`324`	`}`
`@@ -640,7 +641,8 @@ int main(int argc, const char* argv[]) {`
`640`	`641`	`{`
`641`	`642`	`[filteredSimulators enumerateObjectsUsingBlock:^(NSDictionary* _Nonnull simulator, NSUInteger idx, BOOL * _Nonnull stop) {`
`642`	`643`	`NSString* simulatorId = simulator[@"udid"];`
`643`		`-`
	`644`	`+ NSURL *runtimeBundleURL = [NSURL fileURLWithPath:simulator[@"os"][@"bundlePath"]];`
	`645`	`+`
`644`	`646`	`NSString* title = [NSString stringWithFormat:@"%@ (%@, %@)", simulator[@"name"], simulatorId, simulator[@"state"]];`
`645`	`647`	`NSString* underline = [@"" stringByPaddingToLength:title.length withString:@"-" startingAtIndex:0];`
`646`	`648`	`LNLog(LNLogLevelStdOut, @"%@\n%@", title, underline);`
`@@ -676,13 +678,13 @@ int main(int argc, const char* argv[]) {`
`676`	`678`	`simPaths[@"TCC Database Path"] = [url URLByAppendingPathComponent:@"TCC/TCC.db"].path;`
`677`	`679`	`}`
`678`	`680`
`679`		`- url = [SetLocationPermission locationdURL];`
	`681`	`+ url = [SetLocationPermission locationdURLForRuntimeBundleURL:runtimeBundleURL];`
`680`	`682`	`if(url.path != nil)`
`681`	`683`	`{`
`682`	`684`	`simPaths[@"locationd Daemon Info Plist Path"] = url.path;`
`683`	`685`	`}`
`684`	`686`
`685`		`- url = securitydURL();`
	`687`	`+ url = securitydURL(runtimeBundleURL);`
`686`	`688`	`if(url.path != nil)`
`687`	`689`	`{`
`688`	`690`	`simPaths[@"securityd Daemon Info Plist Path"] = url.path;`
`@@ -742,6 +744,7 @@ int main(int argc, const char* argv[]) {`
`742`	`744`
`743`	`745`	`[filteredSimulators enumerateObjectsUsingBlock:^(NSDictionary* _Nonnull simulator, NSUInteger idx, BOOL * _Nonnull stop) {`
`744`	`746`	`NSString* simulatorId = simulator[@"udid"];`
	`747`	`+ NSURL *runtimeBundleURL = [NSURL fileURLWithPath:simulator[@"os"][@"bundlePath"]];`
`745`	`748`
`746`	`749`	`BOOL needsSimShutdown = NO;`
`747`	`750`	`if([simulator[@"state"] isEqualToString:@"Shutdown"] && [settings objectForKey:@"setPermissions"] != nil)`
`@@ -769,14 +772,14 @@ int main(int argc, const char* argv[]) {`
`769`	`772`
`770`	`773`	`if([settings boolForKey:@"clearKeychain"])`
`771`	`774`	`{`
`772`		`- performClearKeychainPass(simulatorId);`
	`775`	`+ performClearKeychainPass(simulatorId, runtimeBundleURL);`
`773`	`776`
`774`	`777`	`needsSpringBoardRestart = YES;`
`775`	`778`	`}`
`776`	`779`
`777`	`780`	`if([settings boolForKey:@"clearMedia"])`
`778`	`781`	`{`
`779`		`- performClearMediaPass(simulatorId);`
	`782`	`+ performClearMediaPass(simulatorId, runtimeBundleURL);`
`780`	`783`
`781`	`784`	`needsSpringBoardRestart = YES;`
`782`	`785`	`}`