Updated project settings

gblancogarcia · Jan 23, 2016 · 1fe3597 · 1fe3597
1 parent 2f8bd73
commit 1fe3597
Show file tree

Hide file tree

Showing 21 changed files with 144 additions and 52 deletions.
diff --git a/GBInfiniteScrollViewDemo/GBInfiniteScrollViewDemo.xcodeproj/project.pbxproj b/GBInfiniteScrollViewDemo/GBInfiniteScrollViewDemo.xcodeproj/project.pbxproj
@@ -303,7 +303,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = GB;
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0720;
 				ORGANIZATIONNAME = "Gerardo Blanco García";
 				TargetAttributes = {
 					430038F6187064F600978149 = {
@@ -435,6 +435,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -497,11 +498,8 @@
 				GCC_PREFIX_HEADER = "GBInfiniteScrollViewDemo/GBInfiniteScrollViewDemo-Prefix.pch";
 				INFOPLIST_FILE = "GBInfiniteScrollViewDemo/GBInfiniteScrollViewDemo-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/GBInfiniteScrollView-edronfnxpnachpfcgaxqokzpftby/Build/Products/Debug-iphoneos",
-					"$(PROJECT_DIR)/GBInfiniteScrollViewDemo",
-				);
+				LIBRARY_SEARCH_PATHS = "";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.gblancogarcia.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = Infinite;
 				WRAPPER_EXTENSION = app;
 			};
@@ -517,11 +515,8 @@
 				GCC_PREFIX_HEADER = "GBInfiniteScrollViewDemo/GBInfiniteScrollViewDemo-Prefix.pch";
 				INFOPLIST_FILE = "GBInfiniteScrollViewDemo/GBInfiniteScrollViewDemo-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/GBInfiniteScrollView-edronfnxpnachpfcgaxqokzpftby/Build/Products/Debug-iphoneos",
-					"$(PROJECT_DIR)/GBInfiniteScrollViewDemo",
-				);
+				LIBRARY_SEARCH_PATHS = "";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.gblancogarcia.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = Infinite;
 				WRAPPER_EXTENSION = app;
 			};
@@ -543,6 +538,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = "GBInfiniteScrollViewDemoTests/GBInfiniteScrollViewDemoTests-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.gblancogarcia.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Infinite.app/Infinite";
 				WRAPPER_EXTENSION = xctest;
@@ -561,6 +557,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "GBInfiniteScrollViewDemo/GBInfiniteScrollViewDemo-Prefix.pch";
 				INFOPLIST_FILE = "GBInfiniteScrollViewDemoTests/GBInfiniteScrollViewDemoTests-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.gblancogarcia.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Infinite.app/Infinite";
 				WRAPPER_EXTENSION = xctest;

diff --git a/GBInfiniteScrollViewDemo/GBInfiniteScrollViewDemo/GBInfiniteScrollViewDemo-Info.plist b/GBInfiniteScrollViewDemo/GBInfiniteScrollViewDemo/GBInfiniteScrollViewDemo-Info.plist
@@ -2,18 +2,14 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>UIStatusBarStyle</key>
-	<string>UIStatusBarStyleBlackOpaque</string>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.gblancogarcia.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -26,6 +22,8 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
+	<key>LSApplicationCategoryType</key>
+	<string></string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>
@@ -36,11 +34,13 @@
 	</array>
 	<key>UIStatusBarHidden</key>
 	<false/>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleBlackOpaque</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
-	<key>LSApplicationCategoryType</key>
-	<string></string>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>
diff --git a/GBInfiniteScrollViewDemo/GBInfiniteScrollViewDemo/GBViewController.m b/GBInfiniteScrollViewDemo/GBInfiniteScrollViewDemo/GBViewController.m
@@ -468,7 +468,7 @@ - (void)switchDirection
     if (self.autoScrollDirection == GBAutoScrollDirectionLeftToRight) {
         transform = self.rightToLeftTransform;
         autoScrollDirection = GBAutoScrollDirectionRightToLeft;
-    } else if (self.autoScrollDirection == GBAutoScrollDirectionRightToLeft) {
+    } else {
         transform = self.leftToRightTransform;
         autoScrollDirection = GBAutoScrollDirectionLeftToRight;
     }

