Merged PR 3898: Merge mrichter/support-xcode11 to master

Support Xcode 11 by checking for libraries in the new location.

Related work items: #18463

Author: Mike Richter

CHANGELOG.md

@@ -6,7 +6,13 @@ Change Log
 -----------------------
 
 ### Enhancements:
+
+* Now supports Xcode 11 and iOS 13.
+
 ### Changes:
+
+* Xcode 9 is no longer supported.
+
 ### Fixes:
 
 

README.md

@@ -45,13 +45,13 @@ Supported Platforms
 
 *PPiOS-Rename* supports apps developed for:
 
-* iOS 10, iOS 11, iOS 12
+* iOS 11, iOS 12, iOS 13
 * iPhone, iPod touch, and iPad
 * ARM 32-bit, ARM 64-bit, and x86 Simulator
 
 Using:
 
-* Xcode 9, Xcode 10
+* Xcode 10, Xcode 11
 * Objective-C
 
 > Note: Swift is not supported by *PPiOS-Rename*. *PPiOS-Rename* **does not work** on projects with **any** Swift code.

Source/class-dump.m

@@ -613,14 +613,17 @@ int main(int argc, char *argv[])
 static NSString *resolveFrameworkRoot(NSFileManager *fileManager,
                                       NSString *const sdkRoot) {
 
-    NSString *platformsString = @"Platforms";
-    NSRange range = [sdkRoot rangeOfString:platformsString];
+    NSRange range = [sdkRoot rangeOfString:@"/Platforms/"];
     if (range.location != NSNotFound) {
-        NSString *platforms = [sdkRoot substringToIndex:(range.location + platformsString.length)];
-        NSString *root = [platforms stringByAppendingString:@"/iPhoneOS.platform/Developer/Library/CoreSimulator/"
-                                    @"Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot"];
-        if ([fileManager fileExistsAtPath:root]) {
-            return root;
+        // In Xcode 11, the directories were reordered. Prefer the Xcode 11 order.
+        NSUInteger start = range.location + range.length;
+        NSRange replaceablePart = NSMakeRange(start, [sdkRoot length] - start);
+        for (NSString *simulator in [NSArray arrayWithObjects:@"iPhoneOS.platform/Library/Developer", @"iPhoneOS.platform/Developer/Library", nil]) {
+            NSString *candidate = [simulator stringByAppendingString:@"/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot"];
+            NSString *root = [sdkRoot stringByReplacingCharactersInRange:replaceablePart withString:candidate];
+            if ([fileManager fileExistsAtPath:root]) {
+                return root;
+            }
         }
     }