Skip to content

Commit

Permalink
Cherry-picking updates from main to release-v2.18 (#4631)
Browse files Browse the repository at this point in the history 
* Use camera options to calculate zoom for overview camera (#4593)

* Use camera options to calculate zoom for overview camera

* Create dependabot.yml

Enable Dependabot version updates

* Bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump github/codeql-action from 2 to 3

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fixed the possible situation when the upcoming route leg is rendered above the active route leg (#4589)

* Add the ability to set locale for top and bottom banner views (#4595)

* Implement configurable waypoints in CarPlayDelegate

* Update Tests/MapboxNavigationTests/CarPlayUtils.swift

Co-authored-by: Nastassia Makaranka <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Nastassia Makaranka <[email protected]>

* Update dependencies (#4614)

* vk/dependencies-update: bumped Directions to 2.12.0, Maps to 10.16.5. Now compatible with Turf 2.7.0.

* vk/dependencies-update: CHANGELOG updated

* vk/dependencies-update: bumped NN to v202; update cocoapods in gemfile to 1.14

* vk/dependencies-update: unit tests fix

* Sync Package.resolved with last resolved dependencies

* Update CHANGELOG.md

* Sync CocoaPodsTest

---------

Co-authored-by: Udumft <[email protected]>

* Fix SystemSpeechSynthesizer related main thread hang on NavigationViewController creation (#4617)

* Don't check if AVSpeechSynthesizer.isSpeaking when unmuting it

* add changelog entry

* Improve error handing in case of invalid route responses (#4618)

* Improve error handing in case of invalid route responses

* Fix the order in which delegate is notified about failed reroute attempt

* Fix for old Swift compiler versions

* Fixed project structure in Carthage integration

* Added changelog entry

* Fix Examples signing when building on a real device (#4619)

* Fix Examples signing when building on a real device

* Replace build phases with the new script in 3 test targets

* Grant exec permissions to the script

* Fix carplay background maneuver card

* Fix method annotation and desctiption

* Update changelog

* Fix compile errors

* Update breaking changes list

* Update changelog

* Update spelling

* Fix spelling

* Update CHANGELOG.md

* Update NN and Maps (#4628)

* Update NN and Maps

* Update CHANGELOG.md

* Update CHANGELOG.md

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Nastassia Makaranka <[email protected]>
Co-authored-by: Thibaud Lopez Schneider <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max <[email protected]>
Co-authored-by: Max <[email protected]>
Co-authored-by: Udumft <[email protected]>
  • Loading branch information
@azarovalex @kried
@ThibaudLopez @dependabot @chizhavko @Udumft
7 people authored Apr 15, 2024
1 parent 7218d24 commit 135a5da
Show file tree
Hide file tree
Showing 22 changed files with 227 additions and 148 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "github-actions" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

Expand All @@ -48,6 +48,6 @@ jobs:
/usr/bin/xcodebuild build -project /Users/runner/work/mapbox-navigation-ios/mapbox-navigation-ios/MapboxNavigation-SPM.xcodeproj -target Example CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
6 changes: 4 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

### Packaging

* MapboxNavigation now requires [MapboxMaps v10.16.5](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.16.5). ([#4605](https://github.com/mapbox/mapbox-navigation-ios/pull/4605))
* MapboxNavigation now requires [MapboxMaps v10.17.0](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.17.0). ([#4628](https://github.com/mapbox/mapbox-navigation-ios/pull/4628))
* MapboxCoreNavigation now requires [MapboxDirections v2.12.0](https://github.com/mapbox/mapbox-directions-swift/releases/tag/v2.12.0). ([#4605](https://github.com/mapbox/mapbox-navigation-ios/pull/4605))
* MapboxCoreNavigation now requires [MapboxNavigationNative v202._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/202.0.0). ([#4605](https://github.com/mapbox/mapbox-navigation-ios/pull/4605))
* MapboxCoreNavigation now requires [MapboxNavigationNative v204._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/202.0.0). ([#4628](https://github.com/mapbox/mapbox-navigation-ios/pull/4628))
* MapboxCoreNavigation is no longer dependent on MapboxMobileEvents. ([#4572](https://github.com/mapbox/mapbox-navigation-ios/pull/4572))
* Added a Polish localization. ([#4582](https://github.com/mapbox/mapbox-navigation-ios/pull/4582))

Expand Down Expand Up @@ -37,6 +37,8 @@
* Removed `NavigationEventsManager.init(activeNavigationDataSource:passiveNavigationDataSource:accessToken:mobileEventsManager:)` in favor of `NavigationEventsManager.init(activeNavigationDataSource:passiveNavigationDataSource:accessToken:)`. ([#4572](https://github.com/mapbox/mapbox-navigation-ios/pull/4572))
* Fixed a rare issue that could lead to memory corruption under specific conditions. This was resolved by replacing the internal image downloader with brand new actor-based implementation. ([#4588](https://github.com/mapbox/mapbox-navigation-ios/pull/4588))
* Fixed the possible situation when the upcoming route leg is rendered above the active route leg. ([#4588](https://github.com/mapbox/mapbox-navigation-ios/pull/4588))
* Fixed a main thread hang on NavigationViewController creation. ([#4617](https://github.com/mapbox/mapbox-navigation-ios/pull/4617))
* Fixed error reporting in `RouteController/reroute(from:along:)`. ([#4618](https://github.com/mapbox/mapbox-navigation-ios/pull/4618))

## v2.17.0

Expand Down
4 changes: 2 additions & 2 deletions Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.8.6
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 202.0.0
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.9.2
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 204.0.1
github "mapbox/mapbox-directions-swift" ~> 2.12.0
4 changes: 2 additions & 2 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.8.6"
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "202.0.0"
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.9.2"
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "204.0.1"
github "mapbox/mapbox-directions-swift" "v2.12.0"
github "mapbox/turf-swift" "v2.8.0"
github "mattgallagher/CwlPreconditionTesting" "2.2.1"
Expand Down
2 changes: 1 addition & 1 deletion MapboxCoreNavigation.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.module_name = "MapboxCoreNavigation"

s.dependency "MapboxNavigationNative", "~> 202.0.0"
s.dependency "MapboxNavigationNative", "~> 204.0.1"
s.dependency "MapboxDirections", "~> 2.12.0"

s.swift_version = "5.5"
Expand Down
71 changes: 56 additions & 15 deletions MapboxNavigation-SPM.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,7 @@
358D145F1E5E3B7700ADE590 /* Sources */,
358D14601E5E3B7700ADE590 /* Frameworks */,
358D14611E5E3B7700ADE590 /* Resources */,
DF5A6E012BB6E13000BC3F2C /* Apply Mapbox token */,
);
buildRules = (
);
Expand Down Expand Up @@ -559,6 +560,7 @@
C53F2EE320EBC95600D9798F /* Sources */,
C53F2EE920EBC95600D9798F /* Frameworks */,
C53F2EF220EBC95600D9798F /* Resources */,
DF5A6E022BB6E29C00BC3F2C /* Apply Mapbox token */,
);
buildRules = (
);
Expand Down Expand Up @@ -608,9 +610,7 @@
TestTargetID = 8AC81F56284832E000662395;
};
C53F2EDE20EBC95600D9798F = {
DevelopmentTeam = GJZR2MEM28;
LastSwiftMigration = 1030;
ProvisioningStyle = Manual;
};
};
};
Expand Down Expand Up @@ -760,7 +760,8 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# This Run Script build phase helps to keep the navigation SDK’s developers from exposing their own access tokens during development. See <https://www.mapbox.com/help/ios-private-access-token/> for more information. If you are developing an application privately, you may add the MBXAccessToken key directly to your Info.plist file and delete this build phase.\n\ntoken_file=~/.mapbox\ntoken_file2=~/mapbox\ntoken=\"$(cat $token_file 2>/dev/null || cat $token_file2 2>/dev/null)\"\nif [ \"$token\" ]; then\n plutil -replace MBXAccessToken -string $token \"$TARGET_BUILD_DIR/$INFOPLIST_PATH\"\nelse\n echo 'warning: Missing Mapbox access token'\n open 'https://www.mapbox.com/account/access-tokens/'\n echo \"warning: Get an access token from <https://www.mapbox.com/account/access-tokens/>, then create a new file at $token_file or $token_file2 that contains the access token.\"\nfi\n";
shellScript = "# This Run Script build phase helps to keep the navigation SDK’s developers from exposing their own access tokens during development. See <https://www.mapbox.com/help/ios-private-access-token/> for more information. If you are developing an application privately, you may add the MBXAccessToken key directly to your Info.plist file and delete this build phase.\n\n\"${SRCROOT}/scripts/apply_mapbox_token.sh\"\n";
showEnvVarsInLog = 0;
};
8A9C67F22891F2B100C28B2B /* Apply Mapbox Access Token */ = {
isa = PBXShellScriptBuildPhase;
Expand All @@ -771,7 +772,6 @@
inputFileListPaths = (
);
inputPaths = (
"",
"$(TARGET_BUILD_DIR)/$(INFOPLIST_PATH)",
);
name = "Apply Mapbox Access Token";
Expand All @@ -781,7 +781,8 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# This Run Script build phase helps to keep the navigation SDK’s developers from exposing their own access tokens during development. See <https://www.mapbox.com/help/ios-private-access-token/> for more information. If you are developing an application privately, you may add the MBXAccessToken key directly to your Info.plist file and delete this build phase.\n\ntoken_file=~/.mapbox\ntoken_file2=~/mapbox\ntoken=\"$(cat $token_file 2>/dev/null || cat $token_file2 2>/dev/null)\"\nif [ \"$token\" ]; then\n plutil -replace MBXAccessToken -string $token \"$TARGET_BUILD_DIR/$INFOPLIST_PATH\"\nelse\n echo 'warning: Missing Mapbox access token'\n open 'https://www.mapbox.com/account/access-tokens/'\n echo \"warning: Get an access token from <https://www.mapbox.com/account/access-tokens/>, then create a new file at $token_file or $token_file2 that contains the access token.\"\nfi\n";
shellScript = "# This Run Script build phase helps to keep the navigation SDK’s developers from exposing their own access tokens during development. See <https://www.mapbox.com/help/ios-private-access-token/> for more information. If you are developing an application privately, you may add the MBXAccessToken key directly to your Info.plist file and delete this build phase.\n\n\"${SRCROOT}/scripts/apply_mapbox_token.sh\"\n";
showEnvVarsInLog = 0;
};
8AB31424284837EC00348E52 /* Apply Mapbox Access Token */ = {
isa = PBXShellScriptBuildPhase;
Expand All @@ -801,7 +802,50 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# This Run Script build phase helps to keep the navigation SDK’s developers from exposing their own access tokens during development. See <https://www.mapbox.com/help/ios-private-access-token/> for more information. If you are developing an application privately, you may add the MBXAccessToken key directly to your Info.plist file and delete this build phase.\n\ntoken_file=~/.mapbox\ntoken_file2=~/mapbox\ntoken=\"$(cat $token_file 2>/dev/null || cat $token_file2 2>/dev/null)\"\nif [ \"$token\" ]; then\n plutil -replace MBXAccessToken -string $token \"$TARGET_BUILD_DIR/$INFOPLIST_PATH\"\nelse\n echo 'warning: Missing Mapbox access token'\n open 'https://www.mapbox.com/account/access-tokens/'\n echo \"warning: Get an access token from <https://www.mapbox.com/account/access-tokens/>, then create a new file at $token_file or $token_file2 that contains the access token.\"\nfi\n";
shellScript = "# This Run Script build phase helps to keep the navigation SDK’s developers from exposing their own access tokens during development. See <https://www.mapbox.com/help/ios-private-access-token/> for more information. If you are developing an application privately, you may add the MBXAccessToken key directly to your Info.plist file and delete this build phase.\n\n\"${SRCROOT}/scripts/apply_mapbox_token.sh\"\n";
showEnvVarsInLog = 0;
};
DF5A6E012BB6E13000BC3F2C /* Apply Mapbox token */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"$(TARGET_BUILD_DIR)/$(INFOPLIST_PATH)",
);
name = "Apply Mapbox token";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# This Run Script build phase helps to keep the navigation SDK’s developers from exposing their own access tokens during development. See <https://www.mapbox.com/help/ios-private-access-token/> for more information. If you are developing an application privately, you may add the MBXAccessToken key directly to your Info.plist file and delete this build phase.\n\n\"${SRCROOT}/scripts/apply_mapbox_token.sh\"\n";
showEnvVarsInLog = 0;
};
DF5A6E022BB6E29C00BC3F2C /* Apply Mapbox token */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"$(TARGET_BUILD_DIR)/$(INFOPLIST_PATH)",
);
name = "Apply Mapbox token";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# This Run Script build phase helps to keep the navigation SDK’s developers from exposing their own access tokens during development. See <https://www.mapbox.com/help/ios-private-access-token/> for more information. If you are developing an application privately, you may add the MBXAccessToken key directly to your Info.plist file and delete this build phase.\n\n\"${SRCROOT}/scripts/apply_mapbox_token.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -1353,8 +1397,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "${SRCROOT}/Example/Entitlements.plist";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = GJZR2MEM28;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
Expand All @@ -1366,8 +1410,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "com.Mapbox.CarPlay-Example";
PRODUCT_NAME = Example;
PROVISIONING_PROFILE = "69c90fd8-c53b-41a4-ac73-5bc11068a49a";
PROVISIONING_PROFILE_SPECIFIER = "CarPlay Provisioning Profile";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Example/Example-Swift-BridgingHeader.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
Expand All @@ -1380,9 +1423,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "${SRCROOT}/Example/Entitlements.plist";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = GJZR2MEM28;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = Example/Info.plist;
Expand All @@ -1393,8 +1435,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "com.Mapbox.CarPlay-Example";
PRODUCT_NAME = Example;
PROVISIONING_PROFILE = "69c90fd8-c53b-41a4-ac73-5bc11068a49a";
PROVISIONING_PROFILE_SPECIFIER = "CarPlay Provisioning Profile";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Example/Example-Swift-BridgingHeader.h";
};
name = Release;
Expand Down
16 changes: 8 additions & 8 deletions MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
"repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
"state": {
"branch": null,
"revision": "ea67fe9b6ef4ee37e1d0bbc32752d46f3082dc61",
"version": "23.9.0"
"revision": "696503304fe8807bd5af3abb23ef20c051dd8b12",
"version": "23.9.2"
}
},
{
"package": "MapboxCoreMaps",
"repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
"state": {
"branch": null,
"revision": "00207cff55938601b4ce22e683cdc710fd8864e9",
"version": "10.16.5"
"revision": "255a3d159c710d33ab8a85d15a2842012462f581",
"version": "10.17.0"
}
},
{
Expand All @@ -51,17 +51,17 @@
"repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
"state": {
"branch": null,
"revision": "79af3be38640c4d60af167e9ee42754d832816e3",
"version": "10.16.5"
"revision": "52bb5df80e4a6dd84d61bf9f4fc63a68b30c03e4",
"version": "10.17.0"
}
},
{
"package": "MapboxNavigationNative",
"repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
"state": {
"branch": null,
"revision": "a40157f2b13108563a3b792d42c4fdcc2287cdcc",
"version": "202.0.0"
"revision": "b1c9d09cca14c69455f2ce79dc588f2ae06bde37",
"version": "204.0.1"
}
},
{
Expand Down
20 changes: 1 addition & 19 deletions MapboxNavigation-SPM.xcodeproj/xcshareddata/xcschemes/Example-CarPlay.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1400"
version = "1.7">
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<PostActions>
<ExecutionAction
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
<ActionContent
title = "Run Script"
scriptText = "# This Run Script build phase helps to keep the navigation SDK&#x2019;s developers from exposing their own access tokens during development. See &lt;https://www.mapbox.com/help/ios-private-access-token/&gt; for more information. If you are developing an application privately, you may add the MBXAccessToken key directly to your Info.plist file and delete this build phase.&#10;&#10;if [ -f &quot;${TARGET_BUILD_DIR}/${INFOPLIST_PATH}&quot; ]; then&#10; token_file=~/.mapbox&#10; token_file2=~/mapbox&#10; token=&quot;$(cat $token_file 2&gt;/dev/null || cat $token_file2 2&gt;/dev/null)&quot;&#10; if [ &quot;$token&quot; ]; then&#10; plutil -replace MBXAccessToken -string $token &quot;$TARGET_BUILD_DIR/$INFOPLIST_PATH&quot;&#10; else&#10; echo &apos;warning: Missing Mapbox access token&apos;&#10; open &apos;https://www.mapbox.com/account/access-tokens/&apos;&#10; echo &quot;warning: Get an access token from &lt;https://www.mapbox.com/account/access-tokens/&gt;, then create a new file at $token_file or $token_file2 that contains the access token.&quot;&#10; fi&#10;fi&#10;">
<EnvironmentBuildable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C53F2EDE20EBC95600D9798F"
BuildableName = "Example.app"
BlueprintName = "Example-CarPlay"
ReferencedContainer = "container:MapboxNavigation-SPM.xcodeproj">
</BuildableReference>
</EnvironmentBuildable>
</ActionContent>
</ExecutionAction>
</PostActions>
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
Expand Down
20 changes: 1 addition & 19 deletions MapboxNavigation-SPM.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1400"
version = "1.7">
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<PostActions>
<ExecutionAction
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
<ActionContent
title = "Run Script"
scriptText = "# This Run Script build phase helps to keep the navigation SDK&#x2019;s developers from exposing their own access tokens during development. See &lt;https://www.mapbox.com/help/ios-private-access-token/&gt; for more information. If you are developing an application privately, you may add the MBXAccessToken key directly to your Info.plist file and delete this build phase.&#10;&#10;if [ -f &quot;${TARGET_BUILD_DIR}/${INFOPLIST_PATH}&quot; ]; then&#10; token_file=~/.mapbox&#10; token_file2=~/mapbox&#10; token=&quot;$(cat $token_file 2&gt;/dev/null || cat $token_file2 2&gt;/dev/null)&quot;&#10; if [ &quot;$token&quot; ]; then&#10; plutil -replace MBXAccessToken -string $token &quot;$TARGET_BUILD_DIR/$INFOPLIST_PATH&quot;&#10; else&#10; echo &apos;warning: Missing Mapbox access token&apos;&#10; open &apos;https://www.mapbox.com/account/access-tokens/&apos;&#10; echo &quot;warning: Get an access token from &lt;https://www.mapbox.com/account/access-tokens/&gt;, then create a new file at $token_file or $token_file2 that contains the access token.&quot;&#10; fi&#10;fi&#10;">
<EnvironmentBuildable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "358D14621E5E3B7700ADE590"
BuildableName = "Example.app"
BlueprintName = "Example"
ReferencedContainer = "container:MapboxNavigation-SPM.xcodeproj">
</BuildableReference>
</EnvironmentBuildable>
</ActionContent>
</ExecutionAction>
</PostActions>
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
Expand Down
Loading

0 comments on commit 135a5da

Please sign in to comment.