diff --git a/...eScrollViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/AddButton.imageset/Contents.json b/...eScrollViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/AddButton.imageset/Contents.json
@@ -6,8 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/...Demo/GBInfiniteScrollViewDemo/Images.xcassets/AddButtonHighlighted.imageset/Contents.json b/...Demo/GBInfiniteScrollViewDemo/Images.xcassets/AddButtonHighlighted.imageset/Contents.json
@@ -6,8 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/...eScrollViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/...eScrollViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -12,12 +12,22 @@
       "filename" : "[email protected]",
       "scale" : "2x"
     },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
     {
       "size" : "40x40",
       "idiom" : "iphone",
       "filename" : "[email protected]",
       "scale" : "2x"
     },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
     {
       "size" : "57x57",
       "idiom" : "iphone",
@@ -35,6 +45,11 @@
       "idiom" : "iphone",
       "filename" : "[email protected]",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/...crollViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/ArrowButton.imageset/Contents.json b/...crollViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/ArrowButton.imageset/Contents.json
@@ -6,8 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/...mo/GBInfiniteScrollViewDemo/Images.xcassets/ArrowButtonHighlighted.imageset/Contents.json b/...mo/GBInfiniteScrollViewDemo/Images.xcassets/ArrowButtonHighlighted.imageset/Contents.json
@@ -6,8 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/...crollViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/CloseButton.imageset/Contents.json b/...crollViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/CloseButton.imageset/Contents.json
@@ -6,8 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/...mo/GBInfiniteScrollViewDemo/Images.xcassets/CloseButtonHighlighted.imageset/Contents.json b/...mo/GBInfiniteScrollViewDemo/Images.xcassets/CloseButtonHighlighted.imageset/Contents.json
@@ -6,8 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/...ScrollViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/InfoButton.imageset/Contents.json b/...ScrollViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/InfoButton.imageset/Contents.json
@@ -6,8 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/...emo/GBInfiniteScrollViewDemo/Images.xcassets/InfoButtonHighlighted.imageset/Contents.json b/...emo/GBInfiniteScrollViewDemo/Images.xcassets/InfoButtonHighlighted.imageset/Contents.json
@@ -6,8 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/...llViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/LockLeftButton.imageset/Contents.json b/...llViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/LockLeftButton.imageset/Contents.json
@@ -2,8 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/...GBInfiniteScrollViewDemo/Images.xcassets/LockLeftButtonHighlighted.imageset/Contents.json b/...GBInfiniteScrollViewDemo/Images.xcassets/LockLeftButtonHighlighted.imageset/Contents.json
@@ -2,8 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/...lViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/LockRightButton.imageset/Contents.json b/...lViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/LockRightButton.imageset/Contents.json
@@ -2,8 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/...BInfiniteScrollViewDemo/Images.xcassets/LockRightButtonHighlighted.imageset/Contents.json b/...BInfiniteScrollViewDemo/Images.xcassets/LockRightButtonHighlighted.imageset/Contents.json
@@ -2,8 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/...ScrollViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/PlayButton.imageset/Contents.json b/...ScrollViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/PlayButton.imageset/Contents.json
@@ -6,8 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/...emo/GBInfiniteScrollViewDemo/Images.xcassets/PlayButtonHighlighted.imageset/Contents.json b/...emo/GBInfiniteScrollViewDemo/Images.xcassets/PlayButtonHighlighted.imageset/Contents.json
@@ -6,8 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/...ScrollViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/StopButton.imageset/Contents.json b/...ScrollViewDemo/GBInfiniteScrollViewDemo/Images.xcassets/StopButton.imageset/Contents.json
@@ -6,8 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {