Unify Xcode version in a single place

.github/workflows/PR.yml

@@ -10,8 +10,8 @@ jobs:
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -s /Applications/Xcode_13.1.app
+      - name: Select Xcode
+        run: sudo xcode-select -s /Applications/Xcode_$(cat xcode-version).app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh instance_tests1
       - name: Capture xcresult files
@@ -29,8 +29,8 @@ jobs:
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -s /Applications/Xcode_13.1.app
+      - name: Select Xcode
+        run: sudo xcode-select -s /Applications/Xcode_$(cat xcode-version).app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh instance_tests2
       - name: Capture xcresult files
@@ -48,8 +48,8 @@ jobs:
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -s /Applications/Xcode_13.1.app
+      - name: Select Xcode
+        run: sudo xcode-select -s /Applications/Xcode_$(cat xcode-version).app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh runner_tests
       - name: Capture xcresult files

.github/workflows/master.yml

@@ -15,8 +15,8 @@ jobs:
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -s /Applications/Xcode_13.1.app
+      - name: Select Xcode
+        run: sudo xcode-select -s /Applications/Xcode_$(cat xcode-version).app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh instance_tests1
       - name: Capture xcresult files
@@ -34,8 +34,8 @@ jobs:
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -s /Applications/Xcode_13.1.app
+      - name: Select Xcode
+        run: sudo xcode-select -s /Applications/Xcode_$(cat xcode-version).app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh instance_tests2
       - name: Capture xcresult files
@@ -53,8 +53,8 @@ jobs:
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -s /Applications/Xcode_13.1.app
+      - name: Select Xcode
+        run: sudo xcode-select -s /Applications/Xcode_$(xcode-version).app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh runner_tests
       - name: Capture xcresult files

.github/workflows/release.yml

@@ -13,8 +13,8 @@ jobs:
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -s /Applications/Xcode_13.1.app
+      - name: Select Xcode
+        run: sudo xcode-select -s /Applications/Xcode_$(cat xcode-version).app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh instance_tests1
       - name: Capture xcresult files
@@ -32,8 +32,8 @@ jobs:
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 13.1
-        run: sudo xcode-select -s /Applications/Xcode_13.1.app
+      - name: Select Xcode
+        run: sudo xcode-select -s /Applications/Xcode_$(cat xcode-version).app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh instance_tests2
       - name: Capture xcresult files
@@ -54,8 +54,8 @@ jobs:
     - name: Report event trigger data
       run: |
         echo "Event ${{ github.event_name }}, ref: ${{ github.ref }}"
-    - name: Select Xcode 13.1
-      run: sudo xcode-select -s /Applications/Xcode_13.1.app
+    - name: Select Xcode
+      run: sudo xcode-select -s /Applications/Xcode_$(cat xcode-version).app
     - name: Run Bluepill tests
       run: ./scripts/bluepill.sh runner_tests
     - name: Capture xcresult files

BPSampleApp/BPSampleApp.xcodeproj/project.pbxproj

