Fix support for Xcode 9 -> 10.2 #363
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| version: 2.1 | ||
|
|
||
| step-library: | ||
| - &restore-cache | ||
| restore_cache: | ||
| keys: | ||
| - carthage-cache-mbdirections-v1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "Cartfile.resolved" }} | ||
| - carthage-cache-mbdirections-v1- # used if checksum fails | ||
|
|
||
| - &save-cache | ||
| save_cache: | ||
| key: carthage-cache-mbdirections-v1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "Cartfile.resolved" }} | ||
| paths: | ||
| - Carthage | ||
|
|
||
| - &prepare | ||
| run: | ||
| name: Prepare | ||
| command: | | ||
| if [ $(carthage outdated | grep -cF "latest Carthage version") -eq 0 ]; then brew update && brew upgrade carthage || true; fi | ||
| echo "foo" > ~/.mapbox | ||
|
|
||
| jobs: | ||
| build-job: | ||
| parameters: | ||
| xcode: | ||
| type: string | ||
| device: | ||
| type: string | ||
| default: "iPhone 6 Plus" | ||
| iOS: | ||
| type: string | ||
| default: "12.1" | ||
| watchOS: | ||
| type: string | ||
| default: "5.0" | ||
| tvOS: | ||
| type: string | ||
| default: "12.0" | ||
| test: | ||
| type: boolean | ||
| default: true | ||
| codecoverage: | ||
| type: boolean | ||
| default: false | ||
| macos: | ||
| xcode: << parameters.xcode >> | ||
| environment: | ||
| HOMEBREW_NO_AUTO_UPDATE: 1 | ||
| steps: | ||
| - checkout | ||
| - *prepare | ||
| - *restore-cache | ||
| - run: | ||
| name: iOS | ||
| command: | | ||
| carthage bootstrap --platform ios --cache-builds --no-use-binaries --new-resolver | ||
| xcodebuild -sdk iphonesimulator -project MapboxDirections.xcodeproj -scheme 'MapboxDirections iOS' -destination 'platform=iOS Simulator,OS=<< parameters.iOS >>,name=<< parameters.device >>' clean build <<# parameters.test >>test <</ parameters.test >> <<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >> | ||
| - run: | ||
| name: tvOS | ||
| command: | | ||
| carthage bootstrap --platform tvos --cache-builds --no-use-binaries --new-resolver | ||
| xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections tvOS' -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p),OS=<< parameters.tvOS >>' clean build <<# parameters.test >>test <</ parameters.test >> <<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >> | ||
| - run: | ||
| name: macOS | ||
| command: | | ||
| carthage bootstrap --platform macos --cache-builds --no-use-binaries --new-resolver | ||
| xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections Mac' clean build<<# parameters.test >> test <</ parameters.test >><<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >> | ||
| - run: | ||
| name: watchOS | ||
| command: | | ||
| carthage bootstrap --platform watchos --cache-builds --no-use-binaries --new-resolver | ||
| xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections watchOS' -destination 'platform=watchOS Simulator,name=Apple Watch Series 3 - 42mm,OS=<< parameters.watchOS >>' clean build | ||
| - when: | ||
| condition: << parameters.codecoverage >> | ||
| steps: | ||
| - run: bash <(curl -s https://codecov.io/bash) | ||
| - *save-cache | ||
|
|
||
| workflows: | ||
| workflow: | ||
| jobs: | ||
| - build-job: | ||
| name: "Xcode_10.2" | ||
| xcode: "10.2.0" | ||
| iOS: "12.2" | ||
| tvOS: "12.2" | ||
| watchOS: "5.2" | ||
| - build-job: | ||
| name: "Xcode_10.0" | ||
| xcode: "10.0.0" | ||
| iOS: "12.0" | ||
| tvOS: "12.0" | ||
| - build-job: | ||
| name: "Xcode_9.4" | ||
| xcode: "9.4.1" | ||
| iOS: "10.3.1" | ||
| tvOS: "11.4" | ||
| watchOS: "4.3" |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" ~> 4.4 | ||
| github "linksmt/OHHTTPStubs" "563f48d3fab84ef04639649c770b00f4fa502cca" | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "4.9.0" | ||
| github "linksmt/OHHTTPStubs" "563f48d3fab84ef04639649c770b00f4fa502cca" | ||
| github "raphaelmor/Polyline" "v4.2.0" |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a PR for this change or something else we can keep track of for when master gets updated? AliSoftware/OHHTTPStubs#295 is already in v7.0.0; is this for something else?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, looks like this commit also pulls in AliSoftware/OHHTTPStubs#286. The CircleCI configuration isn’t testing on watchOS anyways. So I think we can pin to the main pod’s v7.x.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yea, the reason why I switched to the fork here is the missing watchOS scheme in the original. We don't test on watchOS but we do compile for watchOS. We could switch back but it would require a workaround to run carthage bootstrap and ignore the .private and .resolved files.