-
Notifications
You must be signed in to change notification settings - Fork 298
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into jerrad/146-navigation-service
- Loading branch information
Showing
6 changed files
with
129 additions
and
52 deletions.
There are no files selected for viewing
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
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
60 changes: 22 additions & 38 deletions
60
MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/Podfile.lock
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,43 @@ | ||
| PODS: | ||
| - Mapbox-iOS-SDK (3.7.4) | ||
| - MapboxCoreNavigation (0.13.1): | ||
| - MapboxDirections.swift (~> 0.16.1) | ||
| - MapboxMobileEvents (~> 0.3) | ||
| - Turf (~> 0.0.4) | ||
| - MapboxDirections.swift (0.16.1): | ||
| - Mapbox-iOS-SDK (4.3.0) | ||
| - MapboxCoreNavigation (0.19.2): | ||
| - MapboxDirections.swift (~> 0.22.0) | ||
| - MapboxMobileEvents (~> 0.4) | ||
| - Turf (~> 0.2) | ||
| - MapboxDirections.swift (0.22.0): | ||
| - Polyline (~> 4.2) | ||
| - MapboxMobileEvents (0.3.0) | ||
| - MapboxNavigation (0.13.1): | ||
| - Mapbox-iOS-SDK (~> 3.6) | ||
| - MapboxCoreNavigation (= 0.13.1) | ||
| - MapboxMobileEvents (0.4.51) | ||
| - MapboxNavigation (0.19.2): | ||
| - Mapbox-iOS-SDK (~> 4.3) | ||
| - MapboxCoreNavigation (= 0.19.2) | ||
| - MapboxSpeech (~> 0.0.1) | ||
| - SDWebImage (~> 4.1) | ||
| - Solar (~> 2.1) | ||
| - Turf (~> 0.0.4) | ||
| - MapboxSpeech (0.0.1) | ||
| - Polyline (4.2.0) | ||
| - SDWebImage (4.3.0): | ||
| - SDWebImage/Core (= 4.3.0) | ||
| - SDWebImage/Core (4.3.0) | ||
| - Solar (2.1.0) | ||
| - Turf (0.0.4) | ||
| - Turf (0.2.0) | ||
|
|
||
| DEPENDENCIES: | ||
| - MapboxCoreNavigation (from `https://github.com/mapbox/mapbox-navigation-ios.git`, branch `master`) | ||
| - MapboxNavigation (from `https://github.com/mapbox/mapbox-navigation-ios.git`, branch `master`) | ||
| - MapboxCoreNavigation (from `../../../`) | ||
| - MapboxNavigation (from `../../../`) | ||
|
|
||
| EXTERNAL SOURCES: | ||
| MapboxCoreNavigation: | ||
| :branch: master | ||
| :git: https://github.com/mapbox/mapbox-navigation-ios.git | ||
| :path: ../../../ | ||
| MapboxNavigation: | ||
| :branch: master | ||
| :git: https://github.com/mapbox/mapbox-navigation-ios.git | ||
|
|
||
| CHECKOUT OPTIONS: | ||
| MapboxCoreNavigation: | ||
| :commit: 518a3d1b8ab327f6bb895b10071bc113ffddb84a | ||
| :git: https://github.com/mapbox/mapbox-navigation-ios.git | ||
| MapboxNavigation: | ||
| :commit: 518a3d1b8ab327f6bb895b10071bc113ffddb84a | ||
| :git: https://github.com/mapbox/mapbox-navigation-ios.git | ||
| :path: ../../../ | ||
|
|
||
| SPEC CHECKSUMS: | ||
| Mapbox-iOS-SDK: fb994b9e46df7b909f58dd0c5df5a44f58cdab04 | ||
| MapboxCoreNavigation: 47b9983ceb8d52d4d8879a3bbf8afe1277de7166 | ||
| MapboxDirections.swift: 750b7c94e7e1d85fcfe4ccc815423f33164178dc | ||
| MapboxMobileEvents: 246843e366f6687f697098673ef78a858c0d8619 | ||
| MapboxNavigation: 7367316f879b252096a9d54726e7ae783ef0fb6b | ||
| Mapbox-iOS-SDK: 7d8d510088ba7900d11aa3ceb98f563b040efca1 | ||
| MapboxCoreNavigation: e4fe458ab71b2a345a5df40e6398e639435f3bf7 | ||
| MapboxDirections.swift: 67da008c3bff72ab68b0fc166185eebda23303be | ||
| MapboxMobileEvents: 83ed9a5ea8f81ca455c350cb15f05ce287d5d2a3 | ||
| MapboxNavigation: d10c8ee497250f9609fe43d3602e2070057a0e25 | ||
| MapboxSpeech: 6cc9b3d53adc2988af3ebc704dd17907b84a3f9f | ||
| Polyline: 3d69f75bb136357e27291d439d0436c6ebda57a4 | ||
| SDWebImage: 6da6c8bca115addc4de8613362e1b15f66333825 | ||
| Solar: 2dc6e7cc39186cb0c8228fa08df76fb50c7d8f24 | ||
| Turf: 6c169618fa671e3f8a7b764b5b3332053ad6110e | ||
| Turf: 65817136031583da7ea2b43e6611dd10ddbdab2f | ||
|
|
||
| PODFILE CHECKSUM: 13f94add0160d7ec0d5c512e193f75911b46950d | ||
| PODFILE CHECKSUM: 55ae5a7edbc3dedda5149ba3d58b992ab7327f95 | ||
|
|
||
| COCOAPODS: 1.4.0 |
10 changes: 0 additions & 10 deletions
10
MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/process_podfile.sh
This file was deleted.
Oops, something went wrong.
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| version: 2 | ||
|
|
||
| workflows: | ||
| version: 2 | ||
| default: | ||
| jobs: | ||
| - xcode-10 | ||
| - xcode-10-cocoapods-integration | ||
|
|
||
| step-library: | ||
| - &restore-cache | ||
| restore_cache: | ||
| keys: | ||
| - carthage-cache-v1-{{ checksum "Cartfile.resolved" }} | ||
| - carthage-cache-v1- # used if checksum fails | ||
|
|
||
| - &restore-cache-cocoapods | ||
| restore_cache: | ||
| keys: | ||
| - cp-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/Podfile.lock" }} | ||
| - cp-cache-v1-{{ arch }}-{{ .Branch }} | ||
| - cp-cache-v1 | ||
|
|
||
| - &restore-cache-podmaster | ||
| restore_cache: | ||
| keys: | ||
| - podmaster-cache | ||
|
|
||
| - &save-cache | ||
| save_cache: | ||
| key: carthage-cache-v1-{{ checksum "Cartfile.resolved" }} | ||
| paths: | ||
| - Carthage | ||
|
|
||
| - &save-cache-cocoapods | ||
| save_cache: | ||
| key: cp-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/Podfile.lock" }} | ||
| paths: | ||
| - MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/Pods | ||
|
|
||
| - &save-cache-podmaster | ||
| save_cache: | ||
| key: podmaster-cache | ||
| paths: | ||
| - "~/.cocoapods/repos/master" | ||
|
|
||
| - &prepare | ||
| run: | ||
| name: Prepare | ||
| command: | | ||
| git submodule sync | ||
| - &install-dependencies | ||
| run: | ||
| name: Install Dependencies | ||
| command: carthage bootstrap --platform ios --cache-builds --configuration Release --no-use-binaries | ||
|
|
||
| - &build-test-MapboxCoreNavigation | ||
| run: | ||
| name: Build and test MapboxCoreNavigation | ||
| command: | | ||
| xcodebuild -sdk iphonesimulator -destination 'platform=iOS Simulator,id=9F32C487-FAEC-4ABE-B00D-159EC007E50D' -project MapboxNavigation.xcodeproj -scheme MapboxCoreNavigation clean build test | xcpretty | ||
| - &build-MapboxNavigation | ||
| run: | ||
| name: Build MapboxNavigation | ||
| command: | | ||
| xcodebuild -sdk iphonesimulator -destination 'platform=iOS Simulator,id=9F32C487-FAEC-4ABE-B00D-159EC007E50D' -project MapboxNavigation.xcodeproj -scheme MapboxNavigation clean build | xcpretty | ||
| - &cocoapods-integration-test | ||
| run: | ||
| name: CocoaPods integration test | ||
| command: | | ||
| cd MapboxCoreNavigationTests/CocoaPodsTest/PodInstall | ||
| pod install | ||
| xcodebuild -workspace PodInstall.xcworkspace/ -scheme PodInstall -destination 'platform=iOS Simulator,id=9F32C487-FAEC-4ABE-B00D-159EC007E50D' clean build | xcpretty | ||
| jobs: | ||
| xcode-10: | ||
| macos: | ||
| xcode: "10.0.0" | ||
| environment: | ||
| HOMEBREW_NO_AUTO_UPDATE: 1 | ||
| steps: | ||
| - checkout | ||
| - *prepare | ||
| - *restore-cache | ||
| - *install-dependencies | ||
| - *build-test-MapboxCoreNavigation | ||
| - *build-MapboxNavigation | ||
| - *save-cache | ||
|
|
||
| xcode-10-cocoapods-integration: | ||
| macos: | ||
| xcode: "10.0.0" | ||
| environment: | ||
| HOMEBREW_NO_AUTO_UPDATE: 1 | ||
| steps: | ||
| - checkout | ||
| - *restore-cache-podmaster | ||
| - *restore-cache-cocoapods | ||
| - *cocoapods-integration-test | ||
| - *save-cache-cocoapods | ||
| - *save-cache-podmaster |