From dfda2e8b03013b1a10ceae1a8884922662a400db Mon Sep 17 00:00:00 2001 From: Alexander Pristavko Date: Thu, 26 Aug 2021 15:40:43 +0300 Subject: [PATCH 1/2] v2.0.0-beta.24 --- Example/Info.plist | 2 +- MapboxCoreNavigation.podspec | 2 +- MapboxNavigation-Documentation.podspec | 2 +- .../project.pbxproj | 4 +-- MapboxNavigation.podspec | 2 +- MapboxNavigation.xcodeproj/project.pbxproj | 28 +++++++++---------- README.md | 6 ++-- Sources/CarPlayTestHelper/Info.plist | 2 +- Sources/MapboxCoreNavigation/Info.plist | 2 +- Sources/MapboxCoreNavigation/MBXInfo.plist | 2 +- Sources/MapboxNavigation/Info.plist | 2 +- Sources/MapboxNavigation/MBXInfo.plist | 2 +- Sources/TestHelper/Info.plist | 2 +- Tests/CocoaPodsTest/PodInstall/Podfile.lock | 10 +++---- Tests/MapboxCoreNavigationTests/Info.plist | 2 +- Tests/MapboxNavigationTests/Info.plist | 2 +- custom-navigation.md | 6 ++-- 17 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Example/Info.plist b/Example/Info.plist index 77abaa73fe8..612d1b08068 100644 --- a/Example/Info.plist +++ b/Example/Info.plist @@ -17,7 +17,7 @@ CFBundleShortVersionString 2.0.0 CFBundleVersion - 67 + 68 LSApplicationCategoryType LSRequiresIPhoneOS diff --git a/MapboxCoreNavigation.podspec b/MapboxCoreNavigation.podspec index 3686b01db01..915033c0009 100644 --- a/MapboxCoreNavigation.podspec +++ b/MapboxCoreNavigation.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| # ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # s.name = "MapboxCoreNavigation" - s.version = '2.0.0-beta.23' + s.version = '2.0.0-beta.24' s.summary = "Core components for turn-by-turn navigation on iOS." s.description = <<-DESC diff --git a/MapboxNavigation-Documentation.podspec b/MapboxNavigation-Documentation.podspec index f637bcd095d..658142ff0f3 100644 --- a/MapboxNavigation-Documentation.podspec +++ b/MapboxNavigation-Documentation.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| # ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # s.name = "MapboxNavigation-Documentation" - s.version = '2.0.0-beta.23' + s.version = '2.0.0-beta.24' s.summary = "Complete turn-by-turn navigation interface for iOS." s.description = <<-DESC diff --git a/MapboxNavigation-SPM.xcodeproj/project.pbxproj b/MapboxNavigation-SPM.xcodeproj/project.pbxproj index 969358b268b..a762bb4c4cb 100644 --- a/MapboxNavigation-SPM.xcodeproj/project.pbxproj +++ b/MapboxNavigation-SPM.xcodeproj/project.pbxproj @@ -600,7 +600,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 67; + CURRENT_PROJECT_VERSION = 68; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -665,7 +665,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 67; + CURRENT_PROJECT_VERSION = 68; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; diff --git a/MapboxNavigation.podspec b/MapboxNavigation.podspec index 43a67f33c05..0d766d075c7 100644 --- a/MapboxNavigation.podspec +++ b/MapboxNavigation.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| # ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # s.name = "MapboxNavigation" - s.version = '2.0.0-beta.23' + s.version = '2.0.0-beta.24' s.summary = "Complete turn-by-turn navigation interface for iOS." s.description = <<-DESC diff --git a/MapboxNavigation.xcodeproj/project.pbxproj b/MapboxNavigation.xcodeproj/project.pbxproj index 73e87048ae0..aedc6004600 100644 --- a/MapboxNavigation.xcodeproj/project.pbxproj +++ b/MapboxNavigation.xcodeproj/project.pbxproj @@ -2833,7 +2833,7 @@ DEFINES_MODULE = YES; DEVELOPMENT_TEAM = GJZR2MEM28; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 67; + DYLIB_CURRENT_VERSION = 68; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2860,7 +2860,7 @@ DEFINES_MODULE = YES; DEVELOPMENT_TEAM = GJZR2MEM28; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 67; + DYLIB_CURRENT_VERSION = 68; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2935,12 +2935,12 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 67; + CURRENT_PROJECT_VERSION = 68; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = GJZR2MEM28; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 67; + DYLIB_CURRENT_VERSION = 68; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -2972,11 +2972,11 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 67; + CURRENT_PROJECT_VERSION = 68; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = GJZR2MEM28; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 67; + DYLIB_CURRENT_VERSION = 68; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -3030,7 +3030,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 67; + CURRENT_PROJECT_VERSION = 68; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -3095,7 +3095,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 67; + CURRENT_PROJECT_VERSION = 68; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -3129,7 +3129,7 @@ DEFINES_MODULE = YES; DEVELOPMENT_TEAM = GJZR2MEM28; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 67; + DYLIB_CURRENT_VERSION = 68; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Sources/MapboxCoreNavigation/Info.plist; @@ -3155,7 +3155,7 @@ DEFINES_MODULE = YES; DEVELOPMENT_TEAM = GJZR2MEM28; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 67; + DYLIB_CURRENT_VERSION = 68; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Sources/MapboxCoreNavigation/Info.plist; @@ -3221,11 +3221,11 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 67; + CURRENT_PROJECT_VERSION = 68; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 67; + DYLIB_CURRENT_VERSION = 68; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = Sources/CarPlayTestHelper/Info.plist; @@ -3254,10 +3254,10 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 67; + CURRENT_PROJECT_VERSION = 68; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 67; + DYLIB_CURRENT_VERSION = 68; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = Sources/CarPlayTestHelper/Info.plist; diff --git a/README.md b/README.md index 2b5d8879732..eaf8f49a300 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ To install the MapboxNavigation framework in an application using [Swift Package To install the MapboxNavigation framework in another package rather than an application, run `swift package init` to create a Package.swift, then add the following dependency: ```swift -.package(name: "MapboxNavigation", url: "https://github.com/mapbox/mapbox-navigation-ios.git", .exact("2.0.0-beta.23")) +.package(name: "MapboxNavigation", url: "https://github.com/mapbox/mapbox-navigation-ios.git", .exact("2.0.0-beta.24")) ``` ### Using CocoaPods @@ -68,8 +68,8 @@ To install the MapboxNavigation framework using [CocoaPods](https://cocoapods.or 1. Create a [Podfile](https://guides.cocoapods.org/syntax/podfile.html) with the following specification: ```ruby - pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.0.0-beta.23' - pod 'MapboxNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.0.0-beta.23' + pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.0.0-beta.24' + pod 'MapboxNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.0.0-beta.24' ``` 1. Run `pod repo update && pod install` and open the resulting Xcode workspace. diff --git a/Sources/CarPlayTestHelper/Info.plist b/Sources/CarPlayTestHelper/Info.plist index 1e684f852f7..5edc34425cb 100644 --- a/Sources/CarPlayTestHelper/Info.plist +++ b/Sources/CarPlayTestHelper/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 2.0.0 CFBundleVersion - 67 + 68 diff --git a/Sources/MapboxCoreNavigation/Info.plist b/Sources/MapboxCoreNavigation/Info.plist index 39548d5273e..1675659f095 100644 --- a/Sources/MapboxCoreNavigation/Info.plist +++ b/Sources/MapboxCoreNavigation/Info.plist @@ -17,7 +17,7 @@ CFBundleShortVersionString 2.0.0 CFBundleVersion - 67 + 68 NSPrincipalClass diff --git a/Sources/MapboxCoreNavigation/MBXInfo.plist b/Sources/MapboxCoreNavigation/MBXInfo.plist index b118dfb0e57..36ac9aea729 100644 --- a/Sources/MapboxCoreNavigation/MBXInfo.plist +++ b/Sources/MapboxCoreNavigation/MBXInfo.plist @@ -17,7 +17,7 @@ CFBundleShortVersionString 2.0.0 CFBundleVersion - 67 + 68 NSPrincipalClass diff --git a/Sources/MapboxNavigation/Info.plist b/Sources/MapboxNavigation/Info.plist index 39548d5273e..1675659f095 100644 --- a/Sources/MapboxNavigation/Info.plist +++ b/Sources/MapboxNavigation/Info.plist @@ -17,7 +17,7 @@ CFBundleShortVersionString 2.0.0 CFBundleVersion - 67 + 68 NSPrincipalClass diff --git a/Sources/MapboxNavigation/MBXInfo.plist b/Sources/MapboxNavigation/MBXInfo.plist index ebf14255153..b1ac18085d5 100644 --- a/Sources/MapboxNavigation/MBXInfo.plist +++ b/Sources/MapboxNavigation/MBXInfo.plist @@ -17,7 +17,7 @@ CFBundleShortVersionString 2.0.0 CFBundleVersion - 67 + 68 NSPrincipalClass diff --git a/Sources/TestHelper/Info.plist b/Sources/TestHelper/Info.plist index 7f930c172fe..98fa3c2d17a 100644 --- a/Sources/TestHelper/Info.plist +++ b/Sources/TestHelper/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 2.0.0 CFBundleVersion - 67 + 68 diff --git a/Tests/CocoaPodsTest/PodInstall/Podfile.lock b/Tests/CocoaPodsTest/PodInstall/Podfile.lock index 10b4274a40b..ed32edab97b 100644 --- a/Tests/CocoaPodsTest/PodInstall/Podfile.lock +++ b/Tests/CocoaPodsTest/PodInstall/Podfile.lock @@ -2,7 +2,7 @@ PODS: - MapboxCommon (17.1.0) - MapboxCoreMaps (10.0.0-rc.7.2): - MapboxCommon (~> 17.1) - - MapboxCoreNavigation (2.0.0-beta.23): + - MapboxCoreNavigation (2.0.0-beta.24): - MapboxDirections-pre (= 2.0.0-beta.8) - MapboxMobileEvents (~> 1.0.0) - MapboxNavigationNative (~> 64.0) @@ -16,8 +16,8 @@ PODS: - MapboxMobileEvents (= 1.0.2) - Turf (= 2.0.0-rc.1) - MapboxMobileEvents (1.0.2) - - MapboxNavigation (2.0.0-beta.23): - - MapboxCoreNavigation (= 2.0.0-beta.23) + - MapboxNavigation (2.0.0-beta.24): + - MapboxCoreNavigation (= 2.0.0-beta.24) - MapboxMaps (= 10.0.0-rc.7) - MapboxMobileEvents (~> 1.0.0) - MapboxSpeech-pre (= 2.0.0-alpha.1) @@ -55,11 +55,11 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: MapboxCommon: ea64a4842f40e8397d6270df379a17afb04e941c MapboxCoreMaps: ebc8bbb2a2f25874835196544448771d7e35a385 - MapboxCoreNavigation: 7f11338b14fe0843a1cd370279401d5dfb161788 + MapboxCoreNavigation: edb980f07c846eb6eab4f0d4ed58caff71dfddc9 MapboxDirections-pre: ac837a27e6f023ea9abcc00dff53d17b080023d2 MapboxMaps: 8b98ffdaa3fd8ee742d44f86ed7296a72e40649c MapboxMobileEvents: 9775eb995e06cc3ea10894bf6ab111683c8e73e7 - MapboxNavigation: c85686ec67fb6f78a27699a139adc727811d929d + MapboxNavigation: 63f7bbfe320ace0137f8b580a8ca427d9b4ff27a MapboxNavigationNative: f369f742e5ad28340a286fd6e826ef6b918fbb33 MapboxSpeech-pre: aeb16de604d07ceb4195150c3359d5401bb298e6 Polyline: fce41d72e1146c41c6d081f7656827226f643dff diff --git a/Tests/MapboxCoreNavigationTests/Info.plist b/Tests/MapboxCoreNavigationTests/Info.plist index a43992321e7..0934bfffa25 100644 --- a/Tests/MapboxCoreNavigationTests/Info.plist +++ b/Tests/MapboxCoreNavigationTests/Info.plist @@ -21,6 +21,6 @@ NSLocationAlwaysAndWhenInUseUsageDescription Location Usage Description CFBundleVersion - 67 + 68 diff --git a/Tests/MapboxNavigationTests/Info.plist b/Tests/MapboxNavigationTests/Info.plist index 8c19d7c6bbd..1f00bd427b5 100644 --- a/Tests/MapboxNavigationTests/Info.plist +++ b/Tests/MapboxNavigationTests/Info.plist @@ -21,6 +21,6 @@ NSLocationWhenInUseUsageDescription Location Usage Description CFBundleVersion - 67 + 68 diff --git a/custom-navigation.md b/custom-navigation.md index 9d358c505b2..54757125ab0 100644 --- a/custom-navigation.md +++ b/custom-navigation.md @@ -36,7 +36,7 @@ To install the MapboxCoreNavigation framework in an application using [Swift Pac To install the MapboxCoreNavigation framework in another package rather than an application, run `swift package init` to create a Package.swift, then add the following dependency: ```swift -.package(name: "MapboxCoreNavigation", url: "https://github.com/mapbox/mapbox-navigation-ios.git", .exact("2.0.0-beta.23")) +.package(name: "MapboxCoreNavigation", url: "https://github.com/mapbox/mapbox-navigation-ios.git", .exact("2.0.0-beta.24")) ``` ### Using CocoaPods @@ -53,7 +53,7 @@ To install Mapbox Core Navigation using [CocoaPods](https://cocoapods.org/): 1. Create a [Podfile](https://guides.cocoapods.org/syntax/podfile.html) with the following specification: ```ruby - pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.0.0-beta.23' + pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.0.0-beta.24' ``` 1. Run `pod repo update && pod install` and open the resulting Xcode workspace. @@ -77,7 +77,7 @@ To install Mapbox Navigation using [Carthage](https://github.com/Carthage/Cartha 1. Create a [Cartfile](https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#github-repositories) with the following dependency: ```cartfile - github "mapbox/mapbox-navigation-ios" "v2.0.0-beta.23" + github "mapbox/mapbox-navigation-ios" "v2.0.0-beta.24" ``` 1. Run `carthage bootstrap --platform iOS --use-xcframeworks --cache-builds --use-netrc`. From cb1d6aa2df72fd68b82c91ea7234a654fbc45d56 Mon Sep 17 00:00:00 2001 From: Alexander Pristavko Date: Thu, 26 Aug 2021 16:32:19 +0300 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd23211584a..8aafa98c7be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -109,6 +109,7 @@ * Added the ability to show speed limit indicator on CarPlay during free-drive. ([#3197](https://github.com/mapbox/mapbox-navigation-ios/pull/3197)) * `CarPlayManagerDelegate.carPlayManager(_:navigationServiceAlong:routeIndex:routeOptions:desiredSimulationMode:)` now requires optional `NavigationService`. In case if `NavigationService` was not provided `MapboxNavigationService` will be used by default. ([#3208](https://github.com/mapbox/mapbox-navigation-ios/pull/3208)) * `CarPlayManagerDelegate.carplayManagerShouldDisableIdleTimer(_:)` was renamed to `CarPlayManagerDelegate.carPlayManagerShouldDisableIdleTimer(_:)`. ([#3208](https://github.com/mapbox/mapbox-navigation-ios/pull/3208)) +* Added `CarPlayManagerDelegate.carPlayManager(_:templateWillAppear:animated:)`, `carPlayManager(_:templateDidAppear:animated:)`, `carPlayManager(_:templateWillDisappear:animated:)`, and `carPlayManager(_:templateDidDisappear:animated:)` to pass through the corresponding methods from `CPInterfaceControllerDelegate`. ([#3219](https://github.com/mapbox/mapbox-navigation-ios/pull/3219)) ### Other changes