reintegrate cocoapods

3 files changed, 63 insertions, 51 deletions

diff --git a/Juick.xcodeproj/project.pbxproj b/Juick.xcodeproj/project.pbxproj
index aae97f5..2e74d0e 100644
--- a/Juick.xcodeproj/project.pbxproj
+++ b/Juick.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		5B82EF5EC5E825D9A58A5678 /* Pods_JuickTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FF4AA695CB46B0E7AED628D /* Pods_JuickTests.framework */; };
 		770A42911E8881CB000B206A /* TokensList.m in Sources */ = {isa = PBXBuildFile; fileRef = 770A42901E8881CB000B206A /* TokensList.m */; };
 		77317BAC181BBE8500D60005 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77317BAB181BBE8500D60005 /* Foundation.framework */; };
 		77317BAE181BBE8500D60005 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77317BAD181BBE8500D60005 /* CoreGraphics.framework */; };
@@ -46,6 +47,7 @@
 		77FFC01A1D5FD186003BD81A /* MessageCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 77FFC0181D5FD186003BD81A /* MessageCell.xib */; };
 		77FFC01E1D5FE7CE003BD81A /* NavCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 77FFC01C1D5FE7CE003BD81A /* NavCell.m */; };
 		77FFC01F1D5FE7CE003BD81A /* NavCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 77FFC01D1D5FE7CE003BD81A /* NavCell.xib */; };
+		A2F3E638214933FBFC7D86E2 /* Pods_Juick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4FBC4E1DEAF2223116C4F15 /* Pods_Juick.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -115,11 +117,12 @@
 		77FFC01B1D5FE7CE003BD81A /* NavCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavCell.h; sourceTree = "<group>"; };
 		77FFC01C1D5FE7CE003BD81A /* NavCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NavCell.m; sourceTree = "<group>"; };
 		77FFC01D1D5FE7CE003BD81A /* NavCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NavCell.xib; sourceTree = "<group>"; };
-		8F93DB342C85111DFBC86143 /* Pods-Juick.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Juick.release.xcconfig"; path = "Pods/Target Support Files/Pods-Juick/Pods-Juick.release.xcconfig"; sourceTree = "<group>"; };
-		B72EF56E0806976BAF9D91E7 /* Pods_Juick.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Juick.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		D5F79ADD6611E9C3C0D56671 /* Pods-JuickTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JuickTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-JuickTests/Pods-JuickTests.debug.xcconfig"; sourceTree = "<group>"; };
-		F312BD1E5D93EF49132A25B6 /* Pods_JuickTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_JuickTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		F3C23ADDEF1C47900AA28093 /* Pods-Juick.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Juick.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Juick/Pods-Juick.debug.xcconfig"; sourceTree = "<group>"; };
+		9FF4AA695CB46B0E7AED628D /* Pods_JuickTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_JuickTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B3271B16DFB6247972806713 /* Pods-Juick.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Juick.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Juick/Pods-Juick.debug.xcconfig"; sourceTree = "<group>"; };
+		B3C6CA382EBEC5A1B3206E88 /* Pods-JuickTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JuickTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-JuickTests/Pods-JuickTests.release.xcconfig"; sourceTree = "<group>"; };
+		B4FBC4E1DEAF2223116C4F15 /* Pods_Juick.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Juick.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		ED59778452145D849D96349E /* Pods-JuickTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JuickTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-JuickTests/Pods-JuickTests.debug.xcconfig"; sourceTree = "<group>"; };
+		FE68EEE5B0A1ABE0D063F54A /* Pods-Juick.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Juick.release.xcconfig"; path = "Pods/Target Support Files/Pods-Juick/Pods-Juick.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -134,7 +137,7 @@
 				77317BAE181BBE8500D60005 /* CoreGraphics.framework in Frameworks */,
 				77317BB0181BBE8500D60005 /* UIKit.framework in Frameworks */,
 				77317BAC181BBE8500D60005 /* Foundation.framework in Frameworks */,
