This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
[android] Release 5.2.0-beta.4 #10384
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Guardiola31337
force-pushed
the
release-android-v5.2.0-beta.4
branch
from
55c6ed0
to
d30778e
Compare
zugaldia
approved these changes
Nov 4, 2017
mappy-mobile
pushed a commit
to Mappy/mapbox-gl-native
that referenced
this pull request
Nov 29, 2017
* release-android-v5.2.0: (788 commits) release android v5.2.0 release v5.2.0-beta.5 (mapbox#10464) [ios] Update puck arrow stroke color when tint changes Monkey crashes (mapbox#10440) (mapbox#10472) Deploy macosapp as part of releases (mapbox#10191) [ios] Update podspecs to v3.7.0-rc.1 [ios] Updated Spanish, Vietnamese translations [ios] Fix toCamera.centerCoordinate in shouldChangeFromCamera (mapbox#10433) MapSnapshot attribution (mapbox#10362) Downgrade min sdk to 14 (mapbox#10355) Update MGLMapSnapshotter docs (mapbox#10438) [android] - harden deselection mechanism for markers (mapbox#10403) [android] Cherry picks to agua (mapbox#10442) [ios] Silence smart invert warnings (mapbox#10425) [ios] Doc fixes for "Adding Points to a Map" guide [ios, macos] Cleanup duplicated snapshotter frame code. [android] release 5.2.0-beta.4 (mapbox#10384) [android] - add config file for excluding generated tests, refactor generation script output [ios] Bump podspec to beta.4 [ios, macos] Add attribution to snapshots. ... # Conflicts: # .gitignore # cmake/core-files.cmake # include/mbgl/annotation/annotation.hpp # platform/android/CHANGELOG.md # platform/android/MapboxGLAndroidSDK/build.gradle # platform/android/MapboxGLAndroidSDK/gradle.properties # platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java # platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java # platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java # platform/android/build.gradle # platform/android/config.cmake # platform/android/dependencies.gradle # platform/android/settings.gradle # platform/android/src/map/camera_position.cpp # platform/android/src/native_map_view.cpp # platform/android/src/native_map_view.hpp # src/mbgl/algorithm/generate_clip_ids_impl.hpp # src/mbgl/annotation/line_annotation_impl.cpp # src/mbgl/renderer/layers/render_line_layer.hpp # src/mbgl/renderer/painter.cpp # src/mbgl/renderer/painter_line.cpp # src/mbgl/renderer/render_item.hpp # src/mbgl/renderer/render_line_layer.cpp # src/mbgl/sprite/sprite_atlas.cpp # src/mbgl/sprite/sprite_atlas.hpp # src/mbgl/sprite/sprite_parser.cpp # src/mbgl/sprite/sprite_parser.hpp # src/mbgl/storage/resource.cpp # src/mbgl/style/layers/line_layer.cpp # src/mbgl/style/layers/line_layer_impl.hpp # src/mbgl/style/style.cpp # src/mbgl/style/style.hpp # src/mbgl/tile/tile_loader_impl.hpp # test/algorithm/generate_clip_ids.test.cpp # test/sprite/sprite_atlas.test.cpp # test/storage/resource.test.cpp
mappy-mobile
pushed a commit
to Mappy/mapbox-gl-native
that referenced
this pull request
Dec 12, 2017
* mapbox_release_5.2: (788 commits) release android v5.2.0 release v5.2.0-beta.5 (mapbox#10464) [ios] Update puck arrow stroke color when tint changes Monkey crashes (mapbox#10440) (mapbox#10472) Deploy macosapp as part of releases (mapbox#10191) [ios] Update podspecs to v3.7.0-rc.1 [ios] Updated Spanish, Vietnamese translations [ios] Fix toCamera.centerCoordinate in shouldChangeFromCamera (mapbox#10433) MapSnapshot attribution (mapbox#10362) Downgrade min sdk to 14 (mapbox#10355) Update MGLMapSnapshotter docs (mapbox#10438) [android] - harden deselection mechanism for markers (mapbox#10403) [android] Cherry picks to agua (mapbox#10442) [ios] Silence smart invert warnings (mapbox#10425) [ios] Doc fixes for "Adding Points to a Map" guide [ios, macos] Cleanup duplicated snapshotter frame code. [android] release 5.2.0-beta.4 (mapbox#10384) [android] - add config file for excluding generated tests, refactor generation script output [ios] Bump podspec to beta.4 [ios, macos] Add attribution to snapshots. ... # Conflicts: # .gitignore # .gitmodules # cmake/core-files.cmake # include/mbgl/annotation/annotation.hpp # platform/android/CHANGELOG.md # platform/android/MapboxGLAndroidSDK/build.gradle # platform/android/MapboxGLAndroidSDK/gradle.properties # platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java # platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java # platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java # platform/android/build.gradle # platform/android/config.cmake # platform/android/dependencies.gradle # platform/android/settings.gradle # platform/android/src/map/camera_position.cpp # platform/android/src/native_map_view.cpp # platform/android/src/native_map_view.hpp # src/mbgl/algorithm/generate_clip_ids_impl.hpp # src/mbgl/annotation/line_annotation_impl.cpp # src/mbgl/renderer/layers/render_line_layer.hpp # src/mbgl/renderer/painter.cpp # src/mbgl/renderer/painter_line.cpp # src/mbgl/renderer/render_item.hpp # src/mbgl/renderer/render_line_layer.cpp # src/mbgl/sprite/sprite_atlas.cpp # src/mbgl/sprite/sprite_atlas.hpp # src/mbgl/sprite/sprite_parser.cpp # src/mbgl/sprite/sprite_parser.hpp # src/mbgl/storage/resource.cpp # src/mbgl/style/layers/line_layer.cpp # src/mbgl/style/layers/line_layer_impl.hpp # src/mbgl/style/style.cpp # src/mbgl/style/style.hpp # src/mbgl/tile/tile_loader_impl.hpp # test/algorithm/generate_clip_ids.test.cpp # test/sprite/sprite_atlas.test.cpp # test/storage/resource.test.cpp
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@zugaldia @tobrun @lilykaiser