summaryrefslogtreecommitdiff
path: root/platform/ios
diff options
context:
space:
mode:
authorNadia Barbosa <nadiabarbosa@me.com>2019-05-08 10:42:11 -0700
committerNadia Barbosa <captainbarbosa@users.noreply.github.com>2019-05-08 12:55:12 -0700
commitfc218f8209fe5e8a9da0b772fb72407f11347a46 (patch)
treecc82bea7ea869c38c1171bcd8f4c2928284074b3 /platform/ios
parent89b2615779cc7bf971f6aea2c3a00c31acf080e2 (diff)
downloadqtlocation-mapboxgl-fc218f8209fe5e8a9da0b772fb72407f11347a46.tar.gz
[ios] Podspec & changelog updates for v4.12.0-alpha.2ios-v4.12.0-alpha.2
Diffstat (limited to 'platform/ios')
-rw-r--r--platform/ios/CHANGELOG.md3
-rw-r--r--platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec2
-rw-r--r--platform/ios/Mapbox-iOS-SDK-stripped.podspec2
-rw-r--r--platform/ios/Mapbox-iOS-SDK.podspec2
4 files changed, 5 insertions, 4 deletions
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
index 1940cd306f..d385f658e8 100644
--- a/platform/ios/CHANGELOG.md
+++ b/platform/ios/CHANGELOG.md
@@ -4,7 +4,8 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT
## 4.12.0
-* Fixed an issue where `-[MGLMapView setVisibleCoordinates:count:edgePadding:direction:duration:animationTimingFunction:completionHandler:]` interpreted a negative `direction` as due north instead of maintaining the current direction. ([#14575](https://github.com/mapbox/mapbox-gl-native/pull/14575))
+* Fixed an issue where `-[MGLMapView setVisibleCoordinates:count:edgePadding:direction:duration:animationTimingFunction:completionHandler:]` interpreted a negative `direction` as due north instead of maintaining the current direction. ([#14575](https://github.com/mapbox/mapbox-gl-native/pull/14575))
+* Changed placement order of `MGLSymbolStyleLayer` to match the viewport-y order when `MGLSymbolStyleLayer.symbolZOrder` is set to `MGLSymbolZOrderViewportY`, allowing icons to overlap but not text. ([#14486](https://github.com/mapbox/mapbox-gl-native/pull/14486))
## 4.11.0
diff --git a/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec b/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec
index d717731915..88857cf368 100644
--- a/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec
+++ b/platform/ios/Mapbox-iOS-SDK-snapshot-dynamic.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |m|
- version = '4.12.0-alpha.1'
+ version = '4.12.0-alpha.2'
m.name = 'Mapbox-iOS-SDK-snapshot-dynamic'
m.version = "#{version}-snapshot"
diff --git a/platform/ios/Mapbox-iOS-SDK-stripped.podspec b/platform/ios/Mapbox-iOS-SDK-stripped.podspec
index f36c9bf844..0af1d80c28 100644
--- a/platform/ios/Mapbox-iOS-SDK-stripped.podspec
+++ b/platform/ios/Mapbox-iOS-SDK-stripped.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |m|
- version = '4.12.0-alpha.1'
+ version = '4.12.0-alpha.2'
m.name = 'Mapbox-iOS-SDK-stripped'
m.version = "#{version}-stripped"
diff --git a/platform/ios/Mapbox-iOS-SDK.podspec b/platform/ios/Mapbox-iOS-SDK.podspec
index 87eadf283b..fec1fbbacc 100644
--- a/platform/ios/Mapbox-iOS-SDK.podspec
+++ b/platform/ios/Mapbox-iOS-SDK.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |m|
- version = '4.12.0-alpha.1'
+ version = '4.12.0-alpha.2'
m.name = 'Mapbox-iOS-SDK'
m.version = version