Commit Graph

35 Commits

Author SHA1 Message Date
Fabian Guerra
187b6dc31c Merge branch 'release-agua' into master
# Conflicts:
#	circle.yml
#	cmake/core-files.cmake
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
#	platform/darwin/src/MGLMapSnapshotter.mm
#	platform/darwin/src/MGLRendererConfiguration.h
#	platform/ios/CHANGELOG.md
#	platform/ios/DEVELOPING.md
#	platform/ios/INSTALL.md
#	platform/ios/README.md
#	platform/ios/resources/bg.lproj/Localizable.strings
#	platform/ios/resources/es.lproj/Localizable.strings
#	platform/ios/resources/vi.lproj/Localizable.strings
#	platform/ios/src/MGLMapView.mm
#	platform/macos/macos.xcodeproj/project.pbxproj
#	src/mbgl/text/glyph_manager.cpp
2018-01-04 12:55:19 -06:00
Tobrun
639c033d8e [android] - update project to gradle 4.1, gradle tools 3.0, build tools 26.0.2 2017-12-19 13:39:38 +01:00
Tobrun
0fddad6e0b [all] update CI images (#10695) 2017-12-15 14:50:12 +01:00
Tobrun
86fdb2682d [android] - build boba snapshots from master 2017-12-06 17:38:32 +01:00
Tobrun
7c8fbc8232 [android] - bump okhttp, remove workaround for Android Oreo (#10515) 2017-11-23 08:49:01 +01:00
Tobrun
f0f113bafc MapSnapshot attribution (#10362)
* [android] - add attribution

* [android] - optimise attribution sources

* [android] - rework datamodel to attribution class

* [android] - refactor Attribution, add tests

* [android] - add getter for attribution string

* [android] - rework attribution to include small logo, add layout placement

* [android] - finalise integration and layout logic
2017-11-14 11:13:34 +01:00
Tobrun
a9bd09c015 Downgrade min sdk to 14 (#10355)
* [android] - downgrade minimum sdk version to 14

* [android] bump MAS version to the one which includes min sdk version 14

* bump lost version to 3.0.4
2017-11-13 13:20:41 +01:00
Pablo Guardiola
cdc5dde0ec [android] revert adding mapbox-android-core dependency (#10354) (#10380) 2017-11-03 15:39:53 -07:00
Pablo Guardiola
29a94ae939 [android] make location provider optional (#9488) (#10354) 2017-11-01 18:25:52 -07:00
Antonio Zugaldia
bd06e2f6fa [android] - lower amount of external dependencies (#10268) 2017-10-26 12:57:46 -04:00
Tobrun Van Nuland
fe6e0c360e [android] - removed unused gradle plugins 2017-10-18 11:02:04 +02:00
Tobrun Van Nuland
03d321a6c4 [android] - bump external dependencies 2017-09-14 07:44:13 +02:00
Pablo Guardiola
73d980a6e7 bump MAS version number to 2.2.3 (#9901) 2017-08-31 18:27:12 +02:00
Pablo Guardiola
927774886e bump MAS version number to 2.2.2 (#9856) 2017-08-29 21:05:29 +02:00
Cameron Mace
e204f6cd79 bumped MAS version number 2017-08-18 07:34:25 +02:00
Tobrun
0ee5d9af79 [android] - bump MAS dependency (#9671) 2017-08-01 21:31:35 +02:00
Tobrun Van Nuland
39face8e10 [android] - remove wear module from project 2017-07-27 14:01:24 +02:00
Tobrun
aca2e7984f [android] - bump OkHttp dependency to avoid null pointer exceptions on Android 7.0 (#9522) 2017-07-18 15:34:36 +02:00
Tobrun
b9a4addac6 [android] - bump Mapbox Android Services to latest for 5.1.0 final release (#9402) 2017-06-30 16:47:31 +02:00
Tobrun
95735c06f6 Downgrade location provider dependency (#9394)
* [android] - downgrade LOST to Mapbox SDK 5.0.2 version.

* bump LOST back to Mapbox Android SDK version 4.x
2017-06-30 11:21:39 +02:00
Antonio Zugaldia
584bfb7733 [android] update mapboxServicesVersion to 2.1.2 (#9311) 2017-06-20 16:21:31 -04:00
Antonio Zugaldia
899d2b0de9 [android] Update to LOST 3.0.1 (#9302) 2017-06-20 08:59:15 -04:00
Tobrun
9f88e37366 Custom location source fix (#9142)
*  [android] - custom location engine fixes (#9139)

* Update to latest LOST dependency, fixup internal location source integration
2017-06-09 10:00:00 +02:00
Pablo Guardiola
82a3a7e746 [android] Update Lost to final version 3.0.0 (#9112)
* update lost to final version 3.0.0

* bump MAS version to 2.1.1
2017-05-26 20:00:40 +02:00
Tobrun
eb83c72509 [android] - bump tools and support lib version due to SNAPSHOT dependencies (#9046)
* [android] - bump tools and support lib version for SNAPSHOT dependencies

* revert unsupported Circle CI build tools version
2017-05-19 09:14:54 +02:00
Tobrun
cb737362b6 [android] - update proguard config, allow debug mimification, update OkHttp to latest version (#8944) 2017-05-12 15:27:27 +02:00
Tobrun
e681f69993 [android] - update LOST to 2.3.0 (#8872) 2017-05-12 15:16:13 +02:00
Tobrun
b622aed349 [android] - bump android support library, fixup SDK gradle dependencies to use the ones defined in root project. (#8921) 2017-05-08 17:30:15 +02:00
Cameron Mace
9c1150cfe9 bumped MAS version (#8763) 2017-04-18 18:23:29 -07:00
Antonio Zugaldia
f9cc044357 [android] Update LOST to latest version 2017-04-06 13:41:53 -04:00
Antonio Zugaldia
a96c6ee82e [android] Update dependencies to MAS v2.0.0 final 2017-03-17 11:18:26 -04:00
Antonio Zugaldia
db3ffb9a2a [android] bump versions to beta.3 2017-03-09 15:44:07 -08:00
Tobrun
a5f6ee6963 [android] - update gradle and plugin for Android Studio 2.3 stable, update support library to latest version, add dexOptions to increase build times. (#8271) 2017-03-03 17:36:40 -05:00
Antonio Zugaldia
3ba3f31416 Update to MAS 2.0.0-beta.2 and handle dependencies consistently (#8169)
* [android] update to mas 2.0-beta2 and handle dependencies consistenly

* extract remaining dependencies and bump stable versions
2017-02-23 09:12:56 -05:00
Tobrun
0c0d7ceaeb [android] - use project wide configurations for all modules + fixup wear compile error (#8066) 2017-02-15 19:56:31 +01:00