diff options
| author | Brad Leege <bleege@gmail.com> | 2016-07-19 16:32:45 -0500 |
|---|---|---|
| committer | Brad Leege <bleege@gmail.com> | 2016-07-19 16:32:45 -0500 |
| commit | 1972d932d5a69f3a9cdf1e76d87d482bdc256373 (patch) | |
| tree | e6276571e4c5b9ed69d15b9d8035178536a68196 | |
| parent | a53dfcd675049943443def6b65cc8b654faa7a90 (diff) | |
| parent | 5ef2cbf9422feda02a79bdefea88fb13d7830f79 (diff) | |
| download | qtlocation-mapboxgl-1972d932d5a69f3a9cdf1e76d87d482bdc256373.tar.gz | |
Merge branch 'release-android-v4.1.1'
# Conflicts:
# platform/android/MapboxGLAndroidSDK/gradle.properties
# test/util/mapbox.cpp
| -rw-r--r-- | platform/android/CHANGELOG.md | 6 | ||||
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties | 2 | ||||
| -rw-r--r-- | test/util/mapbox.cpp | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index 39acfe1593..185956cb94 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -2,6 +2,12 @@ Mapbox welcomes participation and contributions from everyone. If you'd like to do so please see the [`Contributing Guide`](https://github.com/mapbox/mapbox-gl-native/blob/master/CONTRIBUTING.md) first to get started. +## 4.1.1 + +Mapbox Android 4.1.1 is a patch release and is recommended to upgrade to it as soon as possible. + +* Default Styles Caching Crash ([#5722](https://github.com/mapbox/mapbox-gl-native/issues/5722)) + ## 4.1.0 Mapbox Android 4.1.0 builds off our ambitious 4.0.0 version with 3 major new features being released. diff --git a/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties b/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties index 73a37c7c6f..63cccc00ef 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties +++ b/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties @@ -1,3 +1,3 @@ fabric-identifier=com.mapbox.mapboxsdk.mapbox-android-sdk -fabric-version=4.1.0 +fabric-version=4.1.1 fabric-build-type=binary diff --git a/test/util/mapbox.cpp b/test/util/mapbox.cpp index 35c478287c..9341b695f3 100644 --- a/test/util/mapbox.cpp +++ b/test/util/mapbox.cpp @@ -7,7 +7,6 @@ using namespace mbgl; - TEST(Mapbox, SourceURL) { EXPECT_EQ( "https://api.mapbox.com/v4/user.map.json?access_token=key&secure", |