Skip to content

Commit b62c5e3

Browse files
nanwngnanwng
authored
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>
1 parent 8c1b923 commit b62c5e3

File tree

6 files changed

+38
-44
lines changed

6 files changed

+38
-44
lines changed

‎.github/workflows/PR.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ jobs:
66
# First machine, runs BP tests batch 1
77
integration_tests1:
88
name: Instance Test 1
9-
runs-on: macos-11
9+
runs-on: macos-12
1010
steps:
1111
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
1212
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
13-
- name: Select Xcode 13.1
14-
run: sudo xcode-select -s /Applications/Xcode_13.1.app
13+
- name: Select Xcode 14.0
14+
run: sudo xcode-select -s /Applications/Xcode_14.0.app
1515
- name: Run Bluepill tests
1616
run: ./scripts/bluepill.sh instance_tests1
1717
- name: Capture xcresult files
@@ -25,12 +25,12 @@ jobs:
2525
# Second machine, runs BP tests batch 2
2626
integration_tests2:
2727
name: Instance Test 2
28-
runs-on: macos-11
28+
runs-on: macos-12
2929
steps:
3030
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
3131
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
32-
- name: Select Xcode 13.1
33-
run: sudo xcode-select -s /Applications/Xcode_13.1.app
32+
- name: Select Xcode 14.0
33+
run: sudo xcode-select -s /Applications/Xcode_14.0.app
3434
- name: Run Bluepill tests
3535
run: ./scripts/bluepill.sh instance_tests2
3636
- name: Capture xcresult files
@@ -44,12 +44,12 @@ jobs:
4444
# Third machine, runs Bluepill tests and makes release build
4545
build:
4646
name: Bluepill Test and build
47-
runs-on: macos-11
47+
runs-on: macos-12
4848
steps:
4949
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
5050
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
51-
- name: Select Xcode 13.1
52-
run: sudo xcode-select -s /Applications/Xcode_13.1.app
51+
- name: Select Xcode 14.0
52+
run: sudo xcode-select -s /Applications/Xcode_14.0.app
5353
- name: Run Bluepill tests
5454
run: ./scripts/bluepill.sh runner_tests
5555
- name: Capture xcresult files

‎.github/workflows/master.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
# First machine, runs BP tests batch 1
1212
integration_tests1:
1313
name: Instance Test 1
14-
runs-on: macos-11
14+
runs-on: macos-12
1515
steps:
1616
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
1717
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
18-
- name: Select Xcode 13.1
19-
run: sudo xcode-select -s /Applications/Xcode_13.1.app
18+
- name: Select Xcode 14.0
19+
run: sudo xcode-select -s /Applications/Xcode_14.0.app
2020
- name: Run Bluepill tests
2121
run: ./scripts/bluepill.sh instance_tests1
2222
- name: Capture xcresult files
@@ -30,12 +30,12 @@ jobs:
3030
# Second machine, runs BP tests batch 2
3131
integration_tests2:
3232
name: Instance Test 2
33-
runs-on: macos-11
33+
runs-on: macos-12
3434
steps:
3535
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
3636
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
37-
- name: Select Xcode 13.1
38-
run: sudo xcode-select -s /Applications/Xcode_13.1.app
37+
- name: Select Xcode 14.0
38+
run: sudo xcode-select -s /Applications/Xcode_14.0.app
3939
- name: Run Bluepill tests
4040
run: ./scripts/bluepill.sh instance_tests2
4141
- name: Capture xcresult files
@@ -49,12 +49,12 @@ jobs:
4949
# Third machine, runs Bluepill tests and makes release build
5050
build:
5151
name: Bluepill Test and build
52-
runs-on: macos-11
52+
runs-on: macos-12
5353
steps:
5454
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
5555
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
56-
- name: Select Xcode 13.1
57-
run: sudo xcode-select -s /Applications/Xcode_13.1.app
56+
- name: Select Xcode 14.0
57+
run: sudo xcode-select -s /Applications/Xcode_14.0.app
5858
- name: Run Bluepill tests
5959
run: ./scripts/bluepill.sh runner_tests
6060
- name: Capture xcresult files