-				063DFC3866D41B2A873F21C2 /* Pods_Juick.framework in Frameworks */,
+				A2F3E638214933FBFC7D86E2 /* Pods_Juick.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -145,33 +148,22 @@
 				77317BCE181BBE8500D60005 /* XCTest.framework in Frameworks */,
 				77317BD0181BBE8500D60005 /* UIKit.framework in Frameworks */,
 				77317BCF181BBE8500D60005 /* Foundation.framework in Frameworks */,
-				48C9BE90B2C1E29BEA14C12C /* Pods_JuickTests.framework in Frameworks */,
+				5B82EF5EC5E825D9A58A5678 /* Pods_JuickTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		478C26C1EEFED1F89B8F65E7 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				F3C23ADDEF1C47900AA28093 /* Pods-Juick.debug.xcconfig */,
-				8F93DB342C85111DFBC86143 /* Pods-Juick.release.xcconfig */,
-				D5F79ADD6611E9C3C0D56671 /* Pods-JuickTests.debug.xcconfig */,
-				4A0219982372B305EC484794 /* Pods-JuickTests.release.xcconfig */,
-			);
-			name = Pods;
-			sourceTree = "<group>";
-		};
 		77317B9F181BBE8500D60005 = {
 			isa = PBXGroup;
 			children = (
 				77317BAA181BBE8500D60005 /* Frameworks */,
 				77317BB1181BBE8500D60005 /* Juick */,
 				77317BD3181BBE8500D60005 /* JuickTests */,
-				478C26C1EEFED1F89B8F65E7 /* Pods */,
 				77317BA9181BBE8500D60005 /* Products */,
 				7738FEC41D36CE6D008B5CD0 /* Launch Screen.storyboard */,
+				F5489793EBFBBE7FFA7ABC1E /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -195,8 +187,8 @@
 				77317BAD181BBE8500D60005 /* CoreGraphics.framework */,
 				77317BAF181BBE8500D60005 /* UIKit.framework */,
 				77317BCD181BBE8500D60005 /* XCTest.framework */,
-				B72EF56E0806976BAF9D91E7 /* Pods_Juick.framework */,
-				F312BD1E5D93EF49132A25B6 /* Pods_JuickTests.framework */,
+				B4FBC4E1DEAF2223116C4F15 /* Pods_Juick.framework */,
+				9FF4AA695CB46B0E7AED628D /* Pods_JuickTests.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -308,6 +300,17 @@
 			path = Views;
 			sourceTree = "<group>";
 		};
+		F5489793EBFBBE7FFA7ABC1E /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				B3271B16DFB6247972806713 /* Pods-Juick.debug.xcconfig */,
+				FE68EEE5B0A1ABE0D063F54A /* Pods-Juick.release.xcconfig */,
+				ED59778452145D849D96349E /* Pods-JuickTests.debug.xcconfig */,
+				B3C6CA382EBEC5A1B3206E88 /* Pods-JuickTests.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -315,12 +318,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 77317BDD181BBE8500D60005 /* Build configuration list for PBXNativeTarget "Juick" */;
 			buildPhases = (
-				7A3C8999A01D2379B704CE5B /* [CP] Check Pods Manifest.lock */,
+				293EFEC37D8DBE9B969C71AB /* [CP] Check Pods Manifest.lock */,
 				77317BA4181BBE8500D60005 /* Sources */,
 				77317BA5181BBE8500D60005 /* Frameworks */,
 				77317BA6181BBE8500D60005 /* Resources */,
-				E7FF65874E5B49CF2367F380 /* [CP] Embed Pods Frameworks */,
-				ED18F510D57CB16F4E0C0B03 /* [CP] Copy Pods Resources */,
+				FA8A2318D105CEEA023CE69A /* [CP] Embed Pods Frameworks */,
+				D6617CF570FBB08CC36345AF /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -335,12 +338,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 77317BE0181BBE8500D60005 /* Build configuration list for PBXNativeTarget "JuickTests" */;
 			buildPhases = (
-				D19E33D9C77E2611BBA45866 /* [CP] Check Pods Manifest.lock */,
+				D67DAB667B976CF922DEE60F /* [CP] Check Pods Manifest.lock */,
 				77317BC8181BBE8500D60005 /* Sources */,
 				77317BC9181BBE8500D60005 /* Frameworks */,
 				77317BCA181BBE8500D60005 /* Resources */,
-				190F3B3CA15B4328CA46684E /* [CP] Embed Pods Frameworks */,
-				CDD887CDEF42493AD77D673F /* [CP] Copy Pods Resources */,
+				D10F5C61E97144FE59FAE61C /* [CP] Embed Pods Frameworks */,
+				A4B6910B2FE8ADEB867B00A1 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -419,94 +422,94 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		190F3B3CA15B4328CA46684E /* [CP] Embed Pods Frameworks */ = {
+		293EFEC37D8DBE9B969C71AB /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "[CP] Embed Pods Frameworks";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JuickTests/Pods-JuickTests-frameworks.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		7A3C8999A01D2379B704CE5B /* [CP] Check Pods Manifest.lock */ = {
+		A4B6910B2FE8ADEB867B00A1 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run \'pod install\' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JuickTests/Pods-JuickTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		CDD887CDEF42493AD77D673F /* [CP] Copy Pods Resources */ = {
+		D10F5C61E97144FE59FAE61C /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "[CP] Copy Pods Resources";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JuickTests/Pods-JuickTests-resources.sh\"\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JuickTests/Pods-JuickTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D19E33D9C77E2611BBA45866 /* [CP] Check Pods Manifest.lock */ = {
+		D6617CF570FBB08CC36345AF /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run \'pod install\' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Juick/Pods-Juick-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		E7FF65874E5B49CF2367F380 /* [CP] Embed Pods Frameworks */ = {
+		D67DAB667B976CF922DEE60F /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "[CP] Embed Pods Frameworks";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Juick/Pods-Juick-frameworks.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		ED18F510D57CB16F4E0C0B03 /* [CP] Copy Pods Resources */ = {
+		FA8A2318D105CEEA023CE69A /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "[CP] Copy Pods Resources";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Juick/Pods-Juick-resources.sh\"\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Juick/Pods-Juick-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -661,7 +664,7 @@
 		};
 		77317BDE181BBE8500D60005 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = F3C23ADDEF1C47900AA28093 /* Pods-Juick.debug.xcconfig */;
+			baseConfigurationReference = B3271B16DFB6247972806713 /* Pods-Juick.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -682,7 +685,7 @@
 		};
 		77317BDF181BBE8500D60005 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8F93DB342C85111DFBC86143 /* Pods-Juick.release.xcconfig */;
+			baseConfigurationReference = FE68EEE5B0A1ABE0D063F54A /* Pods-Juick.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -701,7 +704,7 @@
 		};
 		77317BE1181BBE8500D60005 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D5F79ADD6611E9C3C0D56671 /* Pods-JuickTests.debug.xcconfig */;
+			baseConfigurationReference = ED59778452145D849D96349E /* Pods-JuickTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Juick.app/Juick";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -725,7 +728,7 @@
 		};
 		77317BE2181BBE8500D60005 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4A0219982372B305EC484794 /* Pods-JuickTests.release.xcconfig */;
+			baseConfigurationReference = B3C6CA382EBEC5A1B3206E88 /* Pods-JuickTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Juick.app/Juick";
 				FRAMEWORK_SEARCH_PATHS = (
diff --git a/Juick.xcworkspace/contents.xcworkspacedata b/Juick.xcworkspace/contents.xcworkspacedata
index 353d19d..bf1e00d 100644
--- a/Juick.xcworkspace/contents.xcworkspacedata
+++ b/Juick.xcworkspace/contents.xcworkspacedata
@@ -1 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?><Workspace version='1.0'><FileRef location='group:Juick.xcodeproj'/><FileRef location='group:Pods/Pods.xcodeproj'/></Workspace>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:Juick.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/Podfile.lock b/Podfile.lock
index 46a4156..b601d6b 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -69,4 +69,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 7cbf806e57f5a8e8ffb5d8843e12b16815a0a1a1
 
-COCOAPODS: 1.1.1
+COCOAPODS: 1.2.1