Merge branch 'release-agua' into master

# Conflicts:
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/ios/CHANGELOG.md
#	platform/ios/ios.xcodeproj/project.pbxproj
#	platform/macos/CHANGELOG.md

5 files changed, 67 insertions, 36 deletions

diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md
index 1d4f0cbc57..fffaf66300 100644
--- a/platform/macos/CHANGELOG.md
+++ b/platform/macos/CHANGELOG.md
@@ -15,7 +15,16 @@
 
 * Fixed a memory leak that occurred when creating a map snapshot. ([#10585](https://github.com/mapbox/mapbox-gl-native/pull/10585))
 
-## v0.6.0
+## v0.6.1 - January 16, 2018
+
+This version of the Mapbox macOS SDK corresponds to version 3.7.3 of the Mapbox Maps SDK for iOS.
+
+* Fixed a crash while zooming while annotations are present on the map. ([#10791](https://github.com/mapbox/mapbox-gl-native/pull/10791))
+* CJK characters can be displayed in a locally installed font or a custom font bundled with the application, reducing map download times. Specify the font name using the `MGLIdeographicFontFamilyName` key in the application’s Info.plist file. ([#10522](https://github.com/mapbox/mapbox-gl-native/pull/10522))
+
+## v0.6.0 - December 23, 2017
+
+This version of the Mapbox macOS SDK corresponds to version 3.7.2 of the Mapbox Maps SDK for iOS.
 
 ### Packaging
 
@@ -60,7 +69,7 @@
 * Added documentation for usage of coordinate bounds that cross the anti-meridian. ([#10783](https://github.com/mapbox/mapbox-gl-native/pull/10783))
 * Removed duplicated variables in `MGLMapSnapshotter`. ([#10702](https://github.com/mapbox/mapbox-gl-native/pull/10702))
 
-## 0.5.1
+## 0.5.1 - September 26, 2017
 
 This version of the Mapbox macOS SDK corresponds to version 3.6.4 of the Mapbox iOS SDK.
 
@@ -71,7 +80,7 @@ This version of the Mapbox macOS SDK corresponds to version 3.6.4 of the Mapbox
 * Deprecated `+[MGLStyle trafficDayStyleURL]` and `+[MGLStyle trafficNightStyleURL]` with no replacement method. To use the Traffic Day and Traffic Night styles going forward, we recommend that you use the underlying URL. ([#9918](https://github.com/mapbox/mapbox-gl-native/pull/9918))
 * Fixed an issue where stale (but still valid) map data could be ignored in offline mode. ([#10012](https://github.com/mapbox/mapbox-gl-native/pull/10012))
 
-## 0.5.0
+## 0.5.0 - June 30, 2017
 
 This version of the Mapbox macOS SDK corresponds to version 3.6.0 of the Mapbox iOS SDK.
 
diff --git a/platform/macos/Mapbox-macOS-SDK-symbols.podspec b/platform/macos/Mapbox-macOS-SDK-symbols.podspec
index ba09fce19c..f8b5397a77 100644
--- a/platform/macos/Mapbox-macOS-SDK-symbols.podspec
+++ b/platform/macos/Mapbox-macOS-SDK-symbols.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |m|
 
-  version = '0.6.0'
+  version = '0.6.1'
 
   m.name    = 'Mapbox-macOS-SDK-symbols'
   m.version = "#{version}-symbols"
diff --git a/platform/macos/Mapbox-macOS-SDK.podspec b/platform/macos/Mapbox-macOS-SDK.podspec
index 6a0e7bbf28..6412190065 100644
--- a/platform/macos/Mapbox-macOS-SDK.podspec
+++ b/platform/macos/Mapbox-macOS-SDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |m|
 
-  version = '0.6.0'
+  version = '0.6.1'
 
   m.name    = 'Mapbox-macOS-SDK'
   m.version = version
diff --git a/platform/macos/scripts/deploy-packages.sh b/platform/macos/scripts/deploy-packages.sh
index 90c3c29308..0d053aef4b 100755
--- a/platform/macos/scripts/deploy-packages.sh
+++ b/platform/macos/scripts/deploy-packages.sh
@@ -19,20 +19,31 @@ function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; }
 function finish { >&2 echo -en "\033[0m"; }
 trap finish EXIT
 
-buildPackageStyle() {
-    local package=$1 style=""
-    if [[ ${#} -eq 2 ]]; then
-        style="$2"
-    fi
-    step "Building: make ${package} ${style}"
-    make ${package}
-    step "Publishing ${package} with ${style}"
+publish() {
+    OPTRESET=1
+    OPTIND=
+    local arg
+    local rule=
+    local suffix=
+    local app=
+    while getopts 'r:s:a:' arg; do
+        case ${arg} in
+            r) rule=${OPTARG};;
+            s) suffix=${OPTARG};;
+            a) app=${OPTARG};;
+            *) "Usage: [-r rule] [-s suffix] [-a app]"; return
+        esac
+    done
+    
+    step "Building: make ${rule} ${suffix}"
+    make ${rule}
+    step "Publishing ${rule} with ${suffix}"
     local file_name=""
-    if [ -z ${style} ]
+    if [ -z ${suffix} ]
     then
         file_name=mapbox-macos-sdk-${PUBLISH_VERSION}.zip
     else
-        file_name=mapbox-macos-sdk-${PUBLISH_VERSION}-${style}.zip
+        file_name=mapbox-macos-sdk-${PUBLISH_VERSION}-${suffix}.zip
     fi
     step "Compressing ${file_name}…"
     cd build/macos/pkg
@@ -46,16 +57,18 @@ buildPackageStyle() {
             --name ${file_name} \
             --file "${BINARY_DIRECTORY}/${file_name}" > /dev/null
     fi
-    if [[ ${DEPLOY_APP} == true ]]; then
+    if [ ${app} ]; then
+        file_name="Mapbox GL.app.zip"
+        step "Compressing ${file_name}…"
         cd build/macos/app
-        rm -f 'Mapbox GL.app.zip'
-        zip -yr '../deploy/Mapbox GL.app.zip' 'Mapbox GL.app'
+        rm -f "${file_name}"
+        zip -yr "../deploy/${file_name}" 'Mapbox GL.app'
         cd -
         if [[ "${GITHUB_RELEASE}" == true ]]; then
             echo "Uploading ${file_name} to GitHub"
             github-release upload \
                 --tag "macos-v${PUBLISH_VERSION}" \
-                --name ${file_name} \
+                --name "${file_name}" \
                 --file "${BINARY_DIRECTORY}/${file_name}" > /dev/null
         fi
     fi
@@ -126,7 +139,7 @@ if [[ "${GITHUB_RELEASE}" == true ]]; then
         --draft ${PUBLISH_PRE_FLAG}
 fi
 
-buildPackageStyle "xpackage" "symbols"
-DEPLOY_APP=true buildPackageStyle "xpackage SYMBOLS=NO"
+publish -r xpackage -s symbols
+publish -r "xpackage SYMBOLS=NO" -a true
 
 step "Finished deploying ${PUBLISH_VERSION} in $(($SECONDS / 60)) minutes and $(($SECONDS % 60)) seconds"
diff --git a/platform/macos/scripts/package.sh b/platform/macos/scripts/package.sh
index a5aae24e0c..6a04b4b948 100755
--- a/platform/macos/scripts/package.sh
+++ b/platform/macos/scripts/package.sh
@@ -8,10 +8,10 @@ NAME=Mapbox
 OUTPUT=build/macos/pkg
 APP_OUTPUT=build/macos/app
 DERIVED_DATA=build/macos
-PRODUCTS=${DERIVED_DATA}
 
 BUILDTYPE=${BUILDTYPE:-Release}
 SYMBOLS=${SYMBOLS:-YES}
+PRODUCTS=${DERIVED_DATA}/${BUILDTYPE}
 
 function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; }
 function finish { >&2 echo -en "\033[0m"; }
@@ -24,15 +24,7 @@ PROJ_VERSION=$(git rev-list --count HEAD)
 SEM_VERSION=$( git describe --tags --match=macos-v*.*.* --abbrev=0 | sed 's/^macos-v//' )
 SHORT_VERSION=${SEM_VERSION%-*}
 
-XCODEBUILD_SCHEME=dynamic
-XCODEBUILD_ACTION=build
-if [[ ${BUILDTYPE} == Release ]]; then
-    XCODEBUILD_SCHEME=macosapp
-    XCODEBUILD_ACTION=archive
-    mkdir -p ${APP_OUTPUT}
-fi
-
-step "Building targets (build ${PROJ_VERSION}, version ${SEM_VERSION})…"
+step "Building dynamic framework (build ${PROJ_VERSION}, version ${SEM_VERSION})…"
 xcodebuild \
     CURRENT_PROJECT_VERSION=${PROJ_VERSION} \
     CURRENT_SHORT_VERSION=${SHORT_VERSION} \
@@ -41,16 +33,33 @@ xcodebuild \
     -derivedDataPath ${DERIVED_DATA} \
     -archivePath "${APP_OUTPUT}/macosapp.xcarchive" \
     -workspace ./platform/macos/macos.xcworkspace \
-    -scheme ${XCODEBUILD_SCHEME} \
+    -scheme dynamic \
     -configuration ${BUILDTYPE} \
     -jobs ${JOBS} \
-    ${XCODEBUILD_ACTION} | xcpretty
+    build | xcpretty
 
 step "Copying dynamic framework into place"
 mkdir -p "${OUTPUT}/${NAME}.framework"
-ditto ${PRODUCTS}/${BUILDTYPE}/${NAME}.framework "${OUTPUT}/${NAME}.framework"
-if [[ -e ${PRODUCTS}/${BUILDTYPE}/${NAME}.framework.dSYM ]]; then
-    cp -r ${PRODUCTS}/${BUILDTYPE}/${NAME}.framework.dSYM "${OUTPUT}"
+ditto ${PRODUCTS}/${NAME}.framework "${OUTPUT}/${NAME}.framework"
+if [[ -e ${PRODUCTS}/${NAME}.framework.dSYM ]]; then
+    cp -r ${PRODUCTS}/${NAME}.framework.dSYM "${OUTPUT}"
+fi
+
+step "Building and archiving Mapbox GL.app (build ${PROJ_VERSION}, version ${SEM_VERSION})…"
+if [[ ${BUILDTYPE} == Release ]]; then
+    mkdir -p ${APP_OUTPUT}
+    xcodebuild \
+        CURRENT_PROJECT_VERSION=${PROJ_VERSION} \
+        CURRENT_SHORT_VERSION=${SHORT_VERSION} \
+        CURRENT_SEMANTIC_VERSION=${SEM_VERSION} \
+        CURRENT_COMMIT_HASH=${HASH} \
+        -derivedDataPath ${DERIVED_DATA} \
+        -archivePath "${APP_OUTPUT}/macosapp.xcarchive" \
+        -workspace ./platform/macos/macos.xcworkspace \
+        -scheme macosapp \
+        -configuration ${BUILDTYPE} \
+        -jobs ${JOBS} \
+        archive | xcpretty
 fi
 
 if [[ ${SYMBOLS} = NO ]]; then