Skip to content

Commit

Permalink
Merge pull request #122 from shyambhat/dev
Browse files Browse the repository at this point in the history
3.6.4
  • Loading branch information
shyambhat committed Jul 7, 2015
2 parents 90d4bc9 + 89188a6 commit 26e9814
Show file tree
Hide file tree
Showing 75 changed files with 1,442 additions and 9,611 deletions.
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,12 @@ profile
DerivedData
.idea/

InstagramKit/InstagramKit.plist
# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
#
Pods/
Podfile.lock
.DS_Store
20 changes: 12 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@

language: objective-c
xcode_workspace: InstagramKit-Example/InstagramKit-Example.xcworkspace
xcode_scheme: InstagramKit-Example
xcode_sdk: iphonesimulator8.1
podfile: InstagramKit-Example/Podfile
# before_install:
# - gem install cocoapods --quiet
# - pod --version
# - pod setup
# - pod install
# - pod repo update --silent

before_install:
- gem install cocoapods --quiet
- pod --version
- pod setup
- pod repo update --silent

script:
# script:
#- pod lib lint
- xctool -project InstagramKitDemo/InstagramKitDemo.xcodeproj -scheme 'InstagramKitDemo' -configuration Release -sdk iphonesimulator -arch i386 build
# - xctool -xcode_workspace InstagramKit-Example/InstagramKit-Example.xcode_workspace -xcode_scheme 'InstagramKit-Example' -configuration Release -sdk iphonesimulator -arch i386 build
409 changes: 409 additions & 0 deletions InstagramKit-Example/InstagramKit-Example.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0510"
LastUpgradeVersion = "0640"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,10 +14,24 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "52781D3717CD6BB9001A32F7"
BuildableName = "InstagramKit.app"
BlueprintName = "InstagramKitDemo"
ReferencedContainer = "container:InstagramKitDemo.xcodeproj">
BlueprintIdentifier = "82DA94FE1B483C1C00A6303B"
BuildableName = "InstagramKit-Example.app"
BlueprintName = "InstagramKit-Example"
ReferencedContainer = "container:InstagramKit-Example.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1DB44B03927F41BF864DB927"
BuildableName = "libPods.a"
BlueprintName = "Pods"
ReferencedContainer = "container:Pods/Pods.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -28,24 +42,14 @@
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "52781D5817CD6BB9001A32F7"
BuildableName = "InstagramKitDemoTests.xctest"
BlueprintName = "InstagramKitDemoTests"
ReferencedContainer = "container:InstagramKitDemo.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "52781D3717CD6BB9001A32F7"
BuildableName = "InstagramKit.app"
BlueprintName = "InstagramKitDemo"
ReferencedContainer = "container:InstagramKitDemo.xcodeproj">
BlueprintIdentifier = "82DA94FE1B483C1C00A6303B"
BuildableName = "InstagramKit-Example.app"
BlueprintName = "InstagramKit-Example"
ReferencedContainer = "container:InstagramKit-Example.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
Expand All @@ -58,13 +62,14 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "52781D3717CD6BB9001A32F7"
BuildableName = "InstagramKit.app"
BlueprintName = "InstagramKitDemo"
ReferencedContainer = "container:InstagramKitDemo.xcodeproj">
BlueprintIdentifier = "82DA94FE1B483C1C00A6303B"
BuildableName = "InstagramKit-Example.app"
BlueprintName = "InstagramKit-Example"
ReferencedContainer = "container:InstagramKit-Example.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
Expand All @@ -76,13 +81,14 @@
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "52781D3717CD6BB9001A32F7"
BuildableName = "InstagramKit.app"
BlueprintName = "InstagramKitDemo"
ReferencedContainer = "container:InstagramKitDemo.xcodeproj">
BlueprintIdentifier = "82DA94FE1B483C1C00A6303B"
BuildableName = "InstagramKit-Example.app"
BlueprintName = "InstagramKit-Example"
ReferencedContainer = "container:InstagramKit-Example.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2015 Shyam Bhat. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
<rect key="frame" x="20" y="439" width="441" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="InstagramKit-Example" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
<constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
<constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
<constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
<constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="548" y="455"/>
</view>
</objects>
</document>
Loading

0 comments on commit 26e9814

Please sign in to comment.