Skip to content
This repository has been archived by the owner on Jun 14, 2024. It is now read-only.

Update to Maps SDK 4.6.0 #244

Merged
merged 7 commits into from
Nov 7, 2018
Merged

Update to Maps SDK 4.6.0 #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
33b9532
Maps SDK 4.6.0-alpha.1
friedbunny Oct 23, 2018
9368ec4
Bump dependencies
friedbunny Oct 24, 2018
7513329
Maps SDK 4.6.0-alpha.2
friedbunny Oct 24, 2018
cf55a22
CustomCalloutView: Fix int-conversion warning
friedbunny Oct 24, 2018
0bff168
Maps SDK 4.6.0-beta.1
friedbunny Oct 31, 2018
575f8c0
Ensure ObjC segment control has been tapped for (currently disabled) …
Nov 2, 2018
1489ec8
Maps SDK 4.6.0
friedbunny Nov 7, 2018
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
6 changes: 3 additions & 3 deletions Examples.xcodeproj/xcshareddata/xcschemes/Examples.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
</BuildableReference>
<SkippedTests>
<Test
Identifier = "ExamplesUITests/testAnimatedLineExample">
Identifier = "ExamplesUITests/testAnimatedLineExampleObjC">
</Test>
<Test
Identifier = "ExamplesUITests/testBuildingLightExample">
Identifier = "ExamplesUITests/testBuildingLightExampleObjC">
</Test>
<Test
Identifier = "ExamplesUITests/testCustomAnnotationView">
Identifier = "ExamplesUITests/testCustomAnnotationViewObjC">
</Test>
</SkippedTests>
</TestableReference>
Expand Down
2 changes: 1 addition & 1 deletion Examples/ObjectiveC/CustomCalloutView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ - (void)setCenter:(CGPoint)center {
- (BOOL)isCalloutTappable
{
if ([self.delegate respondsToSelector:@selector(calloutViewShouldHighlight:)]) {
return [self.delegate performSelector:@selector(calloutViewShouldHighlight:) withObject:self];
return (BOOL)[self.delegate performSelector:@selector(calloutViewShouldHighlight:) withObject:self];
}

return NO;
Expand Down
11 changes: 7 additions & 4 deletions ExamplesUITests/ExamplesUITests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@ - (void)tearDown {
testAnimatedLineExample
Wait for the line to be fully animated
*/
- (void)testAnimatedLineExample {

- (void)testAnimatedLineExampleObjC {
[XCTContext runActivityNamed:@"AnimatedLineExample" block:^(id<XCTActivity> _Nonnull activity) {
[self.app.navigationBars[@"Examples"].buttons[@"ObjC"] tap];
[self.app.tables.staticTexts[@"Animate a line"] tap];

// Wait for notification
Expand All @@ -55,12 +56,13 @@ - (void)testAnimatedLineExample {
testCustomAnnotationView
Zoom and rotate the map.
*/
- (void)testCustomAnnotationView {
- (void)testCustomAnnotationViewObjC {

__block XCUIElement *element;
__block XCUIElement *compass;

[XCTContext runActivityNamed:@"Wait for initial render" block:^(id<XCTActivity> _Nonnull activity) {
[self.app.navigationBars[@"Examples"].buttons[@"ObjC"] tap];
[self.app.tables.staticTexts[@"Annotation views"] tap];
XCUIElementQuery *allQuery = [self.app descendantsMatchingType:XCUIElementTypeAny];
element = [allQuery elementMatchingType:XCUIElementTypeAny identifier:@"MGLMapViewId"];
Expand Down Expand Up @@ -91,11 +93,12 @@ - (void)testCustomAnnotationView {
}];
}

- (void)testBuildingLightExample {
- (void)testBuildingLightExampleObjC {
__block XCUIElement *element;
__block XCUIElement *slider;

[XCTContext runActivityNamed:@"Wait for initial render" block:^(id<XCTActivity> _Nonnull activity) {
[self.app.navigationBars[@"Examples"].buttons[@"ObjC"] tap];
[self.app.tables.staticTexts[@"Adjust lighting of 3D buildings"] tap];
XCUIElementQuery *allQuery = [self.app descendantsMatchingType:XCUIElementTypeAny];
element = [allQuery elementMatchingType:XCUIElementTypeAny identifier:@"MGLMapViewId"];
Expand Down
26 changes: 13 additions & 13 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ GEM
atomos (0.1.3)
babosa (1.0.2)
claide (1.0.2)
cocoapods (1.6.0.beta.1)
cocoapods (1.6.0.beta.2)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.6.0.beta.1)
cocoapods-core (= 1.6.0.beta.2)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.1, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
Expand All @@ -29,14 +29,14 @@ GEM
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.2)
xcodeproj (>= 1.6.0, < 2.0)
cocoapods-core (1.6.0.beta.1)
ruby-macho (~> 1.3, >= 1.3.1)
xcodeproj (>= 1.7.0, < 2.0)
cocoapods-core (1.6.0.beta.2)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.2)
cocoapods-downloader (1.2.1)
cocoapods-downloader (1.2.2)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
Expand All @@ -49,7 +49,7 @@ GEM
colored2 (3.1.2)
commander-fastlane (4.4.6)
highline (~> 1.7.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.3)
declarative (0.0.10)
declarative-option (0.1.0)
domain_name (0.5.20180417)
Expand All @@ -66,7 +66,7 @@ GEM
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.4)
fastlane (2.105.2)
fastlane (2.108.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
Expand Down Expand Up @@ -113,10 +113,10 @@ GEM
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.9)
googleauth (0.6.6)
googleauth (0.6.7)
faraday (~> 0.12)
jwt (>= 1.4, < 3.0)
memoist (~> 0.12)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.7)
Expand Down Expand Up @@ -154,7 +154,7 @@ GEM
ruby-macho (1.3.1)
rubyzip (1.2.2)
security (0.1.3)
signet (0.10.0)
signet (0.11.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
Expand All @@ -179,7 +179,7 @@ GEM
unf_ext (0.0.7.5)
unicode-display_width (1.4.0)
word_wrap (1.0.0)
xcodeproj (1.6.0)
xcodeproj (1.7.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand Down
4 changes: 2 additions & 2 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ platform :ios, '9.0'
use_frameworks!

def shared_pods
pod 'Mapbox-iOS-SDK', '~> 4.5.0'
# pod 'Mapbox-iOS-SDK', :podspec => 'https://raw.githubusercontent.com/mapbox/mapbox-gl-native/ios-v4.5.0/platform/ios/Mapbox-iOS-SDK.podspec'
pod 'Mapbox-iOS-SDK', '~> 4.6.0'
# pod 'Mapbox-iOS-SDK', :podspec => 'https://raw.githubusercontent.com/mapbox/mapbox-gl-native/ios-v4.6.0-alpha.1/platform/ios/Mapbox-iOS-SDK.podspec'
pod 'SwiftLint', '~> 0.27'
end

Expand Down
10 changes: 5 additions & 5 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- Mapbox-iOS-SDK (4.5.0)
- Mapbox-iOS-SDK (4.6.0)
- MapboxCoreNavigation (0.23.0):
- MapboxDirections.swift (~> 0.24.0)
- MapboxMobileEvents (~> 0.6.0)
Expand All @@ -21,7 +21,7 @@ PODS:
- Turf (0.2.1)

DEPENDENCIES:
- Mapbox-iOS-SDK (~> 4.5.0)
- Mapbox-iOS-SDK (~> 4.6.0)
- MapboxNavigation (~> 0.23.0)
- SwiftLint (~> 0.27)

Expand All @@ -40,7 +40,7 @@ SPEC REPOS:
- Turf

SPEC CHECKSUMS:
Mapbox-iOS-SDK: fb9dde66106a8f10d351f9697ac198049c8e5511
Mapbox-iOS-SDK: 204c04713477cf2a88c52c5a8eed1790eb75a02a
MapboxCoreNavigation: d96109ec7d3e17000a7eaf2b4133aa33ffb9da3d
MapboxDirections.swift: 25ea07ca06a3c64c335dc8852f3c94fcabd443c8
MapboxMobileEvents: 0218869f556a7fdac9f869e2f9c10e8c6dd7eed5
Expand All @@ -52,6 +52,6 @@ SPEC CHECKSUMS:
SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
Turf: 9763a5a2d7da05dfdd5ed56aeb0414b291b0fee1

PODFILE CHECKSUM: 7710c091be957106e25f3d26bb8ae6b31dae2ee7
PODFILE CHECKSUM: a7235f149d0c9b1035f598f2965925c3ad9321c7

COCOAPODS: 1.6.0.beta.1
COCOAPODS: 1.6.0.beta.2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this mean?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When one does bundle install, it’ll install CocoaPods 1.6.0.beta.2 now, instead of beta.1.

Copy link
Contributor Author

@friedbunny friedbunny Nov 7, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Errr, I misread the file name — since this is Podfile.lock (and not Gemfile.lock), this line refers to the version of CocoaPods that was used to install these pods.