From 7bed2cebd2d78762650dbe2cbf895fc1673ba8da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= <mxn@1ec5.org>
Date: Mon, 22 Feb 2016 10:44:49 -0800
Subject: [ios] Restored framework dependencies to static installation
 instructions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Backed out documentation about #4029 because it doesn’t apply when using a storyboard, and the installation instructions use a storyboard.
---
 CHANGELOG.md            |  5 +++++
 ios/docs/pod-README.md  | 11 +++++++++++
 platform/ios/INSTALL.md | 11 +++++++++++
 3 files changed, 27 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6bc54a9b5..9324d8be85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,11 @@ Known issues:
 - Black Screen On Ice Cream Sandwich and Jelly Bean devices ([#2802](https://github.com/mapbox/mapbox-gl-native/issues/2802))
   - Resolved in 2.2.0
 
+## iOS 3.1.2
+
+- You can once again install the static framework without manually linking several framework and library dependencies. ([#4029](https://github.com/mapbox/mapbox-gl-native/pull/4029))
+- The location manager used by MGLMapView to show the user’s location is now paused when the application is sent to the background. ([#4034](https://github.com/mapbox/mapbox-gl-native/pull/4034))
+
 ## iOS 3.1.1
 
 - Corrected the dynamic framework’s minimum deployment target to iOS 8.0. ([#3872](https://github.com/mapbox/mapbox-gl-native/pull/3872))
diff --git a/ios/docs/pod-README.md b/ios/docs/pod-README.md
index f5c3061478..e2c8ff813a 100644
--- a/ios/docs/pod-README.md
+++ b/ios/docs/pod-README.md
@@ -35,6 +35,17 @@ If your application targets iOS 7.x, you’ll need to install the static framewo
 
 1. Open the project editor and select your application target. Drag `Mapbox.framework` from the `static` folder into the “Embedded Binaries” section of the General tab. (Don’t drag it into the “Linked Frameworks and Libraries” section; Xcode will add it there automatically.) In the sheet that appears, make sure “Copy items if needed” is checked, then click Finish.
 
+1. Add the following Cocoa Touch frameworks and libraries to the “Linked Frameworks and Libraries” section:
+
+   - `GLKit.framework`
+   - `ImageIO.framework`
+   - `MobileCoreServices.framework`
+   - `QuartzCore.framework`
+   - `SystemConfiguration.framework`
+   - `libc++.tbd`
+   - `libsqlite3.tbd`
+   - `libz.tbd`
+
 1. In the Build Settings tab, add `-ObjC` to the “Other Linker Flags” (`OTHER_LDFLAGS`) build setting.
 
 {{/STATIC}}
diff --git a/platform/ios/INSTALL.md b/platform/ios/INSTALL.md
index fab16bbfea..b4e27acdea 100644
--- a/platform/ios/INSTALL.md
+++ b/platform/ios/INSTALL.md
@@ -97,6 +97,17 @@ If your application targets iOS 7.x, you’ll need to install the static framewo
 
 1. Open the project editor and select your application target. Drag `build/ios/pkg/static/Mapbox.framework` into the “Embedded Binaries” section of the General tab. (Don’t drag it into the “Linked Frameworks and Libraries” section; Xcode will add it there automatically.) In the sheet that appears, make sure “Copy items if needed” is checked, then click Finish.
 
+1. Add the following Cocoa Touch frameworks and libraries to the “Linked Frameworks and Libraries” section:
+
+   - `GLKit.framework`
+   - `ImageIO.framework`
+   - `MobileCoreServices.framework`
+   - `QuartzCore.framework`
+   - `SystemConfiguration.framework`
+   - `libc++.tbd`
+   - `libsqlite3.tbd`
+   - `libz.tbd`
+
 1. In the Build Settings tab, add `-ObjC` to the “Other Linker Flags” (`OTHER_LDFLAGS`) build setting.
 
 ### Use
-- 
cgit v1.2.1