Skip to content

Commit e45c83e

Browse files
MaximAlienMaximAlien
authored
Catch-up with release-v2.6 branch. (#3985)
Cherry-picked c8dc598.
1 parent 2118ff1 commit e45c83e

File tree

17 files changed

+47
-47
lines changed

17 files changed

+47
-47
lines changed

‎Example/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundleShortVersionString</key>
1818
<string>2.6.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>112</string>
20+
<string>113</string>
2121
<key>LSApplicationCategoryType</key>
2222
<string></string>
2323
<key>LSRequiresIPhoneOS</key>

‎MapboxCoreNavigation.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
33
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
44

55
s.name = "MapboxCoreNavigation"
6-
s.version = '2.6.0-rc.1'
6+
s.version = '2.6.0-rc.2'
77
s.summary = "Core components for turn-by-turn navigation on iOS."
88

99
s.description = <<-DESC

‎MapboxNavigation-SPM.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@
779779
CLANG_ENABLE_OBJC_WEAK = YES;
780780
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
781781
CODE_SIGN_STYLE = Automatic;
782-
CURRENT_PROJECT_VERSION = 112;
782+
CURRENT_PROJECT_VERSION = 113;
783783
DEBUG_INFORMATION_FORMAT = dwarf;
784784
DEVELOPMENT_TEAM = GJZR2MEM28;
785785
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -821,7 +821,7 @@
821821
CLANG_ENABLE_OBJC_WEAK = YES;
822822
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
823823
CODE_SIGN_STYLE = Automatic;
824-
CURRENT_PROJECT_VERSION = 112;
824+
CURRENT_PROJECT_VERSION = 113;
825825
DEVELOPMENT_TEAM = GJZR2MEM28;
826826
ENABLE_TESTABILITY = YES;
827827
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -860,7 +860,7 @@
860860
CLANG_ENABLE_OBJC_WEAK = YES;
861861
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
862862
CODE_SIGN_STYLE = Automatic;
863-
CURRENT_PROJECT_VERSION = 112;
863+
CURRENT_PROJECT_VERSION = 113;
864864
DEBUG_INFORMATION_FORMAT = dwarf;
865865
DEVELOPMENT_TEAM = GJZR2MEM28;
866866
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -894,7 +894,7 @@
894894
CLANG_ENABLE_OBJC_WEAK = YES;
895895
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
896896
CODE_SIGN_STYLE = Automatic;
897-
CURRENT_PROJECT_VERSION = 112;
897+
CURRENT_PROJECT_VERSION = 113;
898898
DEVELOPMENT_TEAM = GJZR2MEM28;
899899
ENABLE_TESTABILITY = YES;
900900
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1001,7 +1001,7 @@
10011001
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10021002
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
10031003
COPY_PHASE_STRIP = NO;
1004-
CURRENT_PROJECT_VERSION = 112;
1004+
CURRENT_PROJECT_VERSION = 113;
10051005
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
10061006
ENABLE_STRICT_OBJC_MSGSEND = YES;
10071007
ENABLE_TESTABILITY = YES;
@@ -1066,7 +1066,7 @@
10661066
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10671067
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
10681068
COPY_PHASE_STRIP = NO;
1069-
CURRENT_PROJECT_VERSION = 112;
1069+
CURRENT_PROJECT_VERSION = 113;
10701070
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
10711071
ENABLE_NS_ASSERTIONS = NO;
10721072
ENABLE_STRICT_OBJC_MSGSEND = YES;

‎MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MapboxNavigation.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
33
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
44

55
s.name = "MapboxNavigation"
6-
s.version = '2.6.0-rc.1'
6+
s.version = '2.6.0-rc.2'
77
s.summary = "Complete turn-by-turn navigation interface for iOS."
88

99
s.description = <<-DESC

‎MapboxNavigation.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3212,7 +3212,7 @@
32123212
DEFINES_MODULE = YES;
32133213
DEVELOPMENT_TEAM = GJZR2MEM28;
32143214
DYLIB_COMPATIBILITY_VERSION = 1;
3215-
DYLIB_CURRENT_VERSION = 112;
3215+
DYLIB_CURRENT_VERSION = 113;
32163216
DYLIB_INSTALL_NAME_BASE = "@rpath";
32173217
FRAMEWORK_SEARCH_PATHS = (
32183218
"$(inherited)",
@@ -3239,7 +3239,7 @@
32393239
DEFINES_MODULE = YES;
32403240
DEVELOPMENT_TEAM = GJZR2MEM28;
32413241
DYLIB_COMPATIBILITY_VERSION = 1;
3242-
DYLIB_CURRENT_VERSION = 112;
3242+
DYLIB_CURRENT_VERSION = 113;
32433243
DYLIB_INSTALL_NAME_BASE = "@rpath";
32443244
FRAMEWORK_SEARCH_PATHS = (
32453245
"$(inherited)",
@@ -3314,12 +3314,12 @@
33143314
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
33153315
CODE_SIGN_IDENTITY = "";
33163316
CODE_SIGN_STYLE = Automatic;
3317-
CURRENT_PROJECT_VERSION = 112;
3317+
CURRENT_PROJECT_VERSION = 113;
33183318
DEBUG_INFORMATION_FORMAT = dwarf;
33193319
DEFINES_MODULE = YES;
33203320
DEVELOPMENT_TEAM = GJZR2MEM28;
33213321
DYLIB_COMPATIBILITY_VERSION = 1;
3322-
DYLIB_CURRENT_VERSION = 112;
3322+
DYLIB_CURRENT_VERSION = 113;
33233323
DYLIB_INSTALL_NAME_BASE = "@rpath";
33243324
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
33253325
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -3351,11 +3351,11 @@
33513351
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
33523352
CODE_SIGN_IDENTITY = "";
33533353
CODE_SIGN_STYLE = Automatic;
3354-
CURRENT_PROJECT_VERSION = 112;
3354+
CURRENT_PROJECT_VERSION = 113;
33553355
DEFINES_MODULE = YES;
33563356
DEVELOPMENT_TEAM = GJZR2MEM28;
33573357
DYLIB_COMPATIBILITY_VERSION = 1;
3358-
DYLIB_CURRENT_VERSION = 112;
3358+
DYLIB_CURRENT_VERSION = 113;
33593359
DYLIB_INSTALL_NAME_BASE = "@rpath";
33603360
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
33613361
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -3409,7 +3409,7 @@
34093409
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
34103410
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
34113411
COPY_PHASE_STRIP = NO;
3412-
CURRENT_PROJECT_VERSION = 112;
3412+
CURRENT_PROJECT_VERSION = 113;
34133413
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
34143414
ENABLE_STRICT_OBJC_MSGSEND = YES;
34153415
ENABLE_TESTABILITY = YES;
@@ -3474,7 +3474,7 @@
34743474
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
34753475
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
34763476
COPY_PHASE_STRIP = NO;
3477-
CURRENT_PROJECT_VERSION = 112;
3477+
CURRENT_PROJECT_VERSION = 113;
34783478
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
34793479
ENABLE_NS_ASSERTIONS = NO;
34803480
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -3508,7 +3508,7 @@
35083508
DEFINES_MODULE = YES;
35093509
DEVELOPMENT_TEAM = GJZR2MEM28;
35103510
DYLIB_COMPATIBILITY_VERSION = 1;
3511-
DYLIB_CURRENT_VERSION = 112;
3511+
DYLIB_CURRENT_VERSION = 113;
35123512
DYLIB_INSTALL_NAME_BASE = "@rpath";
35133513
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
35143514
INFOPLIST_FILE = Sources/MapboxCoreNavigation/Info.plist;
@@ -3534,7 +3534,7 @@
35343534
DEFINES_MODULE = YES;
35353535
DEVELOPMENT_TEAM = GJZR2MEM28;
35363536
DYLIB_COMPATIBILITY_VERSION = 1;
3537-
DYLIB_CURRENT_VERSION = 112;
3537+
DYLIB_CURRENT_VERSION = 113;
35383538
DYLIB_INSTALL_NAME_BASE = "@rpath";
35393539
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
35403540
INFOPLIST_FILE = Sources/MapboxCoreNavigation/Info.plist;
@@ -3600,11 +3600,11 @@
36003600
CLANG_ENABLE_OBJC_WEAK = YES;
36013601
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
36023602
CODE_SIGN_STYLE = Automatic;
3603-
CURRENT_PROJECT_VERSION = 112;
3603+
CURRENT_PROJECT_VERSION = 113;
36043604
DEBUG_INFORMATION_FORMAT = dwarf;
36053605
DEFINES_MODULE = YES;
36063606
DYLIB_COMPATIBILITY_VERSION = 1;
3607-
DYLIB_CURRENT_VERSION = 112;
3607+
DYLIB_CURRENT_VERSION = 113;
36083608
DYLIB_INSTALL_NAME_BASE = "@rpath";
36093609
GCC_C_LANGUAGE_STANDARD = gnu11;
36103610
INFOPLIST_FILE = Sources/CarPlayTestHelper/Info.plist;
@@ -3633,10 +3633,10 @@
36333633
CLANG_ENABLE_OBJC_WEAK = YES;
36343634
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
36353635
CODE_SIGN_STYLE = Automatic;
3636-
CURRENT_PROJECT_VERSION = 112;
3636+
CURRENT_PROJECT_VERSION = 113;
36373637
DEFINES_MODULE = YES;
36383638
DYLIB_COMPATIBILITY_VERSION = 1;
3639-
DYLIB_CURRENT_VERSION = 112;
3639+
DYLIB_CURRENT_VERSION = 113;
36403640
DYLIB_INSTALL_NAME_BASE = "@rpath";
36413641
GCC_C_LANGUAGE_STANDARD = gnu11;
36423642
INFOPLIST_FILE = Sources/CarPlayTestHelper/Info.plist;

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ To install the MapboxNavigation framework in another package rather than an appl
5454
// Latest stable release
5555
.package(name: "MapboxNavigation", url: "https://github.com/mapbox/mapbox-navigation-ios.git", from: "2.5.0")
5656
// Latest prerelease
57-
.package(name: "MapboxNavigation", url: "https://github.com/mapbox/mapbox-navigation-ios.git", .exact("2.6.0-rc.1"))
57+
.package(name: "MapboxNavigation", url: "https://github.com/mapbox/mapbox-navigation-ios.git", .exact("2.6.0-rc.2"))
5858
```
5959

6060
### Using CocoaPods
@@ -75,8 +75,8 @@ To install the MapboxNavigation framework using [CocoaPods](https://cocoapods.or
7575
pod 'MapboxCoreNavigation', '~> 2.5'
7676
pod 'MapboxNavigation', '~> 2.5'
7777
# Latest prerelease
78-
pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.6.0-rc.1'
79-
pod 'MapboxNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.6.0-rc.1'
78+
pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.6.0-rc.2'
79+
pod 'MapboxNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.6.0-rc.2'
8080
```
8181

8282
1. Run `pod repo update && pod install` and open the resulting Xcode workspace.
@@ -103,7 +103,7 @@ To install the MapboxNavigation framework using [Carthage](https://github.com/Ca
103103
# Latest stable release
104104
github "mapbox/mapbox-navigation-ios" ~> 2.5
105105
# Latest prerelease
106-
github "mapbox/mapbox-navigation-ios" "v2.6.0-rc.1"
106+
github "mapbox/mapbox-navigation-ios" "v2.6.0-rc.2"
107107
```
108108

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

‎Sources/CarPlayTestHelper/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
<key>CFBundleShortVersionString</key>
1818
<string>2.6.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>112</string>
20+
<string>113</string>
2121
</dict>
2222
</plist>

‎Sources/MapboxCoreNavigation/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundleShortVersionString</key>
1818
<string>2.6.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>112</string>
20+
<string>113</string>
2121
<key>NSPrincipalClass</key>
2222
<string></string>
2323
</dict>

‎Sources/MapboxCoreNavigation/MBXInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundleShortVersionString</key>
1818
<string>2.6.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>112</string>
20+
<string>113</string>
2121
<key>NSPrincipalClass</key>
2222
<string></string>
2323
</dict>

0 commit comments

Comments
 (0)