Added support for Carthage

This is a completel reorganization of the project, but there shouldn't be any changes to the actual code.
technology-ebay-de · Mar 2, 2016 · 70feac9 · 70feac9
1 parent 3a4cfae
commit 70feac9
Show file tree

Hide file tree

Showing 295 changed files with 1,189 additions and 12,168 deletions.
diff --git a/.gitignore b/.gitignore
@@ -47,3 +47,6 @@ ocunit.xml
 Vendor/bundle/
 .bundle/
 bin/
+
+# Carthage
+Carthage/Build
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "Carthage/Checkouts/FLAnimatedImage"]
+	path = Carthage/Checkouts/FLAnimatedImage
+	url = https://github.com/Flipboard/FLAnimatedImage.git
+[submodule "Carthage/Checkouts/ocmock"]
+	path = Carthage/Checkouts/ocmock
+	url = https://github.com/erikdoe/ocmock.git
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1 @@
+github "Flipboard/FLAnimatedImage" ~> 1.0
diff --git a/Cartfile.private b/Cartfile.private
@@ -0,0 +1 @@
+github "erikdoe/ocmock"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,2 @@
+github "Flipboard/FLAnimatedImage" "1.0.12"
+github "erikdoe/ocmock" "v3.2.2"
diff --git a/Carthage/Checkouts/FLAnimatedImage b/Carthage/Checkouts/FLAnimatedImage
diff --git a/Carthage/Checkouts/ocmock b/Carthage/Checkouts/ocmock
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
@@ -29,36 +29,6 @@
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "3x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/Example/Images.xcassets/Contents.json → Example/Assets.xcassets/Contents.json b/Example/Images.xcassets/Contents.json → Example/Assets.xcassets/Contents.json
diff --git a/...ets/LaunchImage.launchimage/Contents.json → ...ets/LaunchImage.launchimage/Contents.json b/...ets/LaunchImage.launchimage/Contents.json → ...ets/LaunchImage.launchimage/Contents.json
diff --git a/...ets/LaunchImage.launchimage/iPhone 4S.png → ...ets/LaunchImage.launchimage/iPhone 4S.png b/...ets/LaunchImage.launchimage/iPhone 4S.png → ...ets/LaunchImage.launchimage/iPhone 4S.png
diff --git a/...ets/LaunchImage.launchimage/iPhone 5s.png → ...ets/LaunchImage.launchimage/iPhone 5s.png b/...ets/LaunchImage.launchimage/iPhone 5s.png → ...ets/LaunchImage.launchimage/iPhone 5s.png
diff --git a/...mage.launchimage/iPhone6PlusLandscape.png → ...mage.launchimage/iPhone6PlusLandscape.png b/...mage.launchimage/iPhone6PlusLandscape.png → ...mage.launchimage/iPhone6PlusLandscape.png
diff --git a/...Image.launchimage/iPhone6PlusPortrait.png → ...Image.launchimage/iPhone6PlusPortrait.png b/...Image.launchimage/iPhone6PlusPortrait.png → ...Image.launchimage/iPhone6PlusPortrait.png
diff --git a/...chImage.launchimage/iPhone6Portrait-1.png → ...chImage.launchimage/iPhone6Portrait-1.png b/...chImage.launchimage/iPhone6Portrait-1.png → ...chImage.launchimage/iPhone6Portrait-1.png
diff --git a/...ts/NYTimesBuilding.imageset/Contents.json → ...ts/NYTimesBuilding.imageset/Contents.json b/...ts/NYTimesBuilding.imageset/Contents.json → ...ts/NYTimesBuilding.imageset/Contents.json
diff --git a/...imesBuilding.imageset/NYTimesBuilding.jpg → ...imesBuilding.imageset/NYTimesBuilding.jpg b/...imesBuilding.imageset/NYTimesBuilding.jpg → ...imesBuilding.imageset/NYTimesBuilding.jpg
diff --git a/...sBuilding.imageset/[email protected] → ...sBuilding.imageset/[email protected] b/...sBuilding.imageset/[email protected] → ...sBuilding.imageset/[email protected]
diff --git a/...sBuilding.imageset/[email protected] → ...sBuilding.imageset/[email protected] b/...sBuilding.imageset/[email protected] → ...sBuilding.imageset/[email protected]
diff --git a/...uildingPlaceholder.imageset/Contents.json → ...uildingPlaceholder.imageset/Contents.json b/...uildingPlaceholder.imageset/Contents.json → ...uildingPlaceholder.imageset/Contents.json
diff --git a/...mageset/[email protected] → ...mageset/[email protected] b/...mageset/[email protected] → ...mageset/[email protected]
diff --git a/...mageset/[email protected] → ...mageset/[email protected] b/...mageset/[email protected] → ...mageset/[email protected]
diff --git a/Example/Base.lproj/LaunchScreen.storyboard b/Example/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
+                        <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/...oViewer/Base.lproj/Main_iPhone.storyboard → Example/Base.lproj/Main.storyboard b/...oViewer/Base.lproj/Main_iPhone.storyboard → Example/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6751" systemVersion="14C1514" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6736"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
     </dependencies>
     <scenes>
