Merge pull request #192 from shyambhat/dev

v3.7
shyambhat · Dec 9, 2015 · 3c8a2e5 · 3c8a2e5
2 parents bf7fd7c + 60b0712
commit 3c8a2e5
Show file tree

Hide file tree

Showing 32 changed files with 1,039 additions and 416 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,8 @@
 language: objective-c
 xcode_workspace: InstagramKit.xcworkspace
 xcode_scheme: InstagramKit
-osx_image: xcode6.4
-xcode_sdk: iphonesimulator8.4
+osx_image: xcode7
+xcode_sdk: iphonesimulator9.0
 # before_install:
 #     - pod repo remove master
 #     - pod setup
diff --git a/InstagramKit-Example/InstagramKit-Example.xcodeproj/project.pbxproj b/InstagramKit-Example/InstagramKit-Example.xcodeproj/project.pbxproj
@@ -154,6 +154,7 @@
 				82DA94FC1B483C1C00A6303B /* Frameworks */,
 				82DA94FD1B483C1C00A6303B /* Resources */,
 				B8E20F253774B0401FC5E3A3 /* Copy Pods Resources */,
+				23044BA3D118B5FD1EBD4BB1 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -210,6 +211,21 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		23044BA3D118B5FD1EBD4BB1 /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		8B80D93D8CA47C4BA68E24B2 /* Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

diff --git a/...ample/InstagramKit-Example.xcodeproj/xcshareddata/xcschemes/InstagramKit-Example.xcscheme b/...ample/InstagramKit-Example.xcodeproj/xcshareddata/xcschemes/InstagramKit-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/InstagramKit-Example/InstagramKit-Example/Base.lproj/Main.storyboard b/InstagramKit-Example/InstagramKit-Example/Base.lproj/Main.storyboard
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="lv9-3E-qvv">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="lv9-3E-qvv">
     <dependencies>
+        <deployment identifier="iOS"/>
         <development version="5100" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
     </dependencies>
     <scenes>
@@ -13,6 +14,7 @@
                     <collectionView key="view" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" minimumZoomScale="0.0" maximumZoomScale="0.0" dataMode="prototypes" id="Deh-zO-I04">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="iY8-CG-v3c">
                             <size key="itemSize" width="106" height="106"/>
@@ -30,11 +32,14 @@
                                     <subviews>
                                         <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="100" placeholderIntrinsicHeight="100" translatesAutoresizingMaskIntoConstraints="NO" id="M44-nY-AWF">
                                             <rect key="frame" x="0.0" y="0.0" width="106" height="106"/>
+                                            <animations/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </imageView>
                                     </subviews>
+                                    <animations/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </view>
+                                <animations/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstItem="M44-nY-AWF" firstAttribute="leading" secondItem="QdO-6j-Fvb" secondAttribute="leading" id="b4Z-8f-8JP"/>
@@ -85,20 +90,23 @@
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="eeS-M5-Zb8">
                                 <rect key="frame" x="8" y="72" width="304" height="304"/>
+                                <animations/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="eeS-M5-Zb8" secondAttribute="height" multiplier="1:1" id="pNG-dl-Jup"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Caption" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" useAutomaticPreferredMaxLayoutWidth="YES" preferredMaxLayoutWidth="304" translatesAutoresizingMaskIntoConstraints="NO" id="fcw-9R-yvC">
                                 <rect key="frame" x="8" y="384" width="304" height="70"/>
+                                <animations/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="70" id="PBf-ts-yLW"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
+                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="eeS-M5-Zb8" firstAttribute="width" secondItem="fcw-9R-yvC" secondAttribute="width" id="8WU-vY-Cug"/>
@@ -134,12 +142,14 @@
                         <subviews>
                             <webView clipsSubviews="YES" contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="bBm-kX-gC1">
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                                <animations/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <connections>
                                     <outlet property="delegate" destination="Qfj-6N-R6z" id="GUP-h4-CjV"/>
                                 </connections>
                             </webView>
                         </subviews>
+                        <animations/>
                         <constraints>
                             <constraint firstItem="xL7-Gk-126" firstAttribute="top" secondItem="bBm-kX-gC1" secondAttribute="bottom" id="1Vy-rU-t2G"/>
                             <constraint firstAttribute="trailing" secondItem="bBm-kX-gC1" secondAttribute="trailing" id="5ym-Qs-0aA"/>
@@ -180,6 +190,7 @@
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="vRl-vr-VAW">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <animations/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
@@ -199,6 +210,7 @@
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="ER9-XT-p8R">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <animations/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
@@ -210,9 +222,4 @@
             <point key="canvasLocation" x="851" y="-565"/>
         </scene>
     </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>