Permalink
Browse files

Merge pull request #684 from facebook/development

Three20 1.0.9
  • Loading branch information...
2 parents 0e27b65 + ba3f8f2 commit f4f9bc60bd7a56a50b9cc00797b30d0bc2703e94 @jwang jwang committed Sep 13, 2011
Showing with 2,523 additions and 2,497 deletions.
  1. BIN Icon.png
  2. +0 −30 samples/Style/TTCSSStyleSheets/TTCSSStyleSheets.xcodeproj/project.pbxproj
  3. +16 −0 samples/TTCatalog/Classes/ButtonTestController.m
  4. +1 −1 samples/TTCatalog/Classes/StyleTestController.m
  5. +2 −212 samples/TTNavigatorDemo/TTNavigatorDemo.xcodeproj/project.pbxproj
  6. BIN src/Three20.bundle/images/photoDefault.png
  7. BIN src/Three20.bundle/images/photoDefault@2x.png
  8. +10 −0 src/Three20Core/Headers/NSStringAdditions.h
  9. +87 −0 src/Three20Core/Headers/TTAvailability.h
  10. +1 −0 src/Three20Core/Headers/Three20Core.h
  11. +17 −1 src/Three20Core/Sources/NSStringAdditions.m
  12. +33 −0 src/Three20Core/Sources/TTAvailability.m
  13. +2 −2 src/Three20Core/Sources/Three20Version.m
  14. +8 −0 src/Three20Core/Three20Core.xcodeproj/project.pbxproj
  15. +70 −0 src/Three20Core/UnitTests/CoreAdditionTests.m
  16. +1 −1 src/Three20Network/Sources/TTURLCache.m
  17. +0 −309 src/Three20Network/Three20Network.xcodeproj/project.pbxproj
  18. +1 −1 src/Three20Style/Sources/TTBevelBorderStyle.m
  19. +1 −1 src/Three20Style/Sources/TTFlowLayout.m
  20. +1 −1 src/Three20Style/Sources/TTGlobalStyle.m
  21. +2 −2 src/Three20Style/Sources/TTGridLayout.m
  22. +1 −1 src/Three20Style/Sources/TTRectangleShape.m
  23. +1 −1 src/Three20Style/Sources/TTRoundedRectangleShape.m
  24. +2 −2 src/Three20Style/Sources/TTShapeInternal.m
  25. +7 −7 src/Three20Style/Sources/TTSpeechBubbleShape.m
  26. +1 −1 src/Three20Style/Sources/TTStyledLayout.m
  27. +1 −0 src/Three20Style/Sources/TTStyledTextParser.m
  28. +6 −6 src/Three20UI/Sources/TTActivityLabel.m
  29. +2 −2 src/Three20UI/Sources/TTButton.m
  30. +3 −3 src/Three20UI/Sources/TTButtonBar.m
  31. +8 −0 src/Three20UI/Sources/TTButtonContent.m
  32. +4 −4 src/Three20UI/Sources/TTErrorView.m
  33. +1 −1 src/Three20UI/Sources/TTLauncherHighlightView.m
  34. +7 −7 src/Three20UI/Sources/TTLauncherView.m
  35. +1 −1 src/Three20UI/Sources/TTMessageController.m
  36. +1 −1 src/Three20UI/Sources/TTPageControl.m
  37. +6 −16 src/Three20UI/Sources/TTPhotoView.m
  38. +12 −15 src/Three20UI/Sources/TTPickerTextField.m
  39. +3 −3 src/Three20UI/Sources/TTPickerViewCell.m
  40. +2 −2 src/Three20UI/Sources/TTPostController.m
  41. +6 −6 src/Three20UI/Sources/TTScrollView.m
  42. +8 −8 src/Three20UI/Sources/TTSearchBar.m
  43. +3 −3 src/Three20UI/Sources/TTSearchTextField.m
  44. +2 −2 src/Three20UI/Sources/TTSearchlightLabel.m
  45. +1 −1 src/Three20UI/Sources/TTStyledTextLabel.m
  46. +1 −1 src/Three20UI/Sources/TTStyledTextTableItemCell.m
  47. +5 −5 src/Three20UI/Sources/TTTabBarInternal.m
  48. +2 −2 src/Three20UI/Sources/TTTableCaptionItemCell.m
  49. +2 −2 src/Three20UI/Sources/TTTableControlCell.m
  50. +1 −1 src/Three20UI/Sources/TTTableFooterInfiniteScrollView.m
  51. +2 −2 src/Three20UI/Sources/TTTableImageItemCell.m
  52. +3 −3 src/Three20UI/Sources/TTTableMessageItemCell.m
  53. +1 −1 src/Three20UI/Sources/TTTableMoreButtonCell.m
  54. +6 −1 src/Three20UI/Sources/TTTableSubtitleItemCell.m
  55. +1 −1 src/Three20UI/Sources/TTTableTextItemCell.m
  56. +3 −3 src/Three20UI/Sources/TTTableView.m
  57. +5 −5 src/Three20UI/Sources/TTTableViewCell.m
  58. +2 −2 src/Three20UI/Sources/TTTableViewController.m
  59. +26 −0 src/Three20UI/Sources/TTTableViewDelegate.m
  60. +2 −2 src/Three20UI/Sources/TTTableViewGroupedVarHeightDelegate.m
  61. +1 −1 src/Three20UI/Sources/TTTableViewNetworkEnabledDelegate.m
  62. +2 −2 src/Three20UI/Sources/TTTextBarController.m
  63. +4 −4 src/Three20UI/Sources/TTTextEditor.m
  64. +2 −2 src/Three20UI/Sources/TTThumbsDataSource.m
  65. +2 −2 src/Three20UI/Sources/TTThumbsTableViewCell.m
  66. +1 −1 src/Three20UI/Sources/TTThumbsViewController.m
  67. +13 −5 src/Three20UI/Sources/TTWebController.m
  68. +2 −2 src/Three20UI/Sources/TTYouTubeView.m
  69. +8 −3 src/Three20UI/Sources/UITableViewAdditions.m
  70. +4 −4 src/Three20UI/Sources/UIViewAdditions.m
  71. +5 −0 src/Three20UICommon/Headers/TTGlobalUICommon.h
  72. +44 −13 src/Three20UICommon/Sources/TTGlobalUICommon.m
  73. +7 −5 src/extThree20CSSStyle/Sources/TTDefaultCSSStyleSheet.m
  74. +0 −30 src/extThree20CSSStyle/extThree20CSSStyle.xcodeproj/project.pbxproj
  75. +4 −4 src/extThree20JSON/Source/TTExtensionLoader.m
  76. +3 −3 src/extThree20JSON/Source/TTURLJSONResponse.m
  77. +1 −1 src/extThree20JSON/UnitTests/extJSONTests+SBJSON.m
  78. +0 −201 src/extThree20JSON/Vendors/JSON/Changes.markdown
  79. +337 −0 src/extThree20JSON/Vendors/JSON/Changes.md
  80. +0 −61 src/extThree20JSON/Vendors/JSON/Credits.markdown
  81. +40 −0 src/extThree20JSON/Vendors/JSON/Credits.md
  82. +0 −69 src/extThree20JSON/Vendors/JSON/JSON.h
  83. +24 −0 src/extThree20JSON/Vendors/JSON/LICENSE
  84. +26 −12 src/extThree20JSON/Vendors/JSON/NSObject+SBJSON.h
  85. +26 −18 src/extThree20JSON/Vendors/JSON/NSObject+SBJSON.m
  86. +6 −8 src/extThree20JSON/Vendors/JSON/NSString+SBJSON.m
  87. +0 −28 src/extThree20JSON/Vendors/JSON/Readme.markdown
  88. +85 −0 src/extThree20JSON/Vendors/JSON/Readme.md
  89. +6 −0 src/extThree20JSON/Vendors/JSON/ReleaseChecklist.md
  90. +84 −0 src/extThree20JSON/Vendors/JSON/SBJson.h
  91. +0 −86 src/extThree20JSON/Vendors/JSON/SBJsonBase.h
  92. +35 −41 src/extThree20JSON/Vendors/JSON/SBJsonParser.h
  93. +11 −27 src/extThree20JSON/Vendors/JSON/SBJsonParser.m
  94. +49 −18 src/extThree20JSON/Vendors/JSON/SBJsonStreamParser.h
  95. +101 −172 src/extThree20JSON/Vendors/JSON/SBJsonStreamParser.m
  96. +7 −28 src/extThree20JSON/Vendors/JSON/{NSObject+JSON.h → SBJsonStreamParserAccumulator.h}
  97. +15 −42 src/extThree20JSON/Vendors/JSON/{SBJsonBase.m → SBJsonStreamParserAccumulator.m}
  98. +72 −12 src/extThree20JSON/Vendors/JSON/SBJsonStreamParserAdapter.h
  99. +7 −11 src/extThree20JSON/Vendors/JSON/SBJsonStreamParserAdapter.m
  100. +1 −9 src/extThree20JSON/Vendors/JSON/SBJsonStreamParserState.h
  101. +61 −84 src/extThree20JSON/Vendors/JSON/SBJsonStreamParserState.m
  102. +64 −33 src/extThree20JSON/Vendors/JSON/SBJsonStreamWriter.h
  103. +145 −142 src/extThree20JSON/Vendors/JSON/SBJsonStreamWriter.m
  104. +39 −0 src/extThree20JSON/Vendors/JSON/SBJsonStreamWriterAccumulator.h
  105. +18 −22 src/extThree20JSON/Vendors/JSON/{NSObject+JSON.m → SBJsonStreamWriterAccumulator.m}
  106. +1 −7 src/extThree20JSON/Vendors/JSON/SBJsonStreamWriterState.h
  107. +46 −39 src/extThree20JSON/Vendors/JSON/SBJsonStreamWriterState.m
  108. +35 −35 src/extThree20JSON/Vendors/JSON/SBJsonTokeniser.h
  109. +402 −454 src/extThree20JSON/Vendors/JSON/SBJsonTokeniser.m
  110. +59 −0 src/extThree20JSON/Vendors/JSON/SBJsonUTF8Stream.h
  111. +143 −0 src/extThree20JSON/Vendors/JSON/SBJsonUTF8Stream.m
  112. +6 −23 src/extThree20JSON/Vendors/JSON/SBJsonWriter.h
  113. +16 −5 src/extThree20JSON/Vendors/JSON/SBJsonWriter.m
  114. +49 −43 src/extThree20JSON/extThree20JSON.xcodeproj/project.pbxproj