@@ -49,9 +49,4 @@
     <resources>
         <image name="NYTimesBuilding" width="800" height="540"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/Example/NYTPhotoViewer/NYTAppDelegate.h → Example/NYTAppDelegate.h b/Example/NYTPhotoViewer/NYTAppDelegate.h → Example/NYTAppDelegate.h
diff --git a/Example/NYTPhotoViewer/NYTAppDelegate.m → Example/NYTAppDelegate.m b/Example/NYTPhotoViewer/NYTAppDelegate.m → Example/NYTAppDelegate.m
diff --git a/Example/NYTPhotoViewer/NYTExamplePhoto.h → Example/NYTExamplePhoto.h b/Example/NYTPhotoViewer/NYTExamplePhoto.h → Example/NYTExamplePhoto.h
diff --git a/Example/NYTPhotoViewer/NYTExamplePhoto.m → Example/NYTExamplePhoto.m b/Example/NYTPhotoViewer/NYTExamplePhoto.m → Example/NYTExamplePhoto.m
diff --git a/.../NYTPhotoViewer/NYTPhotoViewer-Info.plist → Example/NYTPhotoViewer-Info.plist b/.../NYTPhotoViewer/NYTPhotoViewer-Info.plist → Example/NYTPhotoViewer-Info.plist
@@ -24,10 +24,10 @@
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
-	<string>Main_iPhone</string>
-	<key>UIMainStoryboardFile~ipad</key>
-	<string>Main_iPad</string>
+	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/.../NYTPhotoViewer/NYTPhotoViewer-Prefix.pch → Example/NYTPhotoViewer-Prefix.pch b/.../NYTPhotoViewer/NYTPhotoViewer-Prefix.pch → Example/NYTPhotoViewer-Prefix.pch
diff --git a/Example/NYTPhotoViewer-Swift/AppDelegate.swift b/Example/NYTPhotoViewer-Swift/AppDelegate.swift
diff --git a/Example/NYTPhotoViewer-Swift/Base.lproj/LaunchScreen.xib b/Example/NYTPhotoViewer-Swift/Base.lproj/LaunchScreen.xib
diff --git a/Example/NYTPhotoViewer-Swift/Base.lproj/Main.storyboard b/Example/NYTPhotoViewer-Swift/Base.lproj/Main.storyboard
diff --git a/Example/NYTPhotoViewer-Swift/ExamplePhoto.swift b/Example/NYTPhotoViewer-Swift/ExamplePhoto.swift
diff --git a/Example/NYTPhotoViewer-Swift/Info.plist b/Example/NYTPhotoViewer-Swift/Info.plist
diff --git a/Example/NYTPhotoViewer-Swift/NYTPhotoViewer-Swift-Bridging-Header.h b/Example/NYTPhotoViewer-Swift/NYTPhotoViewer-Swift-Bridging-Header.h
diff --git a/Example/NYTPhotoViewer-Swift/PhotosProvider.swift b/Example/NYTPhotoViewer-Swift/PhotosProvider.swift
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		github "Flipboard/FLAnimatedImage" "1.0.12"
		github "erikdoe/ocmock" "v3.2.2"