diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-04-23 17:59:17 -0400 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-04-23 17:59:17 -0400 |
| commit | c5625f988a37b6876c4ef5fc8d9de295ee28ed44 (patch) | |
| tree | 0c485cce575cee047f61fe274aad44763694dc94 | |
| parent | e08b6fe87f5824ab05a4cc67d9a76af5bb5ddd3b (diff) | |
| download | qtlocation-mapboxgl-c5625f988a37b6876c4ef5fc8d9de295ee28ed44.tar.gz | |
[ios, android] Resolve merge conflicts.
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/gradle.properties | 2 | ||||
| -rw-r--r-- | platform/ios/CHANGELOG.md | 14 |
3 files changed, 3 insertions, 15 deletions
diff --git a/circle.yml b/circle.yml index 5f06791cd6..1aacf1a2a6 100644 --- a/circle.yml +++ b/circle.yml @@ -422,7 +422,7 @@ jobs: - deploy: name: Publish to Maven command: | - if [ "${CIRCLE_BRANCH}" == "release-boba" ]; then make run-android-upload-archives ; fi + if [ "${CIRCLE_BRANCH}" == "master" ]; then make run-android-upload-archives ; fi # ------------------------------------------------------------------------------ diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties index bdfc444454..84aeabef1a 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle.properties +++ b/platform/android/MapboxGLAndroidSDK/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.mapbox.mapboxsdk -VERSION_NAME=6.1.0-SNAPSHOT +VERSION_NAME=7.0.0-SNAPSHOT POM_DESCRIPTION=Mapbox GL Android SDK POM_URL=https://github.com/mapbox/mapbox-gl-native diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index 9d8390803b..1775d628f6 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -2,7 +2,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started. -## 4.0.1 +## master ### Style layers @@ -88,18 +88,6 @@ The 4.0._x_ series of releases will be the last to support iOS 8. The minimum iO * Fixed an issue where requesting location services permission would trigger an unrecoverable loop. ([#11229](https://github.com/mapbox/mapbox-gl-native/pull/11229)) -## 3.7.6 - March 12, 2018 - -* Fixed an issue where full-resolution tiles could fail to replace lower-resolution placeholders. ([#11227](https://github.com/mapbox/mapbox-gl-native/pull/11227)) -* Fixed an issue where tilesets with bounds that cover the entire world would fail to render. ([#11425](https://github.com/mapbox/mapbox-gl-native/pull/11425)) -* Fixed a memory leak in `MGLMapSnapshotter`. ([#11193](https://github.com/mapbox/mapbox-gl-native/pull/11193)) -* Fixed an issue where the pinch gesture could drift beyond bounds imposed by `-[MGLMapViewDelegate mapView:shouldChangeFromCamera:toCamera:]`. ([#11423](https://github.com/mapbox/mapbox-gl-native/pull/11423)) -* Improved the visibility of the heading indicator arrow. ([#11337](https://github.com/mapbox/mapbox-gl-native/pull/11337)) - -## 3.7.5 - February 16, 2018 - -* Fixed an issue where requesting location services permission would trigger an unrecoverable loop. ([#11229](https://github.com/mapbox/mapbox-gl-native/pull/11229)) - ## 3.7.4 - February 12, 2018 * Added the `MGLTileSourceOptionTileCoordinateBounds` option to create an `MGLTileSource` that only supplies tiles within a specific geographic bounding box. ([#11141](https://github.com/mapbox/mapbox-gl-native/pull/11141)) |