Minor fixes for XCode 9.1 #207
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Please don't merge this. This is a placeholder until Xcode 9.1 is released. Tested with Xcode 9.1-beta so far. |
oliverhu
reviewed
Oct 30, 2017
Source/Shared/BPXCTestFile.m
Outdated
| testHostPath = [testHostPath stringByAppendingString:appNameWithExtension]; | ||
| testBundlePath = [testBundlePath stringByReplacingOccurrencesOfString:TESTROOT withString:temp]; | ||
| if ([testHostPath rangeOfString:PLATFORMS].location != NSNotFound) { | ||
|
|
There was a problem hiding this comment.
This is actually from a different PR... I'm not sure how I ended up committing it here. I'll finish it and piggyback my fix on this PR.
|
remember to update read.me |
|
Don't suppose this can be merged now? I'm trying to use Bluepill but Xcode 9.1 is the problem I think :( |
Merged
|
I'm just waiting for the tests to finish on this one and I'll merge it and move what's there to the |
oliverhu
reviewed
Nov 16, 2017
| @@ -65,13 +65,15 @@ @implementation BPApp | |||
|
|
|||
| + (NSArray <BPXCTestFile *>*)testsFromXCTestRunDict:(NSDictionary *)xcTestRunDict | |||
| andXCTestRunPath:(NSString *)xcTestRunPath | |||
| andXcodePath: (NSString *)xcodePath | |||
oliverhu
reviewed
Nov 17, 2017
| withError:(NSError *__autoreleasing *)error { | ||
|
|
||
| NSMutableArray<BPXCTestFile *> *allTests = [[NSMutableArray alloc] init]; | ||
| NSUInteger errorCount = 0; | ||
| for (NSString *key in xcTestRunDict) { | ||
| BPXCTestFile *xcTestFile = [BPXCTestFile BPXCTestFileFromDictionary:[xcTestRunDict objectForKey:key] | ||
| withTestRoot:[xcTestRunPath stringByDeletingLastPathComponent] | ||
| andXcodePath:xcodePath | ||
| andError:error]; |
oliverhu
reviewed
Nov 17, 2017
| @@ -98,6 +100,7 @@ + (instancetype)appWithConfig:(BPConfiguration *)config | |||
| [BPUtils printInfo:INFO withString:@"Using xctestrun configuration"]; | |||
| NSArray<BPXCTestFile *> *loadedTests = [BPApp testsFromXCTestRunDict:config.xcTestRunDict | |||
| andXCTestRunPath:config.xcTestRunPath | |||
| andXcodePath:config.xcodePath | |||
oliverhu
reviewed
Nov 17, 2017
| @@ -73,7 +73,8 @@ int main(int argc, char * argv[]) { | |||
|
|
|||
| //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 | |||
| if ([[BPUtils getXcodeRuntimeVersion] isEqualToString:@XCODE_VERSION]) { | |||
| //Only compare major version Exg. 9.1 == 9.1 | |||
There was a problem hiding this comment.
major and minor version (not comparing patch version)
oliverhu
reviewed
Nov 17, 2017
| @@ -73,7 +73,8 @@ int main(int argc, char * argv[]) { | |||
|
|
|||
| //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 | |||
| if ([[BPUtils getXcodeRuntimeVersion] isEqualToString:@XCODE_VERSION]) { | |||
| //Only compare major version Exg. 9.1 == 9.1 | |||
| if ([[[BPUtils getXcodeRuntimeVersion] substringToIndex:3] isEqualToString:[@XCODE_VERSION substringToIndex:3]]) { | |||
| printf("Bluepill runtime version and compile time version are matched: %s\n", XCODE_VERSION); | |||
| } else { | |||
| fprintf(stderr, "ERROR: Bluepill runtime version %s and compile time version %s are mismatched\n", [[BPUtils getXcodeRuntimeVersion] UTF8String], XCODE_VERSION); | |||
There was a problem hiding this comment.
we should also update the error msg to only use substring to index 3.. otherwise people would think you need the exact patch version
ob
added a commit
that referenced
this pull request
Mar 2, 2018
* Minor fixes for XCode 9.1 * Only check runtime major iOS version number in testRunUITest * Bump Xcode version for circleci * Bump runtime versions and Xcode version * only compare major Xcode version for bluepill compile time and bluepill runtime * Wire in the XcodePath to fix the code for replacing __PLATFORMS__ * Update README
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mostly cosmetic and bump to iOS version