Skip to content

Commit 8997c91

Browse files
evadneevadne
committed
Merge pull request AlanQuatermain#204 from choefele/xcode_5
Xcode 5 Support
2 parents 7c78b64 + 50f6a9a commit 8997c91

10 files changed

Lines changed: 61 additions & 18 deletions

File tree

‎AQGridView.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
0867D690FE84028FC02AAC07 /* Project object */ = {
214214
isa = PBXProject;
215215
attributes = {
216-
LastUpgradeCheck = 0420;
216+
LastUpgradeCheck = 0500;
217217
};
218218
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "AQGridView" */;
219219
compatibilityVersion = "Xcode 3.2";
@@ -283,7 +283,6 @@
283283
isa = XCBuildConfiguration;
284284
buildSettings = {
285285
ALWAYS_SEARCH_USER_PATHS = NO;
286-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
287286
CLANG_ENABLE_OBJC_ARC = YES;
288287
COPY_PHASE_STRIP = NO;
289288
DSTROOT = /tmp/AQGridView.dst;
@@ -305,7 +304,6 @@
305304
isa = XCBuildConfiguration;
306305
buildSettings = {
307306
ALWAYS_SEARCH_USER_PATHS = NO;
308-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
309307
CLANG_ENABLE_OBJC_ARC = YES;
310308
DSTROOT = /tmp/AQGridView.dst;
311309
GCC_MODEL_TUNING = G5;
@@ -323,12 +321,12 @@
323321
1DEB922308733DC00010E9CD /* Debug */ = {
324322
isa = XCBuildConfiguration;
325323
buildSettings = {
326-
ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
327324
GCC_C_LANGUAGE_STANDARD = c99;
328325
GCC_OPTIMIZATION_LEVEL = 0;
329326
GCC_WARN_ABOUT_RETURN_TYPE = YES;
330327
GCC_WARN_UNUSED_VARIABLE = YES;
331328
IPHONEOS_DEPLOYMENT_TARGET = 3.0;
329+
ONLY_ACTIVE_ARCH = YES;
332330
OTHER_LDFLAGS = "-ObjC";
333331
SDKROOT = iphoneos;
334332
TARGETED_DEVICE_FAMILY = "1,2";
@@ -338,7 +336,6 @@
338336
1DEB922408733DC00010E9CD /* Release */ = {
339337
isa = XCBuildConfiguration;
340338
buildSettings = {
341-
ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
342339
GCC_C_LANGUAGE_STANDARD = c99;
343340
GCC_WARN_ABOUT_RETURN_TYPE = YES;
344341
GCC_WARN_UNUSED_VARIABLE = YES;

‎AQGridView.xcodeproj/xcshareddata/xcschemes/AQGridView.xcscheme‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3+
LastUpgradeVersion = "0500"
34
version = "1.3">
45
<BuildAction
56
parallelizeBuildables = "YES"

‎AQGridView.xcworkspace/xcshareddata/AQGridView.xccheckout‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
6+
<false/>
7+
<key>IDESourceControlProjectIdentifier</key>
8+
<string>568D903B-7ACF-4F91-B116-529E03E33EE1</string>
9+
<key>IDESourceControlProjectName</key>
10+
<string>AQGridView</string>
11+
<key>IDESourceControlProjectOriginsDictionary</key>
12+
<dict>
13+
<key>73FA1EF6-6F4B-4A28-937E-B321E5F74B3B</key>
14+
<string>https://github.com/choefele/AQGridView.git</string>
15+
</dict>
16+
<key>IDESourceControlProjectPath</key>
17+
<string>AQGridView.xcworkspace</string>
18+
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
19+
<dict>
20+
<key>73FA1EF6-6F4B-4A28-937E-B321E5F74B3B</key>
21+
<string>..</string>
22+
</dict>
23+
<key>IDESourceControlProjectURL</key>
24+
<string>https://github.com/choefele/AQGridView.git</string>
25+
<key>IDESourceControlProjectVersion</key>
26+
<integer>110</integer>
27+
<key>IDESourceControlProjectWCCIdentifier</key>
28+
<string>73FA1EF6-6F4B-4A28-937E-B321E5F74B3B</string>
29+
<key>IDESourceControlProjectWCConfigurations</key>
30+
<array>
31+
<dict>
32+
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
33+
<string>public.vcs.git</string>
34+
<key>IDESourceControlWCCIdentifierKey</key>
35+
<string>73FA1EF6-6F4B-4A28-937E-B321E5F74B3B</string>
36+
<key>IDESourceControlWCCName</key>
37+
<string>AQGridView</string>
38+
</dict>
39+
</array>
40+
</dict>
41+
</plist>

‎Classes/AQGridView.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,7 @@ - (void) _userSelectItemAtIndex: (UserSelectItemIndexParams*) params
12781278
- (BOOL) _gestureRecognizerIsHandlingTouches: (NSSet *) touches
12791279
{
12801280
// see if the touch is (possibly) being tracked by a gesture recognizer
1281-
for ( id recognizer in self.gestureRecognizers )
1281+
for ( UIGestureRecognizer *recognizer in self.gestureRecognizers )
12821282
{
12831283
switch ( [recognizer state] )
12841284
{

‎Examples/ExpanderDemo/ExpanderDemo.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@
4747
38D6F07B12197E62006909B6 /* ExpanderDemoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F07A12197E62006909B6 /* ExpanderDemoAppDelegate.m */; };
4848
38D6F07E12197E62006909B6 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 38D6F07C12197E62006909B6 /* MainWindow.xib */; };
4949
38D6F08112197E62006909B6 /* ExpanderDemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F08012197E62006909B6 /* ExpanderDemoViewController.m */; };
50-
38D6F12A121982CC006909B6 /* AQGridView.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F114121982CC006909B6 /* AQGridView.m */; };
51-
38D6F12B121982CC006909B6 /* AQGridViewAnimatorItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F118121982CC006909B6 /* AQGridViewAnimatorItem.m */; };
52-
38D6F12C121982CC006909B6 /* AQGridViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F11A121982CC006909B6 /* AQGridViewCell.m */; };
53-
38D6F12D121982CC006909B6 /* AQGridViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F11D121982CC006909B6 /* AQGridViewController.m */; };
54-
38D6F12E121982CC006909B6 /* AQGridViewData.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F11F121982CC006909B6 /* AQGridViewData.m */; };
55-
38D6F12F121982CC006909B6 /* AQGridViewUpdateInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F121121982CC006909B6 /* AQGridViewUpdateInfo.m */; };
56-
38D6F130121982CC006909B6 /* AQGridViewUpdateItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F123121982CC006909B6 /* AQGridViewUpdateItem.m */; };
50+
38D6F12A121982CC006909B6 /* AQGridView.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F114121982CC006909B6 /* AQGridView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
51+
38D6F12B121982CC006909B6 /* AQGridViewAnimatorItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F118121982CC006909B6 /* AQGridViewAnimatorItem.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
52+
38D6F12C121982CC006909B6 /* AQGridViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F11A121982CC006909B6 /* AQGridViewCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
53+
38D6F12D121982CC006909B6 /* AQGridViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F11D121982CC006909B6 /* AQGridViewController.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
54+
38D6F12E121982CC006909B6 /* AQGridViewData.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F11F121982CC006909B6 /* AQGridViewData.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
55+
38D6F12F121982CC006909B6 /* AQGridViewUpdateInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F121121982CC006909B6 /* AQGridViewUpdateInfo.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
56+
38D6F130121982CC006909B6 /* AQGridViewUpdateItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F123121982CC006909B6 /* AQGridViewUpdateItem.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
5757
38D6F131121982CC006909B6 /* NSIndexSet+AQIndexesOutsideSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F125121982CC006909B6 /* NSIndexSet+AQIndexesOutsideSet.m */; };
5858
38D6F132121982CC006909B6 /* NSIndexSet+AQIsSetContiguous.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F127121982CC006909B6 /* NSIndexSet+AQIsSetContiguous.m */; };
5959
38D6F133121982CC006909B6 /* UIColor+AQGridView.m in Sources */ = {isa = PBXBuildFile; fileRef = 38D6F129121982CC006909B6 /* UIColor+AQGridView.m */; };
@@ -319,7 +319,7 @@
319319
38D6F05C12197E62006909B6 /* Project object */ = {
320320
isa = PBXProject;
321321
attributes = {
322-
LastUpgradeCheck = 0430;
322+
LastUpgradeCheck = 0500;
323323
ORGANIZATIONNAME = "Kobo Inc.";
324324
};
325325
buildConfigurationList = 38D6F05F12197E62006909B6 /* Build configuration list for PBXProject "ExpanderDemo" */;
@@ -429,13 +429,13 @@
429429
38D6F08512197E62006909B6 /* Debug */ = {
430430
isa = XCBuildConfiguration;
431431
buildSettings = {
432-
ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
433432
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
434433
GCC_C_LANGUAGE_STANDARD = gnu99;
435434
GCC_OPTIMIZATION_LEVEL = 0;
436435
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
437436
GCC_WARN_ABOUT_RETURN_TYPE = YES;
438437
GCC_WARN_UNUSED_VARIABLE = YES;
438+
ONLY_ACTIVE_ARCH = YES;
439439
SDKROOT = iphoneos;
440440
TARGETED_DEVICE_FAMILY = 2;
441441
};
@@ -444,7 +444,6 @@
444444
38D6F08612197E62006909B6 /* Release */ = {
445445
isa = XCBuildConfiguration;
446446
buildSettings = {
447-
ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
448447
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
449448
GCC_C_LANGUAGE_STANDARD = gnu99;
450449
GCC_WARN_ABOUT_RETURN_TYPE = YES;

‎Examples/ExpanderDemo/ExpanderDemo.xcodeproj/xcshareddata/xcschemes/ExpanderDemo.xcscheme‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3+
LastUpgradeVersion = "0500"
34
version = "1.3">
45
<BuildAction
56
parallelizeBuildables = "YES"

‎Examples/ImageDemo/ImageDemo.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@
320320
29B97313FDCFA39411CA2CEA /* Project object */ = {
321321
isa = PBXProject;
322322
attributes = {
323-
LastUpgradeCheck = 0430;
323+
LastUpgradeCheck = 0500;
324324
};
325325
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ImageDemo" */;
326326
compatibilityVersion = "Xcode 3.2";
@@ -451,6 +451,7 @@
451451
GCC_C_LANGUAGE_STANDARD = c99;
452452
GCC_WARN_ABOUT_RETURN_TYPE = YES;
453453
GCC_WARN_UNUSED_VARIABLE = YES;
454+
ONLY_ACTIVE_ARCH = YES;
454455
SDKROOT = iphoneos;
455456
TARGETED_DEVICE_FAMILY = 2;
456457
};

‎Examples/ImageDemo/ImageDemo.xcodeproj/xcshareddata/xcschemes/ImageDemo.xcscheme‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3+
LastUpgradeVersion = "0500"
34
version = "1.3">
45
<BuildAction
56
parallelizeBuildables = "YES"

‎Examples/SpringBoard/SpringBoard.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
29B97313FDCFA39411CA2CEA /* Project object */ = {
207207
isa = PBXProject;
208208
attributes = {
209-
LastUpgradeCheck = 0430;
209+
LastUpgradeCheck = 0500;
210210
};
211211
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SpringBoard" */;
212212
compatibilityVersion = "Xcode 3.2";
@@ -306,6 +306,7 @@
306306
GCC_C_LANGUAGE_STANDARD = c99;
307307
GCC_WARN_ABOUT_RETURN_TYPE = YES;
308308
GCC_WARN_UNUSED_VARIABLE = YES;
309+
ONLY_ACTIVE_ARCH = YES;
309310
SDKROOT = iphoneos;
310311
TARGETED_DEVICE_FAMILY = 2;
311312
};

‎Examples/SpringBoard/SpringBoard.xcodeproj/xcshareddata/xcschemes/SpringBoard.xcscheme‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3+
LastUpgradeVersion = "0500"
34
version = "1.3">
45
<BuildAction
56
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)