Skip to content
Browse files

Merge pull request #204 from choefele/xcode_5

Xcode 5 Support
  • Loading branch information...
2 parents 7c78b64 + 50f6a9a commit 8997c919b6f5be59ab31699b3a092ab476fcd478 @evadne evadne committed Sep 19, 2013
View
7 AQGridView.xcodeproj/project.pbxproj
@@ -213,7 +213,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0500;
};
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "AQGridView" */;
compatibilityVersion = "Xcode 3.2";
@@ -283,7 +283,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = NO;
DSTROOT = /tmp/AQGridView.dst;
@@ -305,7 +304,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
DSTROOT = /tmp/AQGridView.dst;
GCC_MODEL_TUNING = G5;
@@ -323,12 +321,12 @@
1DEB922308733DC00010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 3.0;
+ ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -338,7 +336,6 @@
1DEB922408733DC00010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
View
1 AQGridView.xcodeproj/xcshareddata/xcschemes/AQGridView.xcscheme
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
View
41 AQGridView.xcworkspace/xcshareddata/AQGridView.xccheckout
@@ -0,0 +1,41 @@
+<?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>568D903B-7ACF-4F91-B116-529E03E33EE1</string>
+ <key>IDESourceControlProjectName</key>
+ <string>AQGridView</string>
+ <key>IDESourceControlProjectOriginsDictionary</key>
+ <dict>
+ <key>73FA1EF6-6F4B-4A28-937E-B321E5F74B3B</key>
+ <string>https://github.com/choefele/AQGridView.git</string>
+ </dict>
+ <key>IDESourceControlProjectPath</key>
+ <string>AQGridView.xcworkspace</string>
+ <key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+ <dict>
+ <key>73FA1EF6-6F4B-4A28-937E-B321E5F74B3B</key>
+ <string>..</string>
+ </dict>
+ <key>IDESourceControlProjectURL</key>
+ <string>https://github.com/choefele/AQGridView.git</string>
+ <key>IDESourceControlProjectVersion</key>
+ <integer>110</integer>
+ <key>IDESourceControlProjectWCCIdentifier</key>
+ <string>73FA1EF6-6F4B-4A28-937E-B321E5F74B3B</string>
+ <key>IDESourceControlProjectWCConfigurations</key>
+ <array>
+ <dict>
+ <key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+ <string>public.vcs.git</string>
+ <key>IDESourceControlWCCIdentifierKey</key>
+ <string>73FA1EF6-6F4B-4A28-937E-B321E5F74B3B</string>
+ <key>IDESourceControlWCCName</key>
+ <string>AQGridView</string>
+ </dict>
+ </array>
+</dict>
+</plist>
View
2 Classes/AQGridView.m
@@ -1278,7 +1278,7 @@ - (void) _userSelectItemAtIndex: (UserSelectItemIndexParams*) params
- (BOOL) _gestureRecognizerIsHandlingTouches: (NSSet *) touches
{
// see if the touch is (possibly) being tracked by a gesture recognizer
- for ( id recognizer in self.gestureRecognizers )
+ for ( UIGestureRecognizer *recognizer in self.gestureRecognizers )
@zzz6519003
zzz6519003 added a note Apr 9, 2014

excuse me~xcode5 require this change?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
{
switch ( [recognizer state] )
{
View
19 Examples/ExpanderDemo/ExpanderDemo.xcodeproj/project.pbxproj
@@ -47,13 +47,13 @@
38D6F07B12197E62006909B6 /* ExpanderDemoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F07A12197E62006909B6 /* ExpanderDemoAppDelegate.m */; };
38D6F07E12197E62006909B6 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 38D6F07C12197E62006909B6 /* MainWindow.xib */; };
38D6F08112197E62006909B6 /* ExpanderDemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F08012197E62006909B6 /* ExpanderDemoViewController.m */; };
- 38D6F12A121982CC006909B6 /* AQGridView.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F114121982CC006909B6 /* AQGridView.m */; };
- 38D6F12B121982CC006909B6 /* AQGridViewAnimatorItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F118121982CC006909B6 /* AQGridViewAnimatorItem.m */; };
- 38D6F12C121982CC006909B6 /* AQGridViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F11A121982CC006909B6 /* AQGridViewCell.m */; };
- 38D6F12D121982CC006909B6 /* AQGridViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F11D121982CC006909B6 /* AQGridViewController.m */; };
- 38D6F12E121982CC006909B6 /* AQGridViewData.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F11F121982CC006909B6 /* AQGridViewData.m */; };
- 38D6F12F121982CC006909B6 /* AQGridViewUpdateInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F121121982CC006909B6 /* AQGridViewUpdateInfo.m */; };
- 38D6F130121982CC006909B6 /* AQGridViewUpdateItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F123121982CC006909B6 /* AQGridViewUpdateItem.m */; };
+ 38D6F12A121982CC006909B6 /* AQGridView.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F114121982CC006909B6 /* AQGridView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
+ 38D6F12B121982CC006909B6 /* AQGridViewAnimatorItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F118121982CC006909B6 /* AQGridViewAnimatorItem.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
+ 38D6F12C121982CC006909B6 /* AQGridViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F11A121982CC006909B6 /* AQGridViewCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
+ 38D6F12D121982CC006909B6 /* AQGridViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F11D121982CC006909B6 /* AQGridViewController.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
+ 38D6F12E121982CC006909B6 /* AQGridViewData.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F11F121982CC006909B6 /* AQGridViewData.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
+ 38D6F12F121982CC006909B6 /* AQGridViewUpdateInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F121121982CC006909B6 /* AQGridViewUpdateInfo.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
+ 38D6F130121982CC006909B6 /* AQGridViewUpdateItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F123121982CC006909B6 /* AQGridViewUpdateItem.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
38D6F131121982CC006909B6 /* NSIndexSet+AQIndexesOutsideSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F125121982CC006909B6 /* NSIndexSet+AQIndexesOutsideSet.m */; };
38D6F132121982CC006909B6 /* NSIndexSet+AQIsSetContiguous.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F127121982CC006909B6 /* NSIndexSet+AQIsSetContiguous.m */; };
38D6F133121982CC006909B6 /* UIColor+AQGridView.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F129121982CC006909B6 /* UIColor+AQGridView.m */; };
@@ -319,7 +319,7 @@
38D6F05C12197E62006909B6 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0430;
+ LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Kobo Inc.";
};
buildConfigurationList = 38D6F05F12197E62006909B6 /* Build configuration list for PBXProject "ExpanderDemo" */;
@@ -429,13 +429,13 @@
38D6F08512197E62006909B6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = 2;
};
@@ -444,7 +444,6 @@
38D6F08612197E62006909B6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
View
1 Examples/ExpanderDemo/ExpanderDemo.xcodeproj/xcshareddata/xcschemes/ExpanderDemo.xcscheme
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
View
3 Examples/ImageDemo/ImageDemo.xcodeproj/project.pbxproj
@@ -320,7 +320,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0430;
+ LastUpgradeCheck = 0500;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ImageDemo" */;
compatibilityVersion = "Xcode 3.2";
@@ -451,6 +451,7 @@
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = 2;
};
View
1 Examples/ImageDemo/ImageDemo.xcodeproj/xcshareddata/xcschemes/ImageDemo.xcscheme
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
View
3 Examples/SpringBoard/SpringBoard.xcodeproj/project.pbxproj
@@ -206,7 +206,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0430;
+ LastUpgradeCheck = 0500;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SpringBoard" */;
compatibilityVersion = "Xcode 3.2";
@@ -306,6 +306,7 @@
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = 2;
};
View
1 Examples/SpringBoard/SpringBoard.xcodeproj/xcshareddata/xcschemes/SpringBoard.xcscheme
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
+ LastUpgradeVersion = "0500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

0 comments on commit 8997c91

Please sign in to comment.
Something went wrong with that request. Please try again.