Cleaning up for Xcode 7.

Devin Ross · Devin Ross · commit 72a781148d40 · 2015-09-25T05:35:26.000-04:00
diff --git a/Examples/Classes/CalendarDayViewController.m b/Examples/Classes/CalendarDayViewController.m
@@ -33,7 +33,7 @@
 
 @implementation CalendarDayViewController
 
-- (NSUInteger) supportedInterfaceOrientations{
+- (UIInterfaceOrientationMask) supportedInterfaceOrientations{
 	return  UIInterfaceOrientationMaskPortrait;
 }
 - (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
diff --git a/Examples/Classes/CalendarMonthViewController.m b/Examples/Classes/CalendarMonthViewController.m
@@ -34,7 +34,7 @@
 #pragma mark - CalendarMonthViewController
 @implementation CalendarMonthViewController
 
-- (NSUInteger) supportedInterfaceOrientations{
+- (UIInterfaceOrientationMask) supportedInterfaceOrientations{
 	return  UIInterfaceOrientationMaskPortrait;
 }
 - (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
diff --git a/Examples/Classes/CoverflowViewController.m b/Examples/Classes/CoverflowViewController.m
@@ -33,7 +33,7 @@
 #pragma mark - CoverflowViewController
 @implementation CoverflowViewController
 
-- (NSUInteger) supportedInterfaceOrientations{
+- (UIInterfaceOrientationMask) supportedInterfaceOrientations{
 	return  UIInterfaceOrientationMaskLandscapeLeft | UIInterfaceOrientationMaskLandscapeRight;
 }
 - (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
diff --git a/Examples/Classes/RootViewController.m b/Examples/Classes/RootViewController.m
@@ -70,7 +70,7 @@ - (instancetype) initWithStyle:(UITableViewStyle)s{
 	self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];
 	return self;
 }
-- (NSUInteger) supportedInterfaceOrientations{
+- (UIInterfaceOrientationMask) supportedInterfaceOrientations{
 	return [UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad ? UIInterfaceOrientationMaskAll : UIInterfaceOrientationMaskPortrait;
 }
 - (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
diff --git a/Examples/Examples-Info.plist b/Examples/Examples-Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/Examples/Examples.xcodeproj/project.pbxproj b/Examples/Examples.xcodeproj/project.pbxproj
@@ -367,7 +367,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0700;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Examples" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -502,6 +502,7 @@
 					"-ObjC",
 					"-all_load",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = unviersaldemo;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -533,6 +534,7 @@
 					"-ObjC",
 					"-all_load",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = Examples;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -544,6 +546,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_VERSION = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
diff --git a/Examples/Examples.xcodeproj/project.xcworkspace/xcshareddata/Examples.xccheckout b/Examples/Examples.xcodeproj/project.xcworkspace/xcshareddata/Examples.xccheckout
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>422A1A24-BF3B-41EA-AA02-E37C392352B8</string>
+	<key>IDESourceControlProjectName</key>
+	<string>Examples</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>771CDDC8828BA5C85B70BAEAFD5C3B58BF9E0AE2</key>
+		<string>github.com:devinross/curry.git</string>
+		<key>EE5017F42780957232AFF14DD75D9A51833942BE</key>
+		<string>github.com:devinross/tapkulibrary.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>Examples/Examples.xcodeproj</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>771CDDC8828BA5C85B70BAEAFD5C3B58BF9E0AE2</key>
+		<string>../../../Vendor/curry/</string>
+		<key>EE5017F42780957232AFF14DD75D9A51833942BE</key>
+		<string>../../..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>github.com:devinross/tapkulibrary.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>111</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>EE5017F42780957232AFF14DD75D9A51833942BE</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>771CDDC8828BA5C85B70BAEAFD5C3B58BF9E0AE2</string>
+			<key>IDESourceControlWCCName</key>
+			<string>curry</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>EE5017F42780957232AFF14DD75D9A51833942BE</string>
+			<key>IDESourceControlWCCName</key>
+			<string>tapkulibrary</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/Examples/Examples.xcodeproj/project.xcworkspace/xcshareddata/Examples.xcscmblueprint b/Examples/Examples.xcodeproj/project.xcworkspace/xcshareddata/Examples.xcscmblueprint
@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "EE5017F42780957232AFF14DD75D9A51833942BE",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "EE5017F42780957232AFF14DD75D9A51833942BE" : 0,
+    "771CDDC8828BA5C85B70BAEAFD5C3B58BF9E0AE2" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "422A1A24-BF3B-41EA-AA02-E37C392352B8",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "EE5017F42780957232AFF14DD75D9A51833942BE" : "tapkulibrary",
+    "771CDDC8828BA5C85B70BAEAFD5C3B58BF9E0AE2" : "tapkulibrary\/Vendor\/curry"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "Examples",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Examples\/Examples.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:devinross\/curry.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "771CDDC8828BA5C85B70BAEAFD5C3B58BF9E0AE2"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:devinross\/tapkulibrary.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "EE5017F42780957232AFF14DD75D9A51833942BE"
+    }
+  ]
+}
diff --git a/LogicTests-Info.plist b/LogicTests-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
diff --git a/TapkuLibrary.podspec b/TapkuLibrary.podspec
diff --git a/TapkuLibrary/TKAlertViewController.m b/TapkuLibrary/TKAlertViewController.m
@@ -45,7 +45,7 @@ - (instancetype) init{
 	return self;
 }
 
-- (NSUInteger) supportedInterfaceOrientations{
+- (UIInterfaceOrientationMask) supportedInterfaceOrientations{
 	if([UIDevice currentDevice].padIdiom)
 		return UIInterfaceOrientationMaskAll;
 	return UIInterfaceOrientationMaskPortrait;
diff --git a/TapkuLibrary/TapkuLibrary.h b/TapkuLibrary/TapkuLibrary.h
@@ -28,7 +28,7 @@
 #import "TKGlobal.h"
 
 // ADDITIONS
-#import "NSDate+TKCategory.h"
+//#import "NSDate+TKCategory.h"
 #import "UIImage+TKCategory.h"
 
 
diff --git a/Vendor/curry b/Vendor/curry
@@ -1 +1 @@
-Subproject commit a767293e07e032ca30832e0249b00aff63063ea7
+Subproject commit 6459a878c078f2f55755f26373340f9ab0d7bb63
diff --git a/tapku.xcodeproj/project.pbxproj b/tapku.xcodeproj/project.pbxproj
@@ -80,6 +80,27 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		2002F2361BB54A0900B565DA /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 20F156331B44A31600D49391 /* curry.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 20CEA42B1BA1105D0009D60C;
+			remoteInfo = curryTV;
+		};
+		2002F2381BB54A0900B565DA /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 20F156331B44A31600D49391 /* curry.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 2010DCB01BB0E40E00810A98;
+			remoteInfo = curryWatch;
+		};
+		2002F23A1BB54A0900B565DA /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 20F156331B44A31600D49391 /* curry.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 20B5FE1F1BB3613F00C0F848;
+			remoteInfo = curryMac;
+		};
 		20F156391B44A31700D49391 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 20F156331B44A31600D49391 /* curry.xcodeproj */;
@@ -240,6 +261,9 @@
 			children = (
 				20F1563A1B44A31700D49391 /* curry.framework */,
 				20F1563C1B44A31700D49391 /* curryTests.xctest */,
+				2002F2371BB54A0900B565DA /* curryTV.framework */,
+				2002F2391BB54A0900B565DA /* curryWatch.framework */,
+				2002F23B1BB54A0900B565DA /* curryMac.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -512,7 +536,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = TK;
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0700;
 				TargetAttributes = {
 					204C73E01ABA0EA600A68988 = {
 						CreatedOnToolsVersion = 6.3;
@@ -547,6 +571,27 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
+		2002F2371BB54A0900B565DA /* curryTV.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = curryTV.framework;
+			remoteRef = 2002F2361BB54A0900B565DA /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2002F2391BB54A0900B565DA /* curryWatch.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = curryWatch.framework;
+			remoteRef = 2002F2381BB54A0900B565DA /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2002F23B1BB54A0900B565DA /* curryMac.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = curryMac.framework;
+			remoteRef = 2002F23A1BB54A0900B565DA /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		20F1563A1B44A31700D49391 /* curry.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
@@ -649,6 +694,7 @@
 		1DEB922308733DC00010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -726,6 +772,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.devinross.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -774,6 +821,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.devinross.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -808,6 +856,7 @@
 					"-framework",
 					UIKit,
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = LogicTests;
 				SDKROOT = iphoneos;
 			};
@@ -837,6 +886,7 @@
 					"-framework",
 					UIKit,
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = LogicTests;
 				SDKROOT = iphoneos;
 				ZERO_LINK = NO;
diff --git a/tapku.xcodeproj/project.xcworkspace/xcshareddata/tapku.xccheckout b/tapku.xcodeproj/project.xcworkspace/xcshareddata/tapku.xccheckout
@@ -20,7 +20,7 @@
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
 		<key>771CDDC8828BA5C85B70BAEAFD5C3B58BF9E0AE2</key>
-		<string>../..Vendor/curry/</string>
+		<string>../..Vendor/curry</string>
 		<key>EE5017F42780957232AFF14DD75D9A51833942BE</key>
 		<string>../..</string>
 	</dict>
diff --git a/tapku/Info.plist b/tapku/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.devinross.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`
`34`	`34`	`@implementation CalendarDayViewController`
`35`	`35`
`36`		`-- (NSUInteger) supportedInterfaceOrientations{`
	`36`	`+- (UIInterfaceOrientationMask) supportedInterfaceOrientations{`
`37`	`37`	`return UIInterfaceOrientationMaskPortrait;`
`38`	`38`	`}`
`39`	`39`	`- (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`#pragma mark - CalendarMonthViewController`
`35`	`35`	`@implementation CalendarMonthViewController`
`36`	`36`
`37`		`-- (NSUInteger) supportedInterfaceOrientations{`
	`37`	`+- (UIInterfaceOrientationMask) supportedInterfaceOrientations{`
`38`	`38`	`return UIInterfaceOrientationMaskPortrait;`
`39`	`39`	`}`
`40`	`40`	`- (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ - (instancetype) initWithStyle:(UITableViewStyle)s{`
`70`	`70`	`self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil];`
`71`	`71`	`return self;`
`72`	`72`	`}`
`73`		`-- (NSUInteger) supportedInterfaceOrientations{`
	`73`	`+- (UIInterfaceOrientationMask) supportedInterfaceOrientations{`
`74`	`74`	`return [UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad ? UIInterfaceOrientationMaskAll : UIInterfaceOrientationMaskPortrait;`
`75`	`75`	`}`
`76`	`76`	`- (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {`