diff --git a/Bluepill-runner/Bluepill-runner/BPApp.m b/Bluepill-runner/Bluepill-runner/BPApp.m index 0849c891..2b92550f 100644 --- a/Bluepill-runner/Bluepill-runner/BPApp.m +++ b/Bluepill-runner/Bluepill-runner/BPApp.m @@ -137,7 +137,7 @@ + (instancetype)appWithConfig:(BPConfiguration *)config [allTests addObject:testFile]; } } - + app.testBundles = allTests; return app; } diff --git a/Bluepill-runner/Bluepill-runner/main.m b/Bluepill-runner/Bluepill-runner/main.m index f897036b..379949ee 100644 --- a/Bluepill-runner/Bluepill-runner/main.m +++ b/Bluepill-runner/Bluepill-runner/main.m @@ -63,14 +63,14 @@ int main(int argc, char * argv[]) { printf("Bluepill %s\n", BP_VERSION); exit(0); } - + // 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"]; if ([xcodeVersion rangeOfString:@BP_DEFAULT_XCODE_VERSION].location == NSNotFound) { fprintf(stderr, "ERROR: Invalid Xcode version:\n%s;\nOnly %s is supported\n", [xcodeVersion UTF8String], BP_DEFAULT_XCODE_VERSION); exit(1); } - + // Check if Bluepill compile time Xcode version is matched with Bluepill runtime Xcode version // Senario to prevent: Bluepill is compiled with Xcode 8, but runs with host installed with Xcode 9 // Only compare major and minor version version Exg. 9.1 == 9.1 @@ -85,7 +85,7 @@ int main(int argc, char * argv[]) { m(); exit(0); } - + while((c = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) { if (!optarg) optarg = ""; [config saveOpt:[NSNumber numberWithInt:c] withArg:[NSString stringWithUTF8String:optarg]]; @@ -109,7 +109,7 @@ int main(int argc, char * argv[]) { [app listTests]; exit(0); } - + BPConfiguration *normalizedConfig = [BPUtils normalizeConfiguration:config withTestFiles:app.testBundles]; // start a runner and let it fly BPRunner *runner = [BPRunner BPRunnerWithConfig:normalizedConfig withBpPath:nil]; diff --git a/README.md b/README.md index 53bbaf85..e4c3f480 100644 --- a/README.md +++ b/README.md @@ -98,10 +98,11 @@ A full list supported options are listed here. ## Requirements -Bluepill only works with **Xcode 9.1**. If you're looking for old Xcode support, please check out the other branches: +Bluepill only works with **Xcode 9.2**. If you're looking for old Xcode support, please check out the other branches: * [Xcode-8](https://github.com/linkedin/bluepill/tree/xcode8) * [Xcode-9.0](https://github.com/linkedin/bluepill/tree/xcode-9.0) +* [Xcode-9.1](https://github.com/linkedin/bluepill/tree/xcode-9.1) ## Acknowledgement diff --git a/Source/Shared/BPConstants.h b/Source/Shared/BPConstants.h index 796efb79..acdfc131 100644 --- a/Source/Shared/BPConstants.h +++ b/Source/Shared/BPConstants.h @@ -9,9 +9,9 @@ #import -#define BP_DEFAULT_RUNTIME "iOS 11.1" +#define BP_DEFAULT_RUNTIME "iOS 11.2" #define BP_DEFAULT_DEVICE_TYPE "iPhone 7" -#define BP_DEFAULT_XCODE_VERSION "Xcode 9.1" +#define BP_DEFAULT_XCODE_VERSION "Xcode 9.2" #define BP_TM_PROTOCOL_VERSION 17 #define BP_DAEMON_PROTOCOL_VERSION 24 diff --git a/circle.yml b/circle.yml index 506b166b..594e1228 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: xcode: - version: 9.1 + version: 9.2 compile: override: diff --git a/scripts/bluepill.sh b/scripts/bluepill.sh index 0338dc78..3b414aa8 100755 --- a/scripts/bluepill.sh +++ b/scripts/bluepill.sh @@ -85,7 +85,6 @@ bluepill_build_sample_app() -workspace Bluepill.xcworkspace \ -scheme BPSampleApp \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.1' \ -derivedDataPath "build/" 2>&1 | tee result.txt | $XCPRETTY test $? == 0 || {