@@ -443,7 +443,7 @@
 		BAB24F261DB5D45E00867756 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1310;
 				ORGANIZATIONNAME = LinkedIn;
 				TargetAttributes = {
 					BA4BCFC51DC47EC700592FA4 = {
@@ -823,6 +823,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;
@@ -880,6 +881,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;
@@ -1001,7 +1003,7 @@
 			buildSettings = {
 				DEVELOPMENT_TEAM = 57Y47U492U;
 				INFOPLIST_FILE = BPSampleAppUITests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = LI.BPSampleAppUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1014,7 +1016,7 @@
 			buildSettings = {
 				DEVELOPMENT_TEAM = 57Y47U492U;
 				INFOPLIST_FILE = BPSampleAppUITests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = LI.BPSampleAppUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";

BPSampleApp/BPSampleApp.xcodeproj/xcshareddata/xcschemes/BPSampleApp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

bluepill/bluepill.xcodeproj/project.pbxproj

@@ -233,7 +233,7 @@
 		BAEF4B2C1DAC539400E68294 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1310;
 				ORGANIZATIONNAME = LinkedIn;
 				TargetAttributes = {
 					BA1809DF1DBA8FB100D7D130 = {

bluepill/bluepill.xcodeproj/xcshareddata/xcschemes/bluepill.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

bp/bp.xcodeproj/project.pbxproj

@@ -713,7 +713,7 @@
 		7A79017A1D5CB679004D4325 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1310;
 				ORGANIZATIONNAME = LinkedIn;
 				TargetAttributes = {
 					7A7901811D5CB679004D4325 = {
@@ -929,6 +929,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;
@@ -987,6 +988,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;
@@ -1015,6 +1017,7 @@
 		7A79018A1D5CB679004D4325 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "-";
 				DEPLOYMENT_LOCATION = NO;
 				"DEVELOPER_PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks/;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1056,6 +1059,7 @@
 		7A79018B1D5CB679004D4325 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "-";
 				DEPLOYMENT_LOCATION = NO;
 				"DEVELOPER_PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks/;
 				FRAMEWORK_SEARCH_PATHS = (

bp/bp.xcodeproj/xcshareddata/xcschemes/bp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

bp/bp.xcodeproj/xcshareddata/xcschemes/bplib.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

bp/src/BPConfiguration.m

@@ -675,22 +675,13 @@ - (BOOL)validateConfigWithError:(NSError *__autoreleasing *)errPtr {
         return NO;
     }
 
-    //Check if xcode version running on the host match the intended Bluepill branch: Xcode 9 branch is not backward compatible
-    NSString *xcodeVersion = [BPUtils runShell:@"xcodebuild -version"];
-    [BPUtils printInfo:DEBUGINFO withString:@"xcode build version: %@", xcodeVersion];
-
     if (!self.unsafeSkipXcodeVersionCheck) {
-        if ([xcodeVersion rangeOfString:@BP_DEFAULT_XCODE_VERSION].location == NSNotFound) {
-            BP_SET_ERROR(errPtr, @"ERROR: Invalid Xcode version:\n%s;\nOnly %s is supported\n", [xcodeVersion UTF8String], BP_DEFAULT_XCODE_VERSION);
-            return NO;
-        }
-
         // Check if Bluepill compile time Xcode version is matched with Bluepill runtime Xcode version
         // This check prevents Bluepill compiled with Xcode 8 running on host installed with Xcode 9
         // Only compare major and minor version version Eg. 11.2 ~ 11.2.1 but 11.2 <> 11.3
-        if (![[[BPUtils getXcodeRuntimeVersion] substringToIndex:4] isEqualToString:@BP_DEFAULT_XCODE_VERSION]) {
+        if (![BPUtils sameMajorandMinor:[BPUtils getXcodeRuntimeVersion] withVersion:[BPUtils getXcodeBuildtimeVersion]]) {
             BP_SET_ERROR(errPtr, @"ERROR: Bluepill runtime version %s and compile time version %s are mismatched\n",
-                         [[[BPUtils getXcodeRuntimeVersion] substringToIndex:4] UTF8String], [@BP_DEFAULT_XCODE_VERSION UTF8String]);
+                         [[[BPUtils getXcodeRuntimeVersion] substringToIndex:4] UTF8String], [BPUtils getXcodeBuildtimeVersion]);
             return NO;
         }
     }

bp/src/BPConstants.h

@@ -10,7 +10,6 @@
 #import <Foundation/Foundation.h>
 
 #pragma mark - Version Constants
-#define BP_DEFAULT_XCODE_VERSION "13.1"
 #define BP_DEFAULT_RUNTIME "iOS 15.0"
 #define BP_DEFAULT_BASE_SDK "15.0"
 

bp/src/BPTMDRunnerConnection.m

@@ -87,13 +87,13 @@ - (void)connect {
     dispatch_async(self.queue, ^{
 
         DTXConnection *connection = connectToTestManager(self.context.runner.device);
-        
+
         [connection registerDisconnectHandler:^{
             // This is called when the task is abruptly terminated (e.g. if the test times out)
             [self stopVideoRecording:YES];
             [BPUtils printInfo:INFO withString:@"DTXConnection disconnected."];
         }];
-        
+
         [connection
          xct_handleProxyRequestForInterface:@protocol(XCTMessagingChannel_RunnerToIDE)
          peerInterface:@protocol(XCTMessagingChannel_IDEToRunner)
@@ -183,24 +183,24 @@ - (void)stopVideoRecording:(BOOL)forced
         }
         return;
     }
-    
+
     if (forced) {
         [BPUtils printInfo:ERROR withString: @"Found dangling video recording task. Stopping it."];
     }
-    
+
     if (![task isRunning]) {
         [BPUtils printInfo:ERROR withString:@"Video task exists but it was already terminated with status %d", [task terminationStatus]];
     }
-    
+
     [BPUtils printInfo:INFO withString:@"Stopping recording video."];
     [BPUtils printInfo:DEBUGINFO withString:@"Stopping video recording task with pid %d and command: %@", [task processIdentifier], [BPUtils getCommandStringForTask:task]];
     [task interrupt];
     [task waitUntilExit];
-    
+
     if ([task terminationStatus] != 0) {
         [BPUtils printInfo:ERROR withString:@"Video task was interrupted, but exited with non-zero status %d", [task terminationStatus]];
     }
-    
+
     NSString *filePath = [[task arguments].lastObject componentsSeparatedByString:@" "].lastObject;
     if (![[NSFileManager defaultManager] fileExistsAtPath:filePath]) {
         [BPUtils printInfo:ERROR withString:@"Video recording file missing, expected at path %@!", filePath];
@@ -344,7 +344,7 @@ - (id)_XCT_testSuite:(NSString *)tests didStartAt:(NSString *)time {
 
 - (id)_XCT_testSuite:(NSString *)arg1 didFinishAt:(NSString *)time runCount:(NSNumber *)count withFailures:(NSNumber *)failureCount unexpected:(NSNumber *)unexpectedCount testDuration:(NSNumber *)testDuration totalDuration:(NSNumber *)totalTime {
     [BPUtils printInfo:DEBUGINFO withString: @"BPTestBundleConnection_XCT_testSuite: %@, didFinishAt: %@, runCount: %@, withFailures: %@, unexpectedCount: %@, testDuration: %@, totalDuration: %@", arg1, time, count, failureCount, unexpectedCount, testDuration, totalTime];
-    
+
     if ([self shouldRecordVideo]) {
         [self stopVideoRecording:YES];
     }
@@ -405,7 +405,7 @@ - (id)_XCT_launchProcessWithPath:(NSString *)path bundleID:(NSString *)bundleID
         return nil;
     }
     [BPUtils printInfo:DEBUGINFO withString:@"BPTestBundleConnection Launching app: %@ with options %@", bundleID, options];
-    
+
     self.appProcessPID = [self.simulator.device launchApplicationWithID:bundleID options:options error:&error];
     self.bundleID = bundleID;
     if (error) {

bp/src/BPUtils.h

@@ -150,6 +150,11 @@ typedef NS_ENUM(int, BPKind) {
 
 + (NSString *)getXcodeRuntimeVersion;
 
++ (NSString *)getXcodeBuildtimeVersion;
+
++ (bool)sameMajorandMinor:(NSString * _Nonnull)version1 withVersion:(NSString * _Nonnull)version2;
+
+
 typedef BOOL (^BPRunBlock)(void);
 
 /*!

bp/src/BPUtils.m

@@ -282,6 +282,19 @@ + (NSString *)getXcodeRuntimeVersion {
     return runTimeVersion;
 }
 
++ (NSString *)getXcodeBuildtimeVersion {
+    return [NSString stringWithUTF8String:XCODE_VERSION];
+}
+
+// Compare major and minor version version Eg. 11.2 ~ 11.2.1 but 11.2 <> 11.3
++ (bool)sameMajorandMinor:(NSString * _Nonnull)version1 withVersion:(NSString * _Nonnull)version2 {
+    NSArray *v1parts = [version1 componentsSeparatedByString:@" "];
+    NSArray *v2parts = [version2 componentsSeparatedByString:@" "];
+    NSArray <NSString *> *v1versionParts = [[v1parts objectAtIndex:0] componentsSeparatedByString:@"."];
+    NSArray <NSString *> *v2versionParts = [[v2parts objectAtIndex:0] componentsSeparatedByString:@"."];
+    return [v1versionParts[0] isEqualToString:v2versionParts[0]] && [v1versionParts[1] isEqualToString:v2versionParts[1]];
+}
+
 + (void)saveDebuggingDiagnostics:(NSString *)outputDirectory {
   BOOL isDir = false;
   NSFileManager *fm = [NSFileManager defaultManager];

xcode-version

@@ -0,0 +1 @@
+13.1