From 34cf9bae386af62b1e2333c41af920381a4dbf8a Mon Sep 17 00:00:00 2001 From: John Wang Date: Sat, 9 Jul 2011 15:28:42 -1000 Subject: [PATCH] Add core data dependency --- .../TTCatalog.xcodeproj/project.pbxproj | 34 +++++++++++++ .../Headers/NSFetchedResultsDataSource.h | 3 ++ .../Three20UI.xcodeproj/project.pbxproj | 50 +++++++++++++++++++ 3 files changed, 87 insertions(+) diff --git a/samples/TTCatalog/TTCatalog.xcodeproj/project.pbxproj b/samples/TTCatalog/TTCatalog.xcodeproj/project.pbxproj index b5f7dae69b..cb7e23f6bf 100755 --- a/samples/TTCatalog/TTCatalog.xcodeproj/project.pbxproj +++ b/samples/TTCatalog/TTCatalog.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 2892E4100DC94CBA00A64D0F /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2892E40F0DC94CBA00A64D0F /* CoreGraphics.framework */; }; 28C286E10D94DF7D0034E888 /* CatalogController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28C286E00D94DF7D0034E888 /* CatalogController.m */; }; + 52CDF90A13C936880077BEF5 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52CDF90913C936880077BEF5 /* CoreData.framework */; }; 666E183012944D23001C1D97 /* SplitCatalogController.m in Sources */ = {isa = PBXBuildFile; fileRef = 666E182F12944D23001C1D97 /* SplitCatalogController.m */; }; 6675F5F412945622008DE0A6 /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 6675F5F012945622008DE0A6 /* Default-Landscape.png */; }; 6675F5F512945622008DE0A6 /* Default-Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = 6675F5F112945622008DE0A6 /* Default-Portrait.png */; }; @@ -63,6 +64,20 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 52CDF7FF13C934170077BEF5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6E3794C211B9B6D70011C497 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 662D81EF12630516005851C2; + remoteInfo = "Three20Network-Xcode3.2.5"; + }; + 52CDF80113C934170077BEF5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6E3794C211B9B6D70011C497 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 662D81B2126304EB005851C2; + remoteInfo = "Three20NetworkUnitTests-Xcode3.2.5"; + }; 6E3794D311B9B6D70011C497 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 6E3794BF11B9B6D70011C497 /* Three20Core.xcodeproj */; @@ -222,6 +237,7 @@ 28C286DF0D94DF7D0034E888 /* CatalogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CatalogController.h; sourceTree = ""; }; 28C286E00D94DF7D0034E888 /* CatalogController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CatalogController.m; sourceTree = ""; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 52CDF90913C936880077BEF5 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; 665E998712662FFA0025FA42 /* TTCatalog-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "TTCatalog-Info.plist"; sourceTree = ""; }; 666E182E12944D23001C1D97 /* SplitCatalogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SplitCatalogController.h; sourceTree = ""; }; 666E182F12944D23001C1D97 /* SplitCatalogController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SplitCatalogController.m; sourceTree = ""; }; @@ -308,6 +324,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 52CDF90A13C936880077BEF5 /* CoreData.framework in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 2892E4100DC94CBA00A64D0F /* CoreGraphics.framework in Frameworks */, @@ -400,6 +417,7 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + 52CDF90913C936880077BEF5 /* CoreData.framework */, BE1D84390F8D104B00EC8BB8 /* QuartzCore.framework */, 2892E40F0DC94CBA00A64D0F /* CoreGraphics.framework */, 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */, @@ -430,7 +448,9 @@ isa = PBXGroup; children = ( 6E3794DA11B9B6D70011C497 /* libThree20Network.a */, + 52CDF80013C934170077BEF5 /* libThree20Network-Xcode3.2.5.a */, 6E3794DC11B9B6D70011C497 /* NetworkUnitTests.octest */, + 52CDF80213C934170077BEF5 /* NetworkUnitTests-Xcode3.2.5.octest */, ); name = Products; sourceTree = ""; @@ -857,6 +877,20 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ + 52CDF80013C934170077BEF5 /* libThree20Network-Xcode3.2.5.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20Network-Xcode3.2.5.a"; + remoteRef = 52CDF7FF13C934170077BEF5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 52CDF80213C934170077BEF5 /* NetworkUnitTests-Xcode3.2.5.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "NetworkUnitTests-Xcode3.2.5.octest"; + remoteRef = 52CDF80113C934170077BEF5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 6E3794D411B9B6D70011C497 /* libThree20Core.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; diff --git a/src/Three20UI/Headers/NSFetchedResultsDataSource.h b/src/Three20UI/Headers/NSFetchedResultsDataSource.h index d5fb10141d..03353cc8e4 100644 --- a/src/Three20UI/Headers/NSFetchedResultsDataSource.h +++ b/src/Three20UI/Headers/NSFetchedResultsDataSource.h @@ -6,7 +6,10 @@ // Copyright 2010 Shopify. All rights reserved. // +#import "Three20UI/TTSectionedDataSource.h" + #import +#import @interface NSFetchedResultsDataSource : TTSectionedDataSource { diff --git a/src/Three20UI/Three20UI.xcodeproj/project.pbxproj b/src/Three20UI/Three20UI.xcodeproj/project.pbxproj index 9452ee2b3e..9f936e3ee0 100755 --- a/src/Three20UI/Three20UI.xcodeproj/project.pbxproj +++ b/src/Three20UI/Three20UI.xcodeproj/project.pbxproj @@ -7,6 +7,11 @@ objects = { /* Begin PBXBuildFile section */ + 52CDF88C13C934C30077BEF5 /* TTTableViewCoreDataController.h in Headers */ = {isa = PBXBuildFile; fileRef = 52CDF88B13C934C30077BEF5 /* TTTableViewCoreDataController.h */; }; + 52CDF88F13C934DA0077BEF5 /* TTTableViewCoreDataController.m in Sources */ = {isa = PBXBuildFile; fileRef = 52CDF88D13C934DA0077BEF5 /* TTTableViewCoreDataController.m */; }; + 52CDF89013C934DA0077BEF5 /* NSFetchedResultsDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 52CDF88E13C934DA0077BEF5 /* NSFetchedResultsDataSource.m */; }; + 52CDF89213C935040077BEF5 /* NSFetchedResultsDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 52CDF89113C935040077BEF5 /* NSFetchedResultsDataSource.h */; }; + 52CDF95013C936B10077BEF5 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52CDF94F13C936B10077BEF5 /* CoreData.framework */; }; 666E18E912945430001C1D97 /* TTSplitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 666E18E712945430001C1D97 /* TTSplitViewController.m */; }; 666E18F51294543F001C1D97 /* TTSplitViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 666E18F41294543F001C1D97 /* TTSplitViewController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 66ADC8C91290AC0200855386 /* TTExtensionsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 66ADC8C61290AC0200855386 /* TTExtensionsController.m */; }; @@ -283,6 +288,20 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 52CDF86213C934A50077BEF5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6EE7389D1184ADB400A35176 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 662D81EF12630516005851C2; + remoteInfo = "Three20Network-Xcode3.2.5"; + }; + 52CDF86413C934A50077BEF5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6EE7389D1184ADB400A35176 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 662D81B2126304EB005851C2; + remoteInfo = "Three20NetworkUnitTests-Xcode3.2.5"; + }; 6E6454A61184D42800F08CB1 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 6E6454A11184D42800F08CB1 /* Three20Style.xcodeproj */; @@ -433,6 +452,11 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 52CDF88B13C934C30077BEF5 /* TTTableViewCoreDataController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TTTableViewCoreDataController.h; path = Headers/TTTableViewCoreDataController.h; sourceTree = ""; }; + 52CDF88D13C934DA0077BEF5 /* TTTableViewCoreDataController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TTTableViewCoreDataController.m; path = Sources/TTTableViewCoreDataController.m; sourceTree = ""; }; + 52CDF88E13C934DA0077BEF5 /* NSFetchedResultsDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSFetchedResultsDataSource.m; path = Sources/NSFetchedResultsDataSource.m; sourceTree = ""; }; + 52CDF89113C935040077BEF5 /* NSFetchedResultsDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSFetchedResultsDataSource.h; path = Headers/NSFetchedResultsDataSource.h; sourceTree = ""; }; + 52CDF94F13C936B10077BEF5 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; 666E18E712945430001C1D97 /* TTSplitViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TTSplitViewController.m; path = Sources/TTSplitViewController.m; sourceTree = ""; }; 666E18F41294543F001C1D97 /* TTSplitViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TTSplitViewController.h; path = Headers/TTSplitViewController.h; sourceTree = ""; }; 66ADC8C61290AC0200855386 /* TTExtensionsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TTExtensionsController.m; path = Sources/TTExtensionsController.m; sourceTree = ""; }; @@ -719,6 +743,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 52CDF95013C936B10077BEF5 /* CoreData.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -785,6 +810,7 @@ 6E08B743118397FA00DA1579 /* Dependencies */ = { isa = PBXGroup; children = ( + 52CDF94F13C936B10077BEF5 /* CoreData.framework */, 6EE7366611849C5800A35176 /* Three20Core.xcodeproj */, 6EE7389D1184ADB400A35176 /* Three20Network.xcodeproj */, 6E6454A11184D42800F08CB1 /* Three20Style.xcodeproj */, @@ -1299,6 +1325,8 @@ 6E6458281184DF5F00F08CB1 /* Table Controller */ = { isa = PBXGroup; children = ( + 52CDF88D13C934DA0077BEF5 /* TTTableViewCoreDataController.m */, + 52CDF88B13C934C30077BEF5 /* TTTableViewCoreDataController.h */, 6E6455291184D4C500F08CB1 /* TTTableViewController.h */, 6E6456591184D4DA00F08CB1 /* TTTableViewController.m */, ); @@ -1346,6 +1374,8 @@ 6E64582C1184DFC500F08CB1 /* Table Data Source */ = { isa = PBXGroup; children = ( + 52CDF89113C935040077BEF5 /* NSFetchedResultsDataSource.h */, + 52CDF88E13C934DA0077BEF5 /* NSFetchedResultsDataSource.m */, 6E64552A1184D4C500F08CB1 /* TTTableViewDataSource.h */, 6E64565A1184D4DA00F08CB1 /* TTTableViewDataSource.m */, 6E64582D1184DFEF00F08CB1 /* Table Data Sources */, @@ -1704,7 +1734,9 @@ isa = PBXGroup; children = ( 6EE738A31184ADB400A35176 /* libThree20Network.a */, + 52CDF86313C934A50077BEF5 /* libThree20Network-Xcode3.2.5.a */, 6EE738A51184ADB400A35176 /* NetworkUnitTests.octest */, + 52CDF86513C934A50077BEF5 /* NetworkUnitTests-Xcode3.2.5.octest */, ); name = Products; sourceTree = ""; @@ -1859,6 +1891,8 @@ 666E18F51294543F001C1D97 /* TTSplitViewController.h in Headers */, 66F2E85412D426A5006FB485 /* TTTableFooterInfiniteScrollView.h in Headers */, 66F2E85F12D426DA006FB485 /* TTTableViewNetworkEnabledDelegate.h in Headers */, + 52CDF88C13C934C30077BEF5 /* TTTableViewCoreDataController.h in Headers */, + 52CDF89213C935040077BEF5 /* NSFetchedResultsDataSource.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1964,6 +1998,20 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ + 52CDF86313C934A50077BEF5 /* libThree20Network-Xcode3.2.5.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20Network-Xcode3.2.5.a"; + remoteRef = 52CDF86213C934A50077BEF5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 52CDF86513C934A50077BEF5 /* NetworkUnitTests-Xcode3.2.5.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "NetworkUnitTests-Xcode3.2.5.octest"; + remoteRef = 52CDF86413C934A50077BEF5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 6E6454A71184D42800F08CB1 /* libThree20Style.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -2219,6 +2267,8 @@ 666E18E912945430001C1D97 /* TTSplitViewController.m in Sources */, 66F2E85712D426AF006FB485 /* TTTableFooterInfiniteScrollView.m in Sources */, 66F2E86512D426EF006FB485 /* TTTableViewNetworkEnabledDelegate.m in Sources */, + 52CDF88F13C934DA0077BEF5 /* TTTableViewCoreDataController.m in Sources */, + 52CDF89013C934DA0077BEF5 /* NSFetchedResultsDataSource.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };