Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Example/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>2.5.0</string>
<key>CFBundleVersion</key>
<string>100</string>
<string>101</string>
<key>LSApplicationCategoryType</key>
<string></string>
<key>LSRequiresIPhoneOS</key>
Expand Down
2 changes: 1 addition & 1 deletion MapboxCoreNavigation.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Pod::Spec.new do |s|
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

s.name = "MapboxCoreNavigation"
s.version = '2.5.0-beta.1'
s.version = '2.5.0-beta.2'
s.summary = "Core components for turn-by-turn navigation on iOS."

s.description = <<-DESC
Expand Down
4 changes: 2 additions & 2 deletions MapboxNavigation-SPM.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 100;
CURRENT_PROJECT_VERSION = 101;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -671,7 +671,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 100;
CURRENT_PROJECT_VERSION = 101;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down
2 changes: 1 addition & 1 deletion MapboxNavigation.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Pod::Spec.new do |s|
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

s.name = "MapboxNavigation"
s.version = '2.5.0-beta.1'
s.version = '2.5.0-beta.2'
s.summary = "Complete turn-by-turn navigation interface for iOS."

s.description = <<-DESC
Expand Down
28 changes: 14 additions & 14 deletions MapboxNavigation.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3180,7 +3180,7 @@
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = GJZR2MEM28;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 100;
DYLIB_CURRENT_VERSION = 101;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -3207,7 +3207,7 @@
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = GJZR2MEM28;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 100;
DYLIB_CURRENT_VERSION = 101;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -3282,12 +3282,12 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 100;
CURRENT_PROJECT_VERSION = 101;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = GJZR2MEM28;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 100;
DYLIB_CURRENT_VERSION = 101;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -3319,11 +3319,11 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 100;
CURRENT_PROJECT_VERSION = 101;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = GJZR2MEM28;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 100;
DYLIB_CURRENT_VERSION = 101;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -3377,7 +3377,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 100;
CURRENT_PROJECT_VERSION = 101;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -3442,7 +3442,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 100;
CURRENT_PROJECT_VERSION = 101;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down Expand Up @@ -3476,7 +3476,7 @@
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = GJZR2MEM28;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 100;
DYLIB_CURRENT_VERSION = 101;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = Sources/MapboxCoreNavigation/Info.plist;
Expand All @@ -3502,7 +3502,7 @@
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = GJZR2MEM28;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 100;
DYLIB_CURRENT_VERSION = 101;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = Sources/MapboxCoreNavigation/Info.plist;
Expand Down Expand Up @@ -3568,11 +3568,11 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 100;
CURRENT_PROJECT_VERSION = 101;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 100;
DYLIB_CURRENT_VERSION = 101;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = Sources/CarPlayTestHelper/Info.plist;
Expand Down Expand Up @@ -3601,10 +3601,10 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 100;
CURRENT_PROJECT_VERSION = 101;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 100;
DYLIB_CURRENT_VERSION = 101;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = Sources/CarPlayTestHelper/Info.plist;
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ To install the MapboxNavigation framework in another package rather than an appl
// Latest stable release
.package(name: "MapboxNavigation", url: "https://github.com/mapbox/mapbox-navigation-ios.git", from: "2.3.0")
// Latest prerelease
.package(name: "MapboxNavigation", url: "https://github.com/mapbox/mapbox-navigation-ios.git", .exact("2.5.0-beta.1"))
.package(name: "MapboxNavigation", url: "https://github.com/mapbox/mapbox-navigation-ios.git", .exact("2.5.0-beta.2"))
```

### Using CocoaPods
Expand All @@ -72,11 +72,11 @@ 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
# Latest stable release
pod 'MapboxCoreNavigation', '~> 2.3'
pod 'MapboxNavigation', '~> 2.3'
pod 'MapboxCoreNavigation', '~> 2.4'
pod 'MapboxNavigation', '~> 2.4'
# Latest prerelease
pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.5.0-beta.1'
pod 'MapboxNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.5.0-beta.1'
pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.5.0-beta.2'
pod 'MapboxNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.5.0-beta.2'
```

1. Run `pod repo update && pod install` and open the resulting Xcode workspace.
Expand All @@ -101,9 +101,9 @@ To install the MapboxNavigation framework using [Carthage](https://github.com/Ca
1. Create a [Cartfile](https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#github-repositories) with the following dependency:
```cartfile
# Latest stable release
github "mapbox/mapbox-navigation-ios" ~> 2.3
github "mapbox/mapbox-navigation-ios" ~> 2.4
# Latest prerelease
github "mapbox/mapbox-navigation-ios" "v2.5.0-beta.1"
github "mapbox/mapbox-navigation-ios" "v2.5.0-beta.2"
```

1. Run `carthage bootstrap --platform iOS --use-xcframeworks --cache-builds --use-netrc`.
Expand Down
2 changes: 1 addition & 1 deletion Sources/CarPlayTestHelper/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>2.5.0</string>
<key>CFBundleVersion</key>
<string>100</string>
<string>101</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Sources/MapboxCoreNavigation/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>2.5.0</string>
<key>CFBundleVersion</key>
<string>100</string>
<string>101</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Sources/MapboxCoreNavigation/MBXInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>2.5.0</string>
<key>CFBundleVersion</key>
<string>100</string>
<string>101</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Sources/MapboxNavigation/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>2.5.0</string>
<key>CFBundleVersion</key>
<string>100</string>
<string>101</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Sources/MapboxNavigation/MBXInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>2.5.0</string>
<key>CFBundleVersion</key>
<string>100</string>
<string>101</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Sources/TestHelper/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>2.5.0</string>
<key>CFBundleVersion</key>
<string>100</string>
<string>101</string>
</dict>
</plist>
10 changes: 5 additions & 5 deletions Tests/CocoaPodsTest/PodInstall/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PODS:
- MapboxCommon (21.3.0-rc.2)
- MapboxCoreMaps (10.5.0-rc.1):
- MapboxCommon (~> 21.3.0-rc)
- MapboxCoreNavigation (2.5.0-beta.1):
- MapboxCoreNavigation (2.5.0-beta.2):
- MapboxDirections (~> 2.4)
- MapboxMobileEvents (~> 1.0)
- MapboxNavigationNative (~> 97.0)
Expand All @@ -15,8 +15,8 @@ PODS:
- MapboxMobileEvents (= 1.0.7)
- Turf (~> 2.0)
- MapboxMobileEvents (1.0.7)
- MapboxNavigation (2.5.0-beta.1):
- MapboxCoreNavigation (= 2.5.0-beta.1)
- MapboxNavigation (2.5.0-beta.2):
- MapboxCoreNavigation (= 2.5.0-beta.2)
- MapboxMaps (= 10.5.0-rc.1)
- MapboxMobileEvents (~> 1.0)
- MapboxSpeech (~> 2.0)
Expand Down Expand Up @@ -54,11 +54,11 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
MapboxCommon: 4c7bbe5e3a06f6d5711cbbce0eb7d17d6f5ba5e7
MapboxCoreMaps: 66b814bc79930848ebd8c37beb267385e1f85d01
MapboxCoreNavigation: 782f9db767f95b312f1c27969005d9138f7d62b4
MapboxCoreNavigation: 438a34584439345a2358c7285b23540309b2cb5c
MapboxDirections: c3fd015787ff85b6bcfba7b12156d75fa74121b1
MapboxMaps: 68005489b42a825aeb0a8a31d92368d30578782d
MapboxMobileEvents: f7f3e8daeb4b83688ae62a4172dce79169a97233
MapboxNavigation: dc7be4c041c09d749829685f806dff9ab5aa6a14
MapboxNavigation: e3d026c39cb038ef1e18f2000cc5816040b972d4
MapboxNavigationNative: de90caeae79c5f91f99b72e41eab9673e630e9ae
MapboxSpeech: e4ed02984444b6373374c72c369edaf045cc490c
Polyline: fce41d72e1146c41c6d081f7656827226f643dff
Expand Down
2 changes: 1 addition & 1 deletion Tests/MapboxCoreNavigationTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>Location Usage Description</string>
<key>CFBundleVersion</key>
<string>100</string>
<string>101</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Tests/MapboxNavigationTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>NSLocationWhenInUseUsageDescription</key>
<string>Location Usage Description</string>
<key>CFBundleVersion</key>
<string>100</string>
<string>101</string>
</dict>
</plist>
10 changes: 5 additions & 5 deletions custom-navigation.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ To install the MapboxCoreNavigation framework in another package rather than an
// Latest stable release
.package(name: "MapboxCoreNavigation", url: "https://github.com/mapbox/mapbox-navigation-ios.git", from: "2.3.0")
// Latest prerelease
.package(name: "MapboxCoreNavigation", url: "https://github.com/mapbox/mapbox-navigation-ios.git", .exact("2.5.0-beta.1"))
.package(name: "MapboxCoreNavigation", url: "https://github.com/mapbox/mapbox-navigation-ios.git", .exact("2.5.0-beta.2"))
```

### Using CocoaPods
Expand All @@ -57,9 +57,9 @@ 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
# Latest stable release
pod 'MapboxCoreNavigation', '~> 2.3'
pod 'MapboxCoreNavigation', '~> 2.4'
# Latest prerelease
pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.5.0-beta.1'
pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.5.0-beta.2'
```

1. Run `pod repo update && pod install` and open the resulting Xcode workspace.
Expand All @@ -84,9 +84,9 @@ 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
# Latest stable release
github "mapbox/mapbox-navigation-ios" ~> 2.3
github "mapbox/mapbox-navigation-ios" ~> 2.4
# Latest prerelease
github "mapbox/mapbox-navigation-ios" "v2.5.0-beta.1"
github "mapbox/mapbox-navigation-ios" "v2.5.0-beta.2"
```

1. Run `carthage bootstrap --platform iOS --use-xcframeworks --cache-builds --use-netrc`.
Expand Down