View
BIN Icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -33,20 +33,6 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 187835D313D5F7C2004600D3 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E3793D711B9B59D0011C497 /* Three20Network.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 662D81EF12630516005851C2;
- remoteInfo = "Three20Network-Xcode3.2.5";
- };
- 187835D513D5F7C2004600D3 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E3793D711B9B59D0011C497 /* Three20Network.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 662D81B2126304EB005851C2;
- remoteInfo = "Three20NetworkUnitTests-Xcode3.2.5";
- };
6E036BCC11B38E520025E8EE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E036BC711B38E520025E8EE /* extThree20CSSStyle.xcodeproj */;
@@ -369,9 +355,7 @@
isa = PBXGroup;
children = (
6E3793EF11B9B59D0011C497 /* libThree20Network.a */,
- 187835D413D5F7C2004600D3 /* libThree20Network-Xcode3.2.5.a */,
6E3793F111B9B59D0011C497 /* NetworkUnitTests.octest */,
- 187835D613D5F7C2004600D3 /* NetworkUnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
@@ -562,20 +546,6 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
- 187835D413D5F7C2004600D3 /* libThree20Network-Xcode3.2.5.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libThree20Network-Xcode3.2.5.a";
- remoteRef = 187835D313D5F7C2004600D3 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 187835D613D5F7C2004600D3 /* NetworkUnitTests-Xcode3.2.5.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = "NetworkUnitTests-Xcode3.2.5.octest";
- remoteRef = 187835D513D5F7C2004600D3 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
6E036BCD11B38E520025E8EE /* libextThree20CSSStyle.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@@ -78,6 +78,18 @@ - (TTStyle*)dropButton:(UIControlState)state {
}
}
+- (TTStyle*)remoteAvatarButton:(UIControlState)state {
+ if (state == UIControlStateHighlighted) {
+ return [TTSolidFillStyle styleWithColor:[UIColor whiteColor] next:nil];
+ } else {
+ return [TTImageStyle styleWithImageURL:nil
+ defaultImage:[UIImage imageNamed:@"defaultPerson.png"]
+ contentMode:UIViewContentModeCenter
+ size:CGSizeMake(50, 50)
+ next:nil];
+ }
+}
+
@end
@implementation ButtonTestController
@@ -142,6 +154,9 @@ - (void)loadView {
scrollView.delaysContentTouches = NO;
self.view = scrollView;
+ TTButton* remoteAvatarButton = [TTButton buttonWithStyle:@"remoteAvatarButton:"];
+ [remoteAvatarButton setImage:@"url" forState:UIControlStateNormal];
+
NSArray* buttons = [NSArray arrayWithObjects:
[TTButton buttonWithStyle:@"toolbarButton:" title:@"Toolbar Button"],
[TTButton buttonWithStyle:@"toolbarRoundButton:" title:@"Round Button"],
@@ -152,6 +167,7 @@ - (void)loadView {
[TTButton buttonWithStyle:@"blueToolbarButton:" title:@"Blue Button"],
[TTButton buttonWithStyle:@"embossedButton:" title:@"Embossed Button"],
[TTButton buttonWithStyle:@"dropButton:" title:@"Shadow Button"],
+ remoteAvatarButton,
nil];
for (TTButton* button in buttons) {
@@ -157,7 +157,7 @@ - (void)loadView {
nil];
- CGFloat padding = 10;
+ CGFloat padding = 10.0f;
CGFloat viewWidth = scrollView.width/2 - padding*2;
CGFloat viewHeight = TT_ROW_HEIGHT;
@@ -30,104 +30,6 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 66D12A7F1274CB1D00E567B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E37957011B9B7560011C497 /* Three20Core.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 6650CAA21262F6E2003FF804;
- remoteInfo = "Three20Core-Xcode3.2.5";
- };
- 66D12A831274CB1D00E567B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E37957011B9B7560011C497 /* Three20Core.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 664961641262EE5000C2C80E;
- remoteInfo = "Three20CoreUnitTests-Xcode3.2.5";
- };
- 66D12A8C1274CB1D00E567B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E37957311B9B7560011C497 /* Three20Network.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 662D81EF12630516005851C2;
- remoteInfo = "Three20Network-Xcode3.2.5";
- };
- 66D12A901274CB1D00E567B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E37957311B9B7560011C497 /* Three20Network.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 662D81B2126304EB005851C2;
- remoteInfo = "Three20NetworkUnitTests-Xcode3.2.5";
- };
- 66D12A991274CB1D00E567B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E37957611B9B7560011C497 /* Three20Style.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 66C16BE912639E2700A7825A;
- remoteInfo = "Three20Style-Xcode3.2.5";
- };
- 66D12A9D1274CB1D00E567B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E37957611B9B7560011C497 /* Three20Style.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 66C16C0112639E4500A7825A;
- remoteInfo = "Three20StyleUnitTests-Xcode3.2.5";
- };
- 66D12AA61274CB1D00E567B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E37957911B9B7560011C497 /* Three20UICommon.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 665A53761264D54B0032D0BE;
- remoteInfo = "Three20UICommon-Xcode3.2.5";
- };
- 66D12AAA1274CB1D00E567B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E37957911B9B7560011C497 /* Three20UICommon.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 665A53891264D54B0032D0BE;
- remoteInfo = "Three20UICommonUnitTests-Xcode3.2.5";
- };
- 66D12AB31274CB1D00E567B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E37957C11B9B7560011C497 /* Three20UINavigator.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 665A54521264DAF70032D0BE;
- remoteInfo = "Three20UINavigator-Xcode3.2.5";
- };
- 66D12AB71274CB1D00E567B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E37957C11B9B7560011C497 /* Three20UINavigator.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 665A54681264DAF70032D0BE;
- remoteInfo = "Three20UINavigatorUnitTests-Xcode3.2.5";
- };
- 66D12AC01274CB1D00E567B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E37957F11B9B7560011C497 /* Three20UI.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 66FC2BC81264E3A400F56B19;
- remoteInfo = "Three20UI-Xcode3.2.5";
- };
- 66D12AC41274CB1D00E567B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E37957F11B9B7560011C497 /* Three20UI.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 66FC2BE61264E3A500F56B19;
- remoteInfo = "Three20UIUnitTests-Xcode3.2.5";
- };
- 66D12ACD1274CB1D00E567B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E7F9900118E396F00443B46 /* Three20.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 665A55DE126521740032D0BE;
- remoteInfo = "Three20-Xcode3.2.5";
- };
- 66D12AD11274CB1D00E567B4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6E7F9900118E396F00443B46 /* Three20.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 665A55FB126521740032D0BE;
- remoteInfo = "Three20UnitTests-Xcode3.2.5";
- };
6E37958411B9B7560011C497 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E37957011B9B7560011C497 /* Three20Core.xcodeproj */;
@@ -406,9 +308,7 @@
isa = PBXGroup;
children = (
6E37958511B9B7560011C497 /* libThree20Core.a */,
- 66D12A801274CB1D00E567B4 /* libThree20Core-Xcode3.2.5.a */,
6E37958711B9B7560011C497 /* CoreUnitTests.octest */,
- 66D12A841274CB1D00E567B4 /* CoreUnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
@@ -417,9 +317,7 @@
isa = PBXGroup;
children = (
6E37958B11B9B7560011C497 /* libThree20Network.a */,
- 66D12A8D1274CB1D00E567B4 /* libThree20Network-Xcode3.2.5.a */,
6E37958D11B9B7560011C497 /* NetworkUnitTests.octest */,
- 66D12A911274CB1D00E567B4 /* NetworkUnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
@@ -428,9 +326,7 @@
isa = PBXGroup;
children = (
6E37959111B9B7560011C497 /* libThree20Style.a */,
- 66D12A9A1274CB1D00E567B4 /* libThree20Style-Xcode3.2.5.a */,
6E37959311B9B7560011C497 /* StyleUnitTests.octest */,
- 66D12A9E1274CB1D00E567B4 /* StyleUnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
@@ -439,9 +335,7 @@
isa = PBXGroup;
children = (
6E37959711B9B7560011C497 /* libThree20UICommon.a */,
- 66D12AA71274CB1D00E567B4 /* libThree20UICommon-Xcode3.2.5.a */,
6E37959911B9B7560011C497 /* UICommonUnitTests.octest */,
- 66D12AAB1274CB1D00E567B4 /* UICommonUnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
@@ -450,9 +344,7 @@
isa = PBXGroup;
children = (
6E37959D11B9B7560011C497 /* libThree20UINavigator.a */,
- 66D12AB41274CB1D00E567B4 /* libThree20UINavigator-Xcode3.2.5.a */,
6E37959F11B9B7560011C497 /* UINavigatorUnitTests.octest */,
- 66D12AB81274CB1D00E567B4 /* UINavigatorUnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
@@ -461,9 +353,7 @@
isa = PBXGroup;
children = (
6E3795A311B9B7560011C497 /* libThree20UI.a */,
- 66D12AC11274CB1D00E567B4 /* libThree20UI-Xcode3.2.5.a */,
6E3795A511B9B7560011C497 /* UIUnitTests.octest */,
- 66D12AC51274CB1D00E567B4 /* UIUnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
@@ -497,9 +387,7 @@
isa = PBXGroup;
children = (
6E7F9906118E396F00443B46 /* libThree20.a */,
- 66D12ACE1274CB1D00E567B4 /* libThree20-Xcode3.2.5.a */,
6E7F9908118E396F00443B46 /* Three20UnitTests.octest */,
- 66D12AD21274CB1D00E567B4 /* Three20UnitTests-Xcode3.2.5.octest */,
);
name = Products;
sourceTree = "<group>";
@@ -587,104 +475,6 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
- 66D12A801274CB1D00E567B4 /* libThree20Core-Xcode3.2.5.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libThree20Core-Xcode3.2.5.a";
- remoteRef = 66D12A7F1274CB1D00E567B4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 66D12A841274CB1D00E567B4 /* CoreUnitTests-Xcode3.2.5.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = "CoreUnitTests-Xcode3.2.5.octest";
- remoteRef = 66D12A831274CB1D00E567B4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 66D12A8D1274CB1D00E567B4 /* libThree20Network-Xcode3.2.5.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libThree20Network-Xcode3.2.5.a";
- remoteRef = 66D12A8C1274CB1D00E567B4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 66D12A911274CB1D00E567B4 /* NetworkUnitTests-Xcode3.2.5.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = "NetworkUnitTests-Xcode3.2.5.octest";
- remoteRef = 66D12A901274CB1D00E567B4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 66D12A9A1274CB1D00E567B4 /* libThree20Style-Xcode3.2.5.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libThree20Style-Xcode3.2.5.a";
- remoteRef = 66D12A991274CB1D00E567B4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 66D12A9E1274CB1D00E567B4 /* StyleUnitTests-Xcode3.2.5.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = "StyleUnitTests-Xcode3.2.5.octest";
- remoteRef = 66D12A9D1274CB1D00E567B4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 66D12AA71274CB1D00E567B4 /* libThree20UICommon-Xcode3.2.5.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libThree20UICommon-Xcode3.2.5.a";
- remoteRef = 66D12AA61274CB1D00E567B4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 66D12AAB1274CB1D00E567B4 /* UICommonUnitTests-Xcode3.2.5.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = "UICommonUnitTests-Xcode3.2.5.octest";
- remoteRef = 66D12AAA1274CB1D00E567B4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 66D12AB41274CB1D00E567B4 /* libThree20UINavigator-Xcode3.2.5.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libThree20UINavigator-Xcode3.2.5.a";
- remoteRef = 66D12AB31274CB1D00E567B4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 66D12AB81274CB1D00E567B4 /* UINavigatorUnitTests-Xcode3.2.5.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = "UINavigatorUnitTests-Xcode3.2.5.octest";
- remoteRef = 66D12AB71274CB1D00E567B4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 66D12AC11274CB1D00E567B4 /* libThree20UI-Xcode3.2.5.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libThree20UI-Xcode3.2.5.a";
- remoteRef = 66D12AC01274CB1D00E567B4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 66D12AC51274CB1D00E567B4 /* UIUnitTests-Xcode3.2.5.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = "UIUnitTests-Xcode3.2.5.octest";
- remoteRef = 66D12AC41274CB1D00E567B4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 66D12ACE1274CB1D00E567B4 /* libThree20-Xcode3.2.5.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libThree20-Xcode3.2.5.a";
- remoteRef = 66D12ACD1274CB1D00E567B4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 66D12AD21274CB1D00E567B4 /* Three20UnitTests-Xcode3.2.5.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = "Three20UnitTests-Xcode3.2.5.octest";
- remoteRef = 66D12AD11274CB1D00E567B4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
6E37958511B9B7560011C497 /* libThree20Core.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@@ -862,7 +652,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
INFOPLIST_FILE = Info.plist;
- SDKROOT = iphoneos4.1;
+ SDKROOT = iphoneos;
};
name = Debug;
};
@@ -872,7 +662,7 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
INFOPLIST_FILE = Info.plist;
- SDKROOT = iphoneos4.1;
+ SDKROOT = iphoneos;
};
name = Release;
};
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit f4f9bc6

Please sign in to comment.