Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

move to Xcode 6.4 #1868

Merged
merged 2 commits into from
Jul 9, 2015
Merged

move to Xcode 6.4 #1868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b70e6f5
test on Xcode 6.4 / iOS 8.4
incanus Jul 9, 2015
00f9a47
abbreviate syntax for unused parameters
incanus Jul 9, 2015
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ matrix:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
- os: osx
osx_image: beta-xcode6.3
osx_image: beta-xcode6.4
Copy link
Contributor

Choose a reason for hiding this comment

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

This wasn’t quite right. See 5f7575d for the fix.

env: FLAVOR=osx BUILDTYPE=Debug
- os: osx
osx_image: beta-xcode6.3
osx_image: beta-xcode6.4
env: FLAVOR=ios BUILDTYPE=Release
- os: linux
env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Release
Expand Down
5 changes: 1 addition & 4 deletions platform/ios/MGLMapboxEvents.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,10 +604,7 @@ - (void) postEvents:(NS_ARRAY_OF(MGLMapboxEventAttributes *) *)events {
[request setHTTPBody:jsonData];

// Send non blocking HTTP Request to server
NSURLSessionDataTask *task = [_session dataTaskWithRequest:request completionHandler:^(__unused NSData * __nullable data, __unused NSURLResponse * __nullable response, __unused NSError * __nullable error)
{
}];
[task resume];
[[_session dataTaskWithRequest:request] resume];
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/ios/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ set -u
xctool \
-project ./test/ios/ios-tests.xcodeproj \
-scheme 'Mapbox GL Tests' \
-sdk iphonesimulator8.3 \
-sdk iphonesimulator8.4 \
test