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

Downgrade min sdk to 14 #10355

Merged
merged 3 commits into from
Nov 13, 2017
Merged

Downgrade min sdk to 14 #10355

merged 3 commits into from
Nov 13, 2017

Conversation

tobrun
Copy link
Member

@tobrun tobrun commented Nov 2, 2017

Follow up of #10066 but targeted to release branch.
Still requires to override min version of the lost dependency.

@tobrun tobrun added the Android Mapbox Maps SDK for Android label Nov 2, 2017
@tobrun tobrun added this to the android-v5.2.0 milestone Nov 2, 2017
@tobrun tobrun self-assigned this Nov 2, 2017
@tobrun
Copy link
Member Author

tobrun commented Nov 2, 2017

CI is failing, we need to rebase on release branch after #10354 has been merged.

@Guardiola31337
Copy link
Contributor

@tobrun #10354 get merged 🎉

@tobrun
Copy link
Member Author

tobrun commented Nov 2, 2017

This PR is on hold until upstream dependencies have the same configuration

@tobrun tobrun added the ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold label Nov 2, 2017
@Guardiola31337 Guardiola31337 force-pushed the tvn-downgrade-min-sdk-agua branch 2 times, most recently from bd92ff3 to aba8043 Compare November 8, 2017 14:15
@Guardiola31337 Guardiola31337 force-pushed the tvn-downgrade-min-sdk-agua branch 2 times, most recently from 4a5a59a to a9527b9 Compare November 10, 2017 17:19
@Guardiola31337 Guardiola31337 removed the ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold label Nov 13, 2017
@tobrun tobrun merged commit a9bd09c into release-agua Nov 13, 2017
@tobrun tobrun deleted the tvn-downgrade-min-sdk-agua branch November 13, 2017 12:20
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.
Labels
Android Mapbox Maps SDK for Android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants