first attempt

MobileNativeFoundation · Sep 12, 2023 · 0137850 · 0137850
1 parent 97ab3a0
commit 0137850
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 35 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-12
+    runs-on: macos-13
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 14.0
-        run: sudo xcode-select -s /Applications/Xcode_14.0.app
+      - name: Select Xcode 15.0
+        run: sudo xcode-select -s /Applications/Xcode_15.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-12
+    runs-on: macos-13
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 14.0
-        run: sudo xcode-select -s /Applications/Xcode_14.0.app
+      - name: Select Xcode 15.0
+        run: sudo xcode-select -s /Applications/Xcode_15.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-12
+    runs-on: macos-13
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 14.0
-        run: sudo xcode-select -s /Applications/Xcode_14.0.app
+      - name: Select Xcode 15.0
+        run: sudo xcode-select -s /Applications/Xcode_15.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-12
+    runs-on: macos-13
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 14.0
-        run: sudo xcode-select -s /Applications/Xcode_14.0.app
+      - name: Select Xcode 15.0
+        run: sudo xcode-select -s /Applications/Xcode_15.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-12
+    runs-on: macos-13
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 14.0
-        run: sudo xcode-select -s /Applications/Xcode_14.0.app
+      - name: Select Xcode 15.0
+        run: sudo xcode-select -s /Applications/Xcode_15.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-12
+    runs-on: macos-13
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 14.0
-        run: sudo xcode-select -s /Applications/Xcode_14.0.app
+      - name: Select Xcode 15.0
+        run: sudo xcode-select -s /Applications/Xcode_15.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-12
+    runs-on: macos-13
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 14.0
-        run: sudo xcode-select -s /Applications/Xcode_14.0.app
+      - name: Select Xcode 15.0
+        run: sudo xcode-select -s /Applications/Xcode_15.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-12
+    runs-on: macos-13
     steps:
       # actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
       - uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
-      - name: Select Xcode 14.0
-        run: sudo xcode-select -s /Applications/Xcode_14.0.app
+      - name: Select Xcode 15.0
+        run: sudo xcode-select -s /Applications/Xcode_15.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-12
+    runs-on: macos-13
     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 14.0
-      run: sudo xcode-select -s /Applications/Xcode_14.0.app
+    - name: Select Xcode 15.0
+      run: sudo xcode-select -s /Applications/Xcode_15.0.app
     - name: Run Bluepill tests
       run: ./scripts/bluepill.sh runner_tests
     - name: Capture xcresult files

diff --git a/bp/bp.xcodeproj/project.pbxproj b/bp/bp.xcodeproj/project.pbxproj
@@ -1017,6 +1017,7 @@
 			buildSettings = {
 				DEPLOYMENT_LOCATION = NO;
 				"DEVELOPER_PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks/;
+				DSTROOT = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"\"/Library/Developer/PrivateFrameworks\"",
 					"\"$(PRIVATE_FRAMEWORKS_DIR)\"",
@@ -1031,6 +1032,7 @@
 					"$(SRCROOT)/src",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist";
+				INSTALL_ROOT = /;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				OTHER_CFLAGS = "-DBP_USE_PRIVATE_FRAMEWORKS";
 				OTHER_LDFLAGS = (
@@ -1056,6 +1058,7 @@
 			buildSettings = {
 				DEPLOYMENT_LOCATION = NO;
 				"DEVELOPER_PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks/;
+				DSTROOT = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"\"/Library/Developer/PrivateFrameworks\"",
 					"\"$(PRIVATE_FRAMEWORKS_DIR)\"",
@@ -1070,6 +1073,7 @@
 					"$(SRCROOT)/src",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist";
+				INSTALL_ROOT = /;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				OTHER_CFLAGS = "-DBP_USE_PRIVATE_FRAMEWORKS";
 				OTHER_LDFLAGS = (
@@ -1106,6 +1110,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				"DEVELOPER_PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks;
+				DSTROOT = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
@@ -1115,6 +1120,7 @@
 					"$(SRCROOT)/src",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist";
+				INSTALL_ROOT = /;
 				MACH_O_TYPE = staticlib;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				OTHER_LDFLAGS = "";
@@ -1143,6 +1149,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				"DEVELOPER_PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks;
+				DSTROOT = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
@@ -1152,6 +1159,7 @@
 					"$(SRCROOT)/src",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist";
+				INSTALL_ROOT = /;
 				MACH_O_TYPE = staticlib;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				OTHER_LDFLAGS = "";
@@ -1169,17 +1177,17 @@
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 57Y47U492U;
+				DSTROOT = "";
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/..",
 					"$(SRCROOT)/src",
 				);
 				INFOPLIST_FILE = tests/Info.plist;
+				INSTALL_ROOT = /;
 				LD_RUNPATH_SEARCH_PATHS = "\"$(DEVELOPER_DIR)/Library/PrivateFrameworks\"";
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				OTHER_CFLAGS = "-DBP_USE_PRIVATE_FRAMEWORKS";
 				OTHER_LDFLAGS = (
-					"-weak_framework",
-					DVTFoundation,
 					"-weak_framework",
 					CoreSimulator,
 					"-weak_framework",
@@ -1201,17 +1209,17 @@
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = 57Y47U492U;
+				DSTROOT = "";
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/..",
 					"$(SRCROOT)/src",
 				);
 				INFOPLIST_FILE = tests/Info.plist;
+				INSTALL_ROOT = /;
 				LD_RUNPATH_SEARCH_PATHS = "\"$(DEVELOPER_DIR)/Library/PrivateFrameworks\"";
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				OTHER_CFLAGS = "-DBP_USE_PRIVATE_FRAMEWORKS";
 				OTHER_LDFLAGS = (
-					"-weak_framework",
-					DVTFoundation,
 					"-weak_framework",
 					CoreSimulator,
 					"-weak_framework",

diff --git a/bp/src/BPConstants.h b/bp/src/BPConstants.h
@@ -10,11 +10,11 @@
 #import <Foundation/Foundation.h>
 
 #pragma mark - Version Constants
-#define BP_DEFAULT_XCODE_VERSION "14.0"
-#define BP_DEFAULT_RUNTIME "iOS 16.0"
-#define BP_DEFAULT_BASE_SDK "16.0"
+#define BP_DEFAULT_XCODE_VERSION "15.0"
+#define BP_DEFAULT_RUNTIME "iOS 17.0"
+#define BP_DEFAULT_BASE_SDK "17.0"
 
-#define BP_DEFAULT_DEVICE_TYPE "iPhone 8"
+#define BP_DEFAULT_DEVICE_TYPE "iPhone 11"
 
 #define BP_DAEMON_PROTOCOL_VERSION 26
 #define BP_MAX_PROCESSES_PERCENT 0.75