diff --git a/Examples/Classes/CalendarDayViewController.m b/Examples/Classes/CalendarDayViewController.m index 39c3c0cd..8d4537d1 100644 --- 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 index 40de4a57..33b93270 100755 --- 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 index 5a8f0c95..814ff06c 100755 --- 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 index 00dbb5a9..cf911eed 100755 --- 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 index 41d47fb2..ca181568 100644 --- a/Examples/Examples-Info.plist +++ b/Examples/Examples-Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.yourcompany.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Examples/Examples.xcodeproj/project.pbxproj b/Examples/Examples.xcodeproj/project.pbxproj index f42415bb..c6a3d9f3 100755 --- 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 new file mode 100644 index 00000000..0cd0c60a --- /dev/null +++ b/Examples/Examples.xcodeproj/project.xcworkspace/xcshareddata/Examples.xccheckout @@ -0,0 +1,53 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 422A1A24-BF3B-41EA-AA02-E37C392352B8 + IDESourceControlProjectName + Examples + IDESourceControlProjectOriginsDictionary + + 771CDDC8828BA5C85B70BAEAFD5C3B58BF9E0AE2 + github.com:devinross/curry.git + EE5017F42780957232AFF14DD75D9A51833942BE + github.com:devinross/tapkulibrary.git + + IDESourceControlProjectPath + Examples/Examples.xcodeproj + IDESourceControlProjectRelativeInstallPathDictionary + + 771CDDC8828BA5C85B70BAEAFD5C3B58BF9E0AE2 + ../../../Vendor/curry/ + EE5017F42780957232AFF14DD75D9A51833942BE + ../../.. + + IDESourceControlProjectURL + github.com:devinross/tapkulibrary.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + EE5017F42780957232AFF14DD75D9A51833942BE + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 771CDDC8828BA5C85B70BAEAFD5C3B58BF9E0AE2 + IDESourceControlWCCName + curry + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + EE5017F42780957232AFF14DD75D9A51833942BE + IDESourceControlWCCName + tapkulibrary + + + + diff --git a/Examples/Examples.xcodeproj/project.xcworkspace/xcshareddata/Examples.xcscmblueprint b/Examples/Examples.xcodeproj/project.xcworkspace/xcshareddata/Examples.xcscmblueprint new file mode 100644 index 00000000..807190ea --- /dev/null +++ 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" + } + ] +} \ No newline at end of file diff --git a/LogicTests-Info.plist b/LogicTests-Info.plist index 94eb7f4a..460a7d93 100644 --- a/LogicTests-Info.plist +++ b/LogicTests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.yourcompany.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/TapkuLibrary.podspec b/TapkuLibrary.podspec deleted file mode 100644 index a64ac48b..00000000 --- a/TapkuLibrary.podspec +++ /dev/null @@ -1,18 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'TapkuLibrary' - s.version = '0.3.8' - s.platform = :ios, '7.0' - s.author = { 'Devin Ross' => 'devin@devinsheaven.com' } - s.license = { :type => 'MIT', :file => 'License.txt' } - s.homepage = 'https://github.com/devinross/tapkulibrary' - s.summary = 'tap + haiku = tapku, a well crafted open source iOS framework' - s.description = 'TapkuLibrary is an iOS library built on Cocoa and UIKit intended for broad ' \ - 'use in applications. If you\'re looking to see what the library can do, check ' \ - 'out the demo project included. Some major components include coverflow, calendar ' \ - 'grid, network requests and progress indicators.' - s.source = { :git => 'https://github.com/devinross/tapkulibrary.git', :tag => 'v0.3.8' } - s.requires_arc = true - s.source_files = 'src/TapkuLibrary/*.{h,m}' - s.resources = 'src/TapkuLibrary.bundle' - s.frameworks = 'QuartzCore' -end \ No newline at end of file diff --git a/TapkuLibrary/TKAlertViewController.m b/TapkuLibrary/TKAlertViewController.m index 1c13f461..e9937a33 100644 --- 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 index 950d1658..f888b7e9 100755 --- 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 index a767293e..6459a878 160000 --- 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 index 053a197f..873f320f 100755 --- 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 = ""; @@ -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 index ba01e6f9..4d3e797e 100644 --- a/tapku.xcodeproj/project.xcworkspace/xcshareddata/tapku.xccheckout +++ b/tapku.xcodeproj/project.xcworkspace/xcshareddata/tapku.xccheckout @@ -20,7 +20,7 @@ IDESourceControlProjectRelativeInstallPathDictionary 771CDDC8828BA5C85B70BAEAFD5C3B58BF9E0AE2 - ../..Vendor/curry/ + ../..Vendor/curry EE5017F42780957232AFF14DD75D9A51833942BE ../.. diff --git a/tapku/Info.plist b/tapku/Info.plist index cffe8e33..d3de8eef 100644 --- a/tapku/Info.plist +++ b/tapku/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.devinross.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName