Merge release-ios-v3.6.0-android-v5.1.0 #9416

tobrun · 2017-07-04T18:45:26Z

Last week both the final releases of iOS v3.6.0 and Android v5.1.0 happened.
This PR merges the release branch back to master.

Tested:

macOS app
iOS app
Darwin tests
Android app, tests, checkstyle
Core tests

Conflicts:

Core files, always master
iOS/macOS files, always release branch except for Style as public API
Android mix

cc @mapbox/ios @mapbox/android

* update release script to trigger builds on circleci now * update release script to trigger builds on circleci now

…llable, fixup log messages (#8919)

…OkHttp to latest version (#8944)

Upgraded from v9 default styles to v10 wherever the developer expects to get the latest and greatest, as well as in a couple tests where it may be beneficial to ensure that we can handle a two-digit version number in the style URL. Cherry-picked from ed54849.

MGLStyleDefaultVersion is just for Streets now. Deleted style version documentation tests because not all styles are on the same version. Cherry-picked from ca97dd8.

Undeprecated the unversioned style URL factory methods in MGLStyle for consistency with the Android and Qt SDKs. Added warnings about using them with the runtime styling API. Refactored mbgl::util::default_styles to track different versions for different styles. Cherry-picked from 9e384b7.

The Styles API section of the Mapbox API Documentation site now lists Traffic Day v2 and Traffic Night v2, so this change adds those styles to all the places where styles are listed. Also switched iosapp and macosapp to unversioned style factory methods since MGLStyleDefaultVersion is no longer applicable for all styles. Cherry-picked from 4d6f545.

* [android] url getter on sources * [android] fix ui test filter in makefile * [android] - build SNAPSHOT from release branch (#8958) * [android] - update changelog for 5.1.0-beta.2 * [android] - bump version number * [android] - Camera change listener v2.0 * [core] allow filesource url transform reset * [android] Update attribution wordmark (#8774) * Update wordmark on android * Moved attribution i icon to the right of mapbox word (in mapview preview image) * update padding and margin * [android] update hardcoded branch name * revert version to 5.1.0-SNAPSHOT

… integration (#8996)

Factored out redundant tile URL template documentation from the MGLRasterSource and MGLVectorSource documentation into a jazzy guide. This documentation used to live in one place, on a method on MGLTileSource, but that method had to be moved to MGLTileSource’s concrete subclasses. A jazzy guide is easier to link to, in any case.

Fixes #8980.

…encies (#9046) * [android] - bump tools and support lib version for SNAPSHOT dependencies * revert unsupported Circle CI build tools version

…ction

…from annotation manager. (#9047)

* [ios] observe layout guides * [ios] update changelog

…9029)

…ved (#9025) The annotation container view keeps an array of annotation views that is separate from the array of subviews that is a property of the UIView parent class. This removes an annotation view from that container view array when the associated annotation is removed. This avoids issue related to previously removed annotation views continuing to be involved in map view logic around annotation view selection due to taps.

…mpTo, easeTo and animateTo. (#9050)

(#8842) Cherry-picked from a3e4e67.

Cherry-picked from 25c1990.

Cherry-picked from db7bb50.

1ec5 · 2017-07-05T05:39:52Z

platform/darwin/src/MGLStyle.h

 */
-@property (nonatomic) NS_ARRAY_OF(NSString *) *styleClasses __attribute__((deprecated("This property is non-functional.")));


Anything related to style classes should prefer master, due to #8953.

I will keep the version from master so this PR will not show any changes on that file.

1ec5 · 2017-07-05T05:40:59Z

platform/darwin/src/MGLSource.h

@@ -16,10 +16,10 @@ NS_ASSUME_NONNULL_BEGIN
 add and remove sources dynamically using methods such as
 `-[MGLStyle addSource:]` and `-[MGLStyle sourceWithIdentifier:]`.

- Do not create instances of this class directly, and do not create your own
- subclasses of this class. Instead, create instances of `MGLShapeSource`, 
- `MGLImageSource` and the concrete subclasses of `MGLTileSource`,


MGLImageSource was introduced in master in #9110. The release branch should be preferred, but MGLImageSource should still be mentioned in the resulting comment.

Will keep the release branch comment and add MGLImageSource after MGLShapeSource

# Conflicts: # .travis.yml # circle.yml # cmake/core-files.cmake # include/mbgl/style/function/composite_function.hpp # platform/android/CHANGELOG.md # platform/android/MapboxGLAndroidSDK/build.gradle # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyBearingTracking.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyLocationTracking.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java # platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java # platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs # platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java # platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java # platform/android/dependencies.gradle # platform/android/src/native_map_view.cpp # platform/darwin/scripts/generate-style-code.js # platform/darwin/src/MGLGeometry_Private.h # platform/darwin/src/MGLLight.h # platform/darwin/src/MGLLight.mm # platform/darwin/src/MGLSource.h # platform/darwin/src/MGLStyle.h # platform/darwin/src/MGLStyle.mm # platform/darwin/test/MGLLightTest.mm # platform/default/default_file_source.cpp # platform/ios/CHANGELOG.md # platform/ios/Mapbox-iOS-SDK-symbols.podspec # platform/ios/Mapbox-iOS-SDK.podspec # platform/ios/resources/Images.xcassets/default_marker.imageset/default_marker.pdf # platform/macos/CHANGELOG.md # scripts/generate-shaders.js # src/mbgl/layout/symbol_layout.cpp # src/mbgl/programs/program.hpp # src/mbgl/programs/symbol_program.hpp # src/mbgl/programs/uniforms.hpp # src/mbgl/renderer/frame_history.cpp # src/mbgl/renderer/paint_property_binder.hpp # src/mbgl/shaders/line.cpp # src/mbgl/shaders/line_pattern.cpp # src/mbgl/shaders/line_sdf.cpp # src/mbgl/sprite/sprite_atlas.hpp # src/mbgl/style/layers/line_layer_properties.hpp # src/mbgl/style/sources/geojson_source.cpp # src/mbgl/style/style.cpp # src/mbgl/text/glyph_atlas.hpp # src/mbgl/tile/geometry_tile.cpp # src/mbgl/tile/geometry_tile.hpp # test/style/style.test.cpp

Guardiola31337 · 2017-07-05T15:42:47Z

@tobrun eb7926d recently landed in release-ios-v3.6.0-android-v5.1.0 branch.
Do you mind including it here?

jfirebaugh · 2017-07-05T15:53:01Z

I'm not seeing the changes from 34453eb in the diff. Are they included?

tobrun · 2017-07-05T16:39:22Z

@jfirebaugh I wrongly assumed that the master version was correct, do you want me redo the merge? or fix up separately?

jfirebaugh · 2017-07-05T18:11:32Z

Redo or cherry pick on top of the merge commit -- either way is fine as long as the change makes it into master.

vector::erase invalidates iterators. It's not safe for erase_if to cache the end iterator nor increment, then erase.

tobrun · 2017-07-05T18:17:11Z

Both the cherry-picks on request from @jfirebaugh as @Guardiola31337 have happened.

1ec5 · 2017-07-05T18:55:05Z

platform/darwin/src/MGLCircleStyleLayer.h

@@ -64,16 +64,6 @@ typedef NS_ENUM(NSUInteger, MGLCircleTranslationAnchor) {
 ### Example

 ```swift
- let layer = MGLCircleStyleLayer(identifier: "circles", source: population)


Any idea why this code went missing? It’s present on both master and the release branch. Same for all the other style layer headers.

great catch, not sure tbh, thank you for thorough 👀

Thanks for fixing this. In the future, consider running make style-code afterwards, as a diagnostic tool, to see if it would add anything that isn’t already in the code base.

1ec5 · 2017-07-05T18:57:39Z

platform/macos/CHANGELOG.md

 * The previously-deprecated support for style classes has been removed. For interface compatibility, the API methods remain, but they are now non-functional.
 * Added an `overlays` property to `MGLMapView`. ([#8617](https://github.com/mapbox/mapbox-gl-native/pull/8617))

 ## 0.5.0

-### Styles


This header should be present under the “Packaging” header.

Header was added

tobrun · 2017-07-05T20:42:57Z

All issues have been addressed, thanks all for 👀 'ing, going to merge.

1ec5 · 2017-07-06T00:34:49Z

This PR should not have been squashed. Rather, it should’ve been merged with a real merge commit (i.e., from the command line), in order to preserve blame for the long-lived release branch, which included many commits that weren’t in master to begin with.

1ec5 · 2017-07-06T01:07:52Z

Remerged in 74bcca3.

tobrun · 2017-07-06T05:17:17Z

apologies @1ec5, thank you for fixing this up.

zugaldia and others added 30 commits May 11, 2017 09:19

[android] Update release script to support CircleCI builds (#8950)

08916f2

* update release script to trigger builds on circleci now * update release script to trigger builds on circleci now

[core] When a layer is added, reload its source's tiles

db370a0

[android] - keep observer when timeout occurs, make observer param nu…

ad46d67

…llable, fixup log messages (#8919)

[android] - avoid crashing when deleting already deleted region (#8920)

850b008

[android] - update LOST to 2.3.0 (#8872)

e681f69

[android] - update proguard config, allow debug mimification, update …

cb73736

…OkHttp to latest version (#8944)

[ios, macos] Updated documented default style version

d85471b

MGLStyleDefaultVersion is just for Streets now. Deleted style version documentation tests because not all styles are on the same version. Cherry-picked from ca97dd8.

[android] - MarkerView deselect events with OnMarkerViewClickListener…

5944216

… integration (#8996)

[android] - publish SNAPSHOT from release 5.1.0 branch (#8995)

627455c

[ios, macos] edited identity interpolation mode documentation (#8657)

c7acb55

[ios] Telemetry button in modal view controllers (#9027)

4f90d7a

Fixes #8980.

[android] - bump tools and support lib version due to SNAPSHOT depend…

eb83c72

…encies (#9046) * [android] - bump tools and support lib version for SNAPSHOT dependencies * revert unsupported Circle CI build tools version

[core] Make destructor virtual to avoid object splicing during destru…

f0b0167

…ction

[core] add error for non-virtual destructor deletes + add virtual dtors

b52e171

[android] - remove marker from selected markers when removing marker …

f4f587f

…from annotation manager. (#9047)

Observe layout guides (#7716)

3b109c8

* [ios] observe layout guides * [ios] update changelog

[ios, macos] Change == to = in style function initializers

7612e23

[ios] Add annotation view initializer with annotation and reuse id (#…

554b1cf

…9029)

[android] - correct bearing conversion when animating the map with ju…

4d8625b

…mpTo, easeTo and animateTo. (#9050)

[ios, macos] Updated maximumZoomLevel description, cherry-picked #8818

13dee80

(#8842) Cherry-picked from a3e4e67.

[ios] Updated podspecs and changelog for v3.5.3 (#8870)

ade7b0e

Cherry-picked from 25c1990.

[ios] Update podspecs and changelog for iOS v3.5.4

9ae7371

Cherry-picked from db7bb50.

[ios, macos] Updated changelogs

e630e8c

[ios, macos] changed TRUE -> 'true' (#9059) fixes #9056

a19fd81

1ec5 reviewed Jul 5, 2017

View reviewed changes

tobrun force-pushed the tvn-merge-release branch from fe87c12 to 14c221f Compare July 5, 2017 06:38

kkaefer added Core The cross-platform C++ core, aka mbgl Infrastructure and removed Core The cross-platform C++ core, aka mbgl labels Jul 5, 2017

Guardiola31337 approved these changes Jul 5, 2017

View reviewed changes

fabian-guerra approved these changes Jul 5, 2017

View reviewed changes

jfirebaugh and others added 2 commits July 5, 2017 20:15

[core] Fix iterator invalidation in erase_if

87081b8

vector::erase invalidates iterators. It's not safe for erase_if to cache the end iterator nor increment, then erase.

[android] - invible marker views performance fix #9419 (#9420)

9ab04a2

1ec5 suggested changes Jul 5, 2017

View reviewed changes

tobrun added 2 commits July 5, 2017 21:15

[darwin] - re-add swift documentation

79d849d

[macos] - add Styles header to CHANGELOG.md

6ca8cd7

1ec5 approved these changes Jul 5, 2017

View reviewed changes

tobrun merged commit 20a5ef6 into master Jul 5, 2017

tobrun deleted the tvn-merge-release branch July 5, 2017 21:06

1ec5 restored the tvn-merge-release branch July 6, 2017 00:34

1ec5 deleted the tvn-merge-release branch July 6, 2017 01:07

1ec5 added build and removed Infrastructure labels Jul 14, 2017

1ec5 mentioned this pull request Oct 13, 2017

Merge release-ios-v3.6.0-android-v5.1.0 to master #9170

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge release-ios-v3.6.0-android-v5.1.0 #9416

Merge release-ios-v3.6.0-android-v5.1.0 #9416

tobrun commented Jul 4, 2017 •

edited

Loading

1ec5 Jul 5, 2017

tobrun Jul 5, 2017

1ec5 Jul 5, 2017 •

edited

Loading

tobrun Jul 5, 2017

Guardiola31337 commented Jul 5, 2017

jfirebaugh commented Jul 5, 2017

tobrun commented Jul 5, 2017

jfirebaugh commented Jul 5, 2017

tobrun commented Jul 5, 2017

1ec5 Jul 5, 2017 •

edited

Loading

tobrun Jul 5, 2017

1ec5 Jul 5, 2017 •

edited

Loading

1ec5 Jul 5, 2017

tobrun Jul 5, 2017

tobrun commented Jul 5, 2017 •

edited

Loading

1ec5 commented Jul 6, 2017 •

edited

Loading

1ec5 commented Jul 6, 2017

tobrun commented Jul 6, 2017

		*/
		@property (nonatomic) NS_ARRAY_OF(NSString ) styleClasses __attribute__((deprecated("This property is non-functional.")));

Merge release-ios-v3.6.0-android-v5.1.0 #9416

Merge release-ios-v3.6.0-android-v5.1.0 #9416

Conversation

tobrun commented Jul 4, 2017 • edited Loading

1ec5 Jul 5, 2017

Choose a reason for hiding this comment

tobrun Jul 5, 2017

Choose a reason for hiding this comment

1ec5 Jul 5, 2017 • edited Loading

Choose a reason for hiding this comment

tobrun Jul 5, 2017

Choose a reason for hiding this comment

Guardiola31337 commented Jul 5, 2017

jfirebaugh commented Jul 5, 2017

tobrun commented Jul 5, 2017

jfirebaugh commented Jul 5, 2017

tobrun commented Jul 5, 2017

1ec5 Jul 5, 2017 • edited Loading

Choose a reason for hiding this comment

tobrun Jul 5, 2017

Choose a reason for hiding this comment

1ec5 Jul 5, 2017 • edited Loading

Choose a reason for hiding this comment

1ec5 Jul 5, 2017

Choose a reason for hiding this comment

tobrun Jul 5, 2017

Choose a reason for hiding this comment

tobrun commented Jul 5, 2017 • edited Loading

1ec5 commented Jul 6, 2017 • edited Loading

1ec5 commented Jul 6, 2017

tobrun commented Jul 6, 2017

tobrun commented Jul 4, 2017 •

edited

Loading

1ec5 Jul 5, 2017 •

edited

Loading

1ec5 Jul 5, 2017 •

edited

Loading

1ec5 Jul 5, 2017 •

edited

Loading

tobrun commented Jul 5, 2017 •

edited

Loading

1ec5 commented Jul 6, 2017 •

edited

Loading