Skip to content

Commit c17663a

Browse files
S2LerS2Ler
committed
Merge branch 'main' into s2ler/update-dependencies
# Conflicts: # Tests/CocoaPodsTest/PodInstall/Podfile.lock
2 parents aa91a5b + c0dfd14 commit c17663a

17 files changed

Lines changed: 55 additions & 55 deletions

File tree

‎Example/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.10.0</string>
18+
<string>2.11.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>134</string>
20+
<string>135</string>
2121
<key>LSApplicationCategoryType</key>
2222
<string></string>
2323
<key>LSRequiresIPhoneOS</key>

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ License: [MIT License](https://github.com/raphaelmor/Polyline/blob/master/LICENS
5959

6060
Mapbox Navigation for iOS version 1.2.1 and earlier is licensed under an ISC license.
6161

62-
Copyright © 2014–2022, Mapbox
62+
Copyright © 2014–2023, Mapbox
6363

6464
Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is
6565
hereby granted, provided that the above copyright notice and this permission notice appear in all copies.

‎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.10.0-beta.2'
6+
s.version = '2.11.0-alpha.1'
77
s.summary = "Core components for turn-by-turn navigation on iOS."
88

99
s.description = <<-DESC

‎MapboxNavigation-SPM.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,7 +1079,7 @@
10791079
CLANG_ENABLE_OBJC_WEAK = YES;
10801080
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
10811081
CODE_SIGN_STYLE = Automatic;
1082-
CURRENT_PROJECT_VERSION = 134;
1082+
CURRENT_PROJECT_VERSION = 135;
10831083
DEBUG_INFORMATION_FORMAT = dwarf;
10841084
DEVELOPMENT_TEAM = GJZR2MEM28;
10851085
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1118,7 +1118,7 @@
11181118
CLANG_ENABLE_OBJC_WEAK = YES;
11191119
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
11201120
CODE_SIGN_STYLE = Automatic;
1121-
CURRENT_PROJECT_VERSION = 134;
1121+
CURRENT_PROJECT_VERSION = 135;
11221122
DEVELOPMENT_TEAM = GJZR2MEM28;
11231123
GCC_C_LANGUAGE_STANDARD = gnu11;
11241124
GENERATE_INFOPLIST_FILE = YES;
@@ -1155,7 +1155,7 @@
11551155
CLANG_ENABLE_OBJC_WEAK = YES;
11561156
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
11571157
CODE_SIGN_STYLE = Automatic;
1158-
CURRENT_PROJECT_VERSION = 134;
1158+
CURRENT_PROJECT_VERSION = 135;
11591159
DEBUG_INFORMATION_FORMAT = dwarf;
11601160
DEVELOPMENT_TEAM = GJZR2MEM28;
11611161
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1195,7 +1195,7 @@
11951195
CLANG_ENABLE_OBJC_WEAK = YES;
11961196
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
11971197
CODE_SIGN_STYLE = Automatic;
1198-
CURRENT_PROJECT_VERSION = 134;
1198+
CURRENT_PROJECT_VERSION = 135;
11991199
DEVELOPMENT_TEAM = GJZR2MEM28;
12001200
GCC_C_LANGUAGE_STANDARD = gnu11;
12011201
GENERATE_INFOPLIST_FILE = YES;
@@ -1234,7 +1234,7 @@
12341234
CLANG_ENABLE_OBJC_WEAK = YES;
12351235
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
12361236
CODE_SIGN_STYLE = Automatic;
1237-
CURRENT_PROJECT_VERSION = 134;
1237+
CURRENT_PROJECT_VERSION = 135;
12381238
DEBUG_INFORMATION_FORMAT = dwarf;
12391239
DEVELOPMENT_TEAM = GJZR2MEM28;
12401240
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1276,7 +1276,7 @@
12761276
CLANG_ENABLE_OBJC_WEAK = YES;
12771277
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
12781278
CODE_SIGN_STYLE = Automatic;
1279-
CURRENT_PROJECT_VERSION = 134;
1279+
CURRENT_PROJECT_VERSION = 135;
12801280
DEVELOPMENT_TEAM = GJZR2MEM28;
12811281
ENABLE_TESTABILITY = YES;
12821282
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1315,7 +1315,7 @@
13151315
CLANG_ENABLE_OBJC_WEAK = YES;
13161316
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
13171317
CODE_SIGN_STYLE = Automatic;
1318-
CURRENT_PROJECT_VERSION = 134;
1318+
CURRENT_PROJECT_VERSION = 135;
13191319
DEBUG_INFORMATION_FORMAT = dwarf;
13201320
DEVELOPMENT_TEAM = GJZR2MEM28;
13211321
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1349,7 +1349,7 @@
13491349
CLANG_ENABLE_OBJC_WEAK = YES;
13501350
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
13511351
CODE_SIGN_STYLE = Automatic;
1352-
CURRENT_PROJECT_VERSION = 134;
1352+
CURRENT_PROJECT_VERSION = 135;
13531353
DEVELOPMENT_TEAM = GJZR2MEM28;
13541354
ENABLE_TESTABILITY = YES;
13551355
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1458,7 +1458,7 @@
14581458
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
14591459
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
14601460
COPY_PHASE_STRIP = NO;
1461-
CURRENT_PROJECT_VERSION = 134;
1461+
CURRENT_PROJECT_VERSION = 135;
14621462
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
14631463
ENABLE_STRICT_OBJC_MSGSEND = YES;
14641464
ENABLE_TESTABILITY = YES;
@@ -1523,7 +1523,7 @@
15231523
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
15241524
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
15251525
COPY_PHASE_STRIP = NO;
1526-
CURRENT_PROJECT_VERSION = 134;
1526+
CURRENT_PROJECT_VERSION = 135;
15271527
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
15281528
ENABLE_NS_ASSERTIONS = NO;
15291529
ENABLE_STRICT_OBJC_MSGSEND = YES;

‎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.10.0-beta.2'
6+
s.version = '2.11.0-alpha.1'
77
s.summary = "Complete turn-by-turn navigation interface for iOS."
88

99
s.description = <<-DESC

‎MapboxNavigation.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3722,7 +3722,7 @@
37223722
CLANG_ENABLE_OBJC_WEAK = YES;
37233723
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
37243724
CODE_SIGN_STYLE = Automatic;
3725-
CURRENT_PROJECT_VERSION = 134;
3725+
CURRENT_PROJECT_VERSION = 135;
37263726
DEBUG_INFORMATION_FORMAT = dwarf;
37273727
DEVELOPMENT_TEAM = GJZR2MEM28;
37283728
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -3756,7 +3756,7 @@
37563756
CLANG_ENABLE_OBJC_WEAK = YES;
37573757
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
37583758
CODE_SIGN_STYLE = Automatic;
3759-
CURRENT_PROJECT_VERSION = 134;
3759+
CURRENT_PROJECT_VERSION = 135;
37603760
DEVELOPMENT_TEAM = GJZR2MEM28;
37613761
GCC_C_LANGUAGE_STANDARD = gnu11;
37623762
GENERATE_INFOPLIST_FILE = YES;
@@ -3787,7 +3787,7 @@
37873787
DEFINES_MODULE = YES;
37883788
DEVELOPMENT_TEAM = GJZR2MEM28;
37893789
DYLIB_COMPATIBILITY_VERSION = 1;
3790-
DYLIB_CURRENT_VERSION = 134;
3790+
DYLIB_CURRENT_VERSION = 135;
37913791
DYLIB_INSTALL_NAME_BASE = "@rpath";
37923792
FRAMEWORK_SEARCH_PATHS = (
37933793
"$(inherited)",
@@ -3815,7 +3815,7 @@
38153815
DEFINES_MODULE = YES;
38163816
DEVELOPMENT_TEAM = GJZR2MEM28;
38173817
DYLIB_COMPATIBILITY_VERSION = 1;
3818-
DYLIB_CURRENT_VERSION = 134;
3818+
DYLIB_CURRENT_VERSION = 135;
38193819
DYLIB_INSTALL_NAME_BASE = "@rpath";
38203820
FRAMEWORK_SEARCH_PATHS = (
38213821
"$(inherited)",
@@ -3893,12 +3893,12 @@
38933893
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
38943894
CODE_SIGN_IDENTITY = "";
38953895
CODE_SIGN_STYLE = Automatic;
3896-
CURRENT_PROJECT_VERSION = 134;
3896+
CURRENT_PROJECT_VERSION = 135;
38973897
DEBUG_INFORMATION_FORMAT = dwarf;
38983898
DEFINES_MODULE = YES;
38993899
DEVELOPMENT_TEAM = GJZR2MEM28;
39003900
DYLIB_COMPATIBILITY_VERSION = 1;
3901-
DYLIB_CURRENT_VERSION = 134;
3901+
DYLIB_CURRENT_VERSION = 135;
39023902
DYLIB_INSTALL_NAME_BASE = "@rpath";
39033903
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
39043904
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -3931,11 +3931,11 @@
39313931
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
39323932
CODE_SIGN_IDENTITY = "";
39333933
CODE_SIGN_STYLE = Automatic;
3934-
CURRENT_PROJECT_VERSION = 134;
3934+
CURRENT_PROJECT_VERSION = 135;
39353935
DEFINES_MODULE = YES;
39363936
DEVELOPMENT_TEAM = GJZR2MEM28;
39373937
DYLIB_COMPATIBILITY_VERSION = 1;
3938-
DYLIB_CURRENT_VERSION = 134;
3938+
DYLIB_CURRENT_VERSION = 135;
39393939
DYLIB_INSTALL_NAME_BASE = "@rpath";
39403940
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
39413941
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -3990,7 +3990,7 @@
39903990
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
39913991
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
39923992
COPY_PHASE_STRIP = NO;
3993-
CURRENT_PROJECT_VERSION = 134;
3993+
CURRENT_PROJECT_VERSION = 135;
39943994
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
39953995
ENABLE_STRICT_OBJC_MSGSEND = YES;
39963996
ENABLE_TESTABILITY = YES;
@@ -4055,7 +4055,7 @@
40554055
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
40564056
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
40574057
COPY_PHASE_STRIP = NO;
4058-
CURRENT_PROJECT_VERSION = 134;
4058+
CURRENT_PROJECT_VERSION = 135;
40594059
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
40604060
ENABLE_NS_ASSERTIONS = NO;
40614061
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -4089,7 +4089,7 @@
40894089
DEFINES_MODULE = YES;
40904090
DEVELOPMENT_TEAM = GJZR2MEM28;
40914091
DYLIB_COMPATIBILITY_VERSION = 1;
4092-
DYLIB_CURRENT_VERSION = 134;
4092+
DYLIB_CURRENT_VERSION = 135;
40934093
DYLIB_INSTALL_NAME_BASE = "@rpath";
40944094
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
40954095
INFOPLIST_FILE = Sources/MapboxCoreNavigation/Info.plist;
@@ -4116,7 +4116,7 @@
41164116
DEFINES_MODULE = YES;
41174117
DEVELOPMENT_TEAM = GJZR2MEM28;
41184118
DYLIB_COMPATIBILITY_VERSION = 1;
4119-
DYLIB_CURRENT_VERSION = 134;
4119+
DYLIB_CURRENT_VERSION = 135;
41204120
DYLIB_INSTALL_NAME_BASE = "@rpath";
41214121
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
41224122
INFOPLIST_FILE = Sources/MapboxCoreNavigation/Info.plist;
@@ -4185,11 +4185,11 @@
41854185
CLANG_ENABLE_OBJC_WEAK = YES;
41864186
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
41874187
CODE_SIGN_STYLE = Automatic;
4188-
CURRENT_PROJECT_VERSION = 134;
4188+
CURRENT_PROJECT_VERSION = 135;
41894189
DEBUG_INFORMATION_FORMAT = dwarf;
41904190
DEFINES_MODULE = YES;
41914191
DYLIB_COMPATIBILITY_VERSION = 1;
4192-
DYLIB_CURRENT_VERSION = 134;
4192+
DYLIB_CURRENT_VERSION = 135;
41934193
DYLIB_INSTALL_NAME_BASE = "@rpath";
41944194
GCC_C_LANGUAGE_STANDARD = gnu11;
41954195
INFOPLIST_FILE = Sources/CarPlayTestHelper/Info.plist;
@@ -4218,10 +4218,10 @@
42184218
CLANG_ENABLE_OBJC_WEAK = YES;
42194219
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
42204220
CODE_SIGN_STYLE = Automatic;
4221-
CURRENT_PROJECT_VERSION = 134;
4221+
CURRENT_PROJECT_VERSION = 135;
42224222
DEFINES_MODULE = YES;
42234223
DYLIB_COMPATIBILITY_VERSION = 1;
4224-
DYLIB_CURRENT_VERSION = 134;
4224+
DYLIB_CURRENT_VERSION = 135;
42254225
DYLIB_INSTALL_NAME_BASE = "@rpath";
42264226
GCC_C_LANGUAGE_STANDARD = gnu11;
42274227
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.9.0")
5656
// Latest prerelease
57-
.package(name: "MapboxNavigation", url: "https://github.com/mapbox/mapbox-navigation-ios.git", .exact("2.10.0-beta.2"))
57+
.package(name: "MapboxNavigation", url: "https://github.com/mapbox/mapbox-navigation-ios.git", .exact("2.11.0-alpha.1"))
5858
```
5959

6060
### Using CocoaPods
@@ -75,8 +75,8 @@ To install the MapboxNavigation framework using [CocoaPods](https://cocoapods.or
7575
pod 'MapboxCoreNavigation', '~> 2.9'
7676
pod 'MapboxNavigation', '~> 2.9'
7777
# Latest prerelease
78-
pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.10.0-beta.2'
79-
pod 'MapboxNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.10.0-beta.2'
78+
pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.11.0-alpha.1'
79+
pod 'MapboxNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v2.11.0-alpha.1'
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.9
105105
# Latest prerelease
106-
github "mapbox/mapbox-navigation-ios" "v2.10.0-beta.2"
106+
github "mapbox/mapbox-navigation-ios" "v2.11.0-alpha.1"
107107
```
108108

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

‎Sources/CarPlayTestHelper/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<key>CFBundlePackageType</key>
1616
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.10.0</string>
18+
<string>2.11.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>134</string>
20+
<string>135</string>
2121
</dict>
2222
</plist>

‎Sources/MapboxCoreNavigation/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.10.0</string>
18+
<string>2.11.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>134</string>
20+
<string>135</string>
2121
<key>NSPrincipalClass</key>
2222
<string></string>
2323
</dict>

‎Sources/MapboxCoreNavigation/Resources/MBXInfo.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.10.0</string>
18+
<string>2.11.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>134</string>
20+
<string>135</string>
2121
<key>NSPrincipalClass</key>
2222
<string></string>
2323
</dict>

0 commit comments

Comments
 (0)