Add xcode 14 support (#538)

* initial test Signed-off-by: Nan Wang <nanwang1101@yahoo.com> * add github action Signed-off-by: Nan Wang <nanwang1101@yahoo.com> Signed-off-by: Nan Wang <nanwang1101@yahoo.com>
MobileNativeFoundation · Aug 22, 2022 · b62c5e3 · b62c5e3
1 parent 8c1b923
commit b62c5e3
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 44 deletions.
diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml
@@ -6,12 +6,12 @@ jobs:
   # First machine, runs BP tests batch 1
   integration_tests1:
     name: Instance Test 1
-    runs-on: macos-11
+    runs-on: macos-12
     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 14.0
+        run: sudo xcode-select -s /Applications/Xcode_14.0.app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh instance_tests1
       - name: Capture xcresult files
@@ -25,12 +25,12 @@ jobs:
   # Second machine, runs BP tests batch 2
   integration_tests2:
     name: Instance Test 2
-    runs-on: macos-11
+    runs-on: macos-12
     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 14.0
+        run: sudo xcode-select -s /Applications/Xcode_14.0.app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh instance_tests2
       - name: Capture xcresult files
@@ -44,12 +44,12 @@ jobs:
   # Third machine, runs Bluepill tests and makes release build
   build:
     name: Bluepill Test and build
-    runs-on: macos-11
+    runs-on: macos-12
     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 14.0
+        run: sudo xcode-select -s /Applications/Xcode_14.0.app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh runner_tests
       - name: Capture xcresult files

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -11,12 +11,12 @@ jobs:
   # First machine, runs BP tests batch 1
   integration_tests1:
     name: Instance Test 1
-    runs-on: macos-11
+    runs-on: macos-12
     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 14.0
+        run: sudo xcode-select -s /Applications/Xcode_14.0.app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh instance_tests1
       - name: Capture xcresult files
@@ -30,12 +30,12 @@ jobs:
   # Second machine, runs BP tests batch 2
   integration_tests2:
     name: Instance Test 2
-    runs-on: macos-11
+    runs-on: macos-12
     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 14.0
+        run: sudo xcode-select -s /Applications/Xcode_14.0.app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh instance_tests2
       - name: Capture xcresult files
@@ -49,12 +49,12 @@ jobs:
   # Third machine, runs Bluepill tests and makes release build
   build:
     name: Bluepill Test and build
-    runs-on: macos-11
+    runs-on: macos-12
     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 14.0
+        run: sudo xcode-select -s /Applications/Xcode_14.0.app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh runner_tests
       - name: Capture xcresult files

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,12 +9,12 @@ jobs:
   # First machine, runs BP tests batch 1
   integration_tests1:
     name: Instance Test 1
-    runs-on: macos-11
+    runs-on: macos-12
     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 14.0
+        run: sudo xcode-select -s /Applications/Xcode_14.0.app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh instance_tests1
       - name: Capture xcresult files
@@ -28,12 +28,12 @@ jobs:
   # Second machine, runs BP tests batch 2
   integration_tests2:
     name: Instance Test 2
-    runs-on: macos-11
+    runs-on: macos-12
     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 14.0
+        run: sudo xcode-select -s /Applications/Xcode_14.0.app
       - name: Run Bluepill tests
         run: ./scripts/bluepill.sh instance_tests2
       - name: Capture xcresult files
@@ -47,15 +47,15 @@ jobs:
   # Third machine, runs Bluepill tests and makes release build
   build:
     name: BP Test and build
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
     # actions/checkout@v2 but we use the sha because tags can be rewritten in git
     - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
     - 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 14.0
+      run: sudo xcode-select -s /Applications/Xcode_14.0.app
     - name: Run Bluepill tests
       run: ./scripts/bluepill.sh runner_tests
     - name: Capture xcresult files

diff --git a/README.md b/README.md
@@ -104,12 +104,12 @@ The exit code of Bluepill uses bit indicators which could represent multiple exi
 
 ## Requirements
 
-Bluepill officially supports **Xcode 13.1**. If you're looking for old Xcode support, please checkout the following branches:
+Bluepill officially supports **Xcode 14.0**. If you're looking for old Xcode support, please checkout the following branches:
 
 * [Xcode-10.0](https://github.com/linkedin/bluepill/tree/xcode-10.0)  | [Xcode-10.1](https://github.com/linkedin/bluepill/tree/xcode-10.1)  | [Xcode-10.2](https://github.com/linkedin/bluepill/tree/xcode-10.2)  | [Xcode-10.3](https://github.com/linkedin/bluepill/tree/xcode-10.3)
 * [Xcode-11.0](https://github.com/linkedin/bluepill/tree/xcode-11.0)  | [Xcode-11.1](https://github.com/linkedin/bluepill/tree/xcode-11.1)  | [Xcode-11.2](https://github.com/linkedin/bluepill/tree/xcode-11.2)  | [Xcode-11.3](https://github.com/linkedin/bluepill/tree/xcode-11.3)  | [Xcode-11.4](https://github.com/linkedin/bluepill/tree/xcode-11.4)  | [Xcode-11.5](https://github.com/linkedin/bluepill/tree/xcode-11.5)
 * [Xcode-12.0](https://github.com/linkedin/bluepill/tree/xcode-12.0)  | [Xcode-12.2](https://github.com/linkedin/bluepill/tree/xcode-12.2)  | [Xcode-12.3](https://github.com/linkedin/bluepill/tree/xcode-12.3) | [Xcode-12.4](https://github.com/linkedin/bluepill/tree/xcode-12.4) | [Xcode-12.5](https://github.com/linkedin/bluepill/tree/xcode-12.5)
-* [Xcode-13.0](https://github.com/mobilenativefoundation/bluepill/tree/xcode-13.0)
+* [Xcode-13.0](https://github.com/mobilenativefoundation/bluepill/tree/xcode-13.0) | [Xcode-13.1](https://github.com/mobilenativefoundation/bluepill/tree/xcode-13.1)
 
 
 If you're looking for newer Xcode version support, try using Bluepill with `unsafe-skip-xcode-version-check` flag but make sure your app is tested with it and the underlying risks are understood.

diff --git a/bp/bp.xcodeproj/project.pbxproj b/bp/bp.xcodeproj/project.pbxproj
@@ -1031,7 +1031,7 @@
 					"$(SRCROOT)/src",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				OTHER_CFLAGS = "-DBP_USE_PRIVATE_FRAMEWORKS";
 				OTHER_LDFLAGS = (
 					"-weak_framework",
@@ -1044,8 +1044,6 @@
 					DTXConnectionServices,
 					"-weak_framework",
 					SimulatorKit,
-					"-weak_framework",
-					XCTAutomationSupport,
 				);
 				"PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks/;
 				PRODUCT_BUNDLE_IDENTIFIER = com.linkedin.bp;
@@ -1072,7 +1070,7 @@
 					"$(SRCROOT)/src",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				OTHER_CFLAGS = "-DBP_USE_PRIVATE_FRAMEWORKS";
 				OTHER_LDFLAGS = (
 					"-weak_framework",
@@ -1085,8 +1083,6 @@
 					DTXConnectionServices,
 					"-weak_framework",
 					SimulatorKit,
-					"-weak_framework",
-					XCTAutomationSupport,
 				);
 				"PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks/;
 				PRODUCT_BUNDLE_IDENTIFIER = com.linkedin.bp;
@@ -1120,7 +1116,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist";
 				MACH_O_TYPE = staticlib;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				OTHER_LDFLAGS = "";
 				"PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks;
 				PRODUCT_BUNDLE_IDENTIFIER = com.linkedin.bluelib;
@@ -1157,7 +1153,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist";
 				MACH_O_TYPE = staticlib;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				OTHER_LDFLAGS = "";
 				"PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks;
 				PRODUCT_BUNDLE_IDENTIFIER = com.linkedin.bluelib;
@@ -1179,6 +1175,7 @@
 				);
 				INFOPLIST_FILE = tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "\"$(DEVELOPER_DIR)/Library/PrivateFrameworks\"";
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				OTHER_CFLAGS = "-DBP_USE_PRIVATE_FRAMEWORKS";
 				OTHER_LDFLAGS = (
 					"-weak_framework",
@@ -1191,8 +1188,6 @@
 					DTXConnectionServices,
 					"-weak_framework",
 					SimulatorKit,
-					"-weak_framework",
-					XCTAutomationSupport,
 				);
 				"PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks/;
 				PRODUCT_BUNDLE_IDENTIFIER = LI.BPInstanceTests;
@@ -1212,6 +1207,7 @@
 				);
 				INFOPLIST_FILE = tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "\"$(DEVELOPER_DIR)/Library/PrivateFrameworks\"";
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				OTHER_CFLAGS = "-DBP_USE_PRIVATE_FRAMEWORKS";
 				OTHER_LDFLAGS = (
 					"-weak_framework",
@@ -1224,8 +1220,6 @@
 					DTXConnectionServices,
 					"-weak_framework",
 					SimulatorKit,
-					"-weak_framework",
-					XCTAutomationSupport,
 				);
 				"PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks/;
 				PRODUCT_BUNDLE_IDENTIFIER = LI.BPInstanceTests;

diff --git a/bp/src/BPConstants.h b/bp/src/BPConstants.h
@@ -10,9 +10,9 @@
 #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"
+#define BP_DEFAULT_XCODE_VERSION "14.0"
+#define BP_DEFAULT_RUNTIME "iOS 16.0"
+#define BP_DEFAULT_BASE_SDK "16.0"
 
 #define BP_DEFAULT_DEVICE_TYPE "iPhone 8"