Skip to content

Commit

Permalink
Merge pull request #2750 from mapbox/vk/v1.2.0-alpha.2
Browse files Browse the repository at this point in the history
v1.2.0-alpha.2
  • Loading branch information
Udumft authored Nov 25, 2020
2 parents daa1143 + f3a54d4 commit 72d7845
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Bench/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>1.2.0</string>
<key>CFBundleVersion</key>
<string>36</string>
<string>37</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
Expand Down
2 changes: 1 addition & 1 deletion BenchTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>1.2.0</string>
<key>CFBundleVersion</key>
<string>36</string>
<string>37</string>
</dict>
</plist>
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>1.2.0</string>
<key>CFBundleVersion</key>
<string>36</string>
<string>37</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 = '1.2.0-alpha.1'
s.version = '1.2.0-alpha.2'
s.summary = "Core components for turn-by-turn navigation on iOS."

s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion MapboxCoreNavigation/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>1.2.0</string>
<key>CFBundleVersion</key>
<string>36</string>
<string>37</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
14 changes: 7 additions & 7 deletions MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PODS:
- MapboxMobileEvents (~> 0.10.4)
- MapboxAccounts (2.3.0)
- MapboxCommon (7.1.2)
- MapboxCoreNavigation (1.2.0-alpha.1):
- MapboxCoreNavigation (1.2.0-alpha.2):
- MapboxAccounts (~> 2.3.0)
- MapboxDirections (~> 1.0)
- MapboxMobileEvents (~> 0.10.2)
Expand All @@ -12,10 +12,10 @@ PODS:
- MapboxDirections (1.1.0):
- Polyline (~> 5.0)
- Turf (~> 1.0)
- MapboxMobileEvents (0.10.5)
- MapboxNavigation (1.2.0-alpha.1):
- MapboxMobileEvents (0.10.6)
- MapboxNavigation (1.2.0-alpha.2):
- Mapbox-iOS-SDK (~> 6.0)
- MapboxCoreNavigation (= 1.2.0-alpha.1)
- MapboxCoreNavigation (= 1.2.0-alpha.2)
- MapboxMobileEvents (~> 0.10.2)
- MapboxSpeech (~> 1.0)
- Solar (~> 2.1)
Expand Down Expand Up @@ -53,10 +53,10 @@ SPEC CHECKSUMS:
Mapbox-iOS-SDK: 6a67397df2bcafe5d2851604192aa8de6f8d6c89
MapboxAccounts: 84abfdde95d9dc483f604c1b0fe1861edf691ce7
MapboxCommon: e469f6c62de29e1906c37e0bce65f6826e7fb9ac
MapboxCoreNavigation: 231b3c3a5ccbf56a0badca1eb25c3cb9f7854867
MapboxCoreNavigation: 5a63246960e7951ad4baa8354b1fc691b0c274d5
MapboxDirections: f47e5648051967c502897cf808090874e3f81c5d
MapboxMobileEvents: 7f6fb7fb0360302f524d198d36ccec3a0beae523
MapboxNavigation: c40bf5e626d91139ab02d2c30b1327345a426368
MapboxMobileEvents: 5ef561e6b6f9cbff2900d62a52322e75d1a7dfdf
MapboxNavigation: be6cdedc9224c741a0f3f35ab4abecd38461a29b
MapboxNavigationNative: 88f243e0460fc7d1d50035bf13583355da6e4c26
MapboxSpeech: 4b3aea42e35d056fae1d7ad847a9fc0f412d911e
Polyline: fce41d72e1146c41c6d081f7656827226f643dff
Expand Down
2 changes: 1 addition & 1 deletion 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>36</string>
<string>37</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion MapboxNavigation-Documentation.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-Documentation"
s.version = '1.2.0-alpha.1'
s.version = '1.2.0-alpha.2'
s.summary = "Complete turn-by-turn navigation interface for iOS."

s.description = <<-DESC
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 = '1.2.0-alpha.1'
s.version = '1.2.0-alpha.2'
s.summary = "Complete turn-by-turn navigation interface for iOS."

s.description = <<-DESC
Expand Down
20 changes: 10 additions & 10 deletions MapboxNavigation.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3035,7 +3035,7 @@
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = GJZR2MEM28;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 36;
DYLIB_CURRENT_VERSION = 37;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -3057,7 +3057,7 @@
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = GJZR2MEM28;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 36;
DYLIB_CURRENT_VERSION = 37;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -3272,12 +3272,12 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 36;
CURRENT_PROJECT_VERSION = 37;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = GJZR2MEM28;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 36;
DYLIB_CURRENT_VERSION = 37;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -3307,11 +3307,11 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 36;
CURRENT_PROJECT_VERSION = 37;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = GJZR2MEM28;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 36;
DYLIB_CURRENT_VERSION = 37;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -3414,7 +3414,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 36;
CURRENT_PROJECT_VERSION = 37;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -3479,7 +3479,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 36;
CURRENT_PROJECT_VERSION = 37;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down Expand Up @@ -3512,7 +3512,7 @@
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = GJZR2MEM28;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 36;
DYLIB_CURRENT_VERSION = 37;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -3537,7 +3537,7 @@
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = GJZR2MEM28;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 36;
DYLIB_CURRENT_VERSION = 37;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down
2 changes: 1 addition & 1 deletion MapboxNavigation/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>1.2.0</string>
<key>CFBundleVersion</key>
<string>36</string>
<string>37</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion 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>36</string>
<string>37</string>
</dict>
</plist>
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ To install Mapbox Navigation using [CocoaPods](https://cocoapods.org/):
# Latest stable release
pod 'MapboxNavigation', '~> 1.1'
# Latest prerelease
pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v1.2.0-alpha.1'
pod 'MapboxNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v1.2.0-alpha.1'
pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v1.2.0-alpha.2'
pod 'MapboxNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :tag => 'v1.2.0-alpha.2'
```

1. Run `pod repo update && pod install` and open the resulting Xcode workspace.
Expand All @@ -75,7 +75,7 @@ Alternatively, to install Mapbox Navigation using [Carthage](https://github.com/
# Latest stable release
github "mapbox/mapbox-navigation-ios" ~> 1.1
# Latest prerelease
github "mapbox/mapbox-navigation-ios" "v1.2.0-alpha.1"
github "mapbox/mapbox-navigation-ios" "v1.2.0-alpha.2"
```

1. Run `./Carthage/Checkouts/mapbox-navigation-ios/scripts/wcarthage.sh bootstrap --platform iOS --cache-builds --use-netrc`. (wcarthage.sh is a temporary replacement for `carthage` to work around [a linker error in Xcode 12](https://github.com/Carthage/Carthage/issues/3019).)
Expand Down
2 changes: 1 addition & 1 deletion TestHelper/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>1.2.0</string>
<key>CFBundleVersion</key>
<string>36</string>
<string>37</string>
</dict>
</plist>

0 comments on commit 72d7845

Please sign in to comment.