‎.github/workflows/release.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99
# First machine, runs BP tests batch 1
1010
integration_tests1:
1111
name: Instance Test 1
12-
runs-on: macos-11
12+
runs-on: macos-12
1313
steps:
1414
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
1515
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
16-
- name: Select Xcode 13.1
17-
run: sudo xcode-select -s /Applications/Xcode_13.1.app
16+
- name: Select Xcode 14.0
17+
run: sudo xcode-select -s /Applications/Xcode_14.0.app
1818
- name: Run Bluepill tests
1919
run: ./scripts/bluepill.sh instance_tests1
2020
- name: Capture xcresult files
@@ -28,12 +28,12 @@ jobs:
2828
# Second machine, runs BP tests batch 2
2929
integration_tests2:
3030
name: Instance Test 2
31-
runs-on: macos-11
31+
runs-on: macos-12
3232
steps:
3333
# actions/checkout@v2 but we use the SHA1 because tags can be re-written in git
3434
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
35-
- name: Select Xcode 13.1
36-
run: sudo xcode-select -s /Applications/Xcode_13.1.app
35+
- name: Select Xcode 14.0
36+
run: sudo xcode-select -s /Applications/Xcode_14.0.app
3737
- name: Run Bluepill tests
3838
run: ./scripts/bluepill.sh instance_tests2
3939
- name: Capture xcresult files
@@ -47,15 +47,15 @@ jobs:
4747
# Third machine, runs Bluepill tests and makes release build
4848
build:
4949
name: BP Test and build
50-
runs-on: macos-11
50+
runs-on: macos-12
5151
steps:
5252
# actions/checkout@v2 but we use the sha because tags can be rewritten in git
5353
- uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
5454
- name: Report event trigger data
5555
run: |
5656
echo "Event ${{ github.event_name }}, ref: ${{ github.ref }}"
57-
- name: Select Xcode 13.1
58-
run: sudo xcode-select -s /Applications/Xcode_13.1.app
57+
- name: Select Xcode 14.0
58+
run: sudo xcode-select -s /Applications/Xcode_14.0.app
5959
- name: Run Bluepill tests
6060
run: ./scripts/bluepill.sh runner_tests
6161
- name: Capture xcresult files

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ The exit code of Bluepill uses bit indicators which could represent multiple exi
104104

105105
## Requirements
106106

107-
Bluepill officially supports **Xcode 13.1**. If you're looking for old Xcode support, please checkout the following branches:
107+
Bluepill officially supports **Xcode 14.0**. If you're looking for old Xcode support, please checkout the following branches:
108108

109109
* [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)
110110
* [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)
111111
* [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)
112-
* [Xcode-13.0](https://github.com/mobilenativefoundation/bluepill/tree/xcode-13.0)
112+
* [Xcode-13.0](https://github.com/mobilenativefoundation/bluepill/tree/xcode-13.0) | [Xcode-13.1](https://github.com/mobilenativefoundation/bluepill/tree/xcode-13.1)
113113

114114

115115
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.

‎bp/bp.xcodeproj/project.pbxproj

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,7 +1031,7 @@
10311031
"$(SRCROOT)/src",
10321032
);
10331033
INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist";
1034-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1034+
MACOSX_DEPLOYMENT_TARGET = 11.0;
10351035
OTHER_CFLAGS = "-DBP_USE_PRIVATE_FRAMEWORKS";
10361036
OTHER_LDFLAGS = (
10371037
"-weak_framework",
@@ -1044,8 +1044,6 @@
10441044
DTXConnectionServices,
10451045
"-weak_framework",
10461046
SimulatorKit,
1047-
"-weak_framework",
1048-
XCTAutomationSupport,
10491047
);
10501048
"PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks/;
10511049
PRODUCT_BUNDLE_IDENTIFIER = com.linkedin.bp;
@@ -1072,7 +1070,7 @@
10721070
"$(SRCROOT)/src",
10731071
);
10741072
INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist";
1075-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1073+
MACOSX_DEPLOYMENT_TARGET = 11.0;
10761074
OTHER_CFLAGS = "-DBP_USE_PRIVATE_FRAMEWORKS";
10771075
OTHER_LDFLAGS = (
10781076
"-weak_framework",
@@ -1085,8 +1083,6 @@
10851083
DTXConnectionServices,
10861084
"-weak_framework",
10871085
SimulatorKit,
1088-
"-weak_framework",
1089-
XCTAutomationSupport,
10901086
);
10911087
"PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks/;
10921088
PRODUCT_BUNDLE_IDENTIFIER = com.linkedin.bp;
@@ -1120,7 +1116,7 @@
11201116
);
11211117
INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist";
11221118
MACH_O_TYPE = staticlib;
1123-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1119+
MACOSX_DEPLOYMENT_TARGET = 11.0;
11241120
OTHER_LDFLAGS = "";
11251121
"PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks;
11261122
PRODUCT_BUNDLE_IDENTIFIER = com.linkedin.bluelib;
@@ -1157,7 +1153,7 @@
11571153
);
11581154
INFOPLIST_FILE = "$(SRCROOT)/src/Info.plist";
11591155
MACH_O_TYPE = staticlib;
1160-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1156+
MACOSX_DEPLOYMENT_TARGET = 11.0;
11611157
OTHER_LDFLAGS = "";
11621158
"PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks;
11631159
PRODUCT_BUNDLE_IDENTIFIER = com.linkedin.bluelib;
@@ -1179,6 +1175,7 @@
11791175
);
11801176
INFOPLIST_FILE = tests/Info.plist;
11811177
LD_RUNPATH_SEARCH_PATHS = "\"$(DEVELOPER_DIR)/Library/PrivateFrameworks\"";
1178+
MACOSX_DEPLOYMENT_TARGET = 11.0;
11821179
OTHER_CFLAGS = "-DBP_USE_PRIVATE_FRAMEWORKS";
11831180
OTHER_LDFLAGS = (
11841181
"-weak_framework",
@@ -1191,8 +1188,6 @@
11911188
DTXConnectionServices,
11921189
"-weak_framework",
11931190
SimulatorKit,
1194-
"-weak_framework",
1195-
XCTAutomationSupport,
11961191
);
11971192
"PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks/;
11981193
PRODUCT_BUNDLE_IDENTIFIER = LI.BPInstanceTests;
@@ -1212,6 +1207,7 @@
12121207
);
12131208
INFOPLIST_FILE = tests/Info.plist;
12141209
LD_RUNPATH_SEARCH_PATHS = "\"$(DEVELOPER_DIR)/Library/PrivateFrameworks\"";
1210+
MACOSX_DEPLOYMENT_TARGET = 11.0;
12151211
OTHER_CFLAGS = "-DBP_USE_PRIVATE_FRAMEWORKS";
12161212
OTHER_LDFLAGS = (
12171213
"-weak_framework",
@@ -1224,8 +1220,6 @@
12241220
DTXConnectionServices,
12251221
"-weak_framework",
12261222
SimulatorKit,
1227-
"-weak_framework",
1228-
XCTAutomationSupport,
12291223
);
12301224
"PRIVATE_FRAMEWORKS_DIR[arch=*]" = /Library/Developer/PrivateFrameworks/;
12311225
PRODUCT_BUNDLE_IDENTIFIER = LI.BPInstanceTests;

‎bp/src/BPConstants.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#import <Foundation/Foundation.h>
1111

1212
#pragma mark - Version Constants
13-
#define BP_DEFAULT_XCODE_VERSION "13.1"
14-
#define BP_DEFAULT_RUNTIME "iOS 15.0"
15-
#define BP_DEFAULT_BASE_SDK "15.0"
13+
#define BP_DEFAULT_XCODE_VERSION "14.0"
14+
#define BP_DEFAULT_RUNTIME "iOS 16.0"
15+
#define BP_DEFAULT_BASE_SDK "16.0"
1616

1717
#define BP_DEFAULT_DEVICE_TYPE "iPhone 8"
1818

0 commit comments

Comments
 (0)