Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated all example projects to build against the new project. Cleane…

…d up header imports for flattened project structure
  • Loading branch information...
commit 563f5e909b46974c3a7e8c8ca0ccef5d502b45d0 1 parent f5008ff
@blakewatters blakewatters authored
Showing with 5,303 additions and 3,047 deletions.
  1. +1 −1  Code/CoreData/CoreData.h
  2. +3 −3 Code/CoreData/NSManagedObject+ActiveRecord.m
  3. +1 −1  Code/CoreData/RKManagedObjectLoader.h
  4. +3 −3 Code/CoreData/RKManagedObjectLoader.m
  5. +1 −1  Code/CoreData/RKManagedObjectMapping.h
  6. +1 −1  Code/CoreData/RKManagedObjectMapping.m
  7. +1 −1  Code/CoreData/RKManagedObjectMappingOperation.h
  8. +1 −1  Code/CoreData/RKManagedObjectMappingOperation.m
  9. +1 −1  Code/CoreData/RKManagedObjectSeeder.h
  10. +1 −1  Code/CoreData/RKManagedObjectSeeder.m
  11. +1 −1  Code/CoreData/RKObjectPropertyInspector+CoreData.h
  12. +2 −2 Code/CoreData/RKObjectPropertyInspector+CoreData.m
  13. +1 −1  Code/Network/NSData+MD5.m
  14. +1 −1  Code/Network/NSDictionary+RKRequestSerialization.m
  15. +1 −1  Code/Network/NSString+MD5.m
  16. +4 −4 Code/Network/RKClient.m
  17. +1 −1  Code/Network/RKOAuthClient.m
  18. +1 −1  Code/Network/RKParams.m
  19. +1 −1  Code/Network/RKParamsAttachment.m
  20. +1 −1  Code/Network/RKReachabilityObserver.m
  21. +1 −1  Code/Network/RKRequest.m
  22. +2 −2 Code/Network/RKRequestQueue.m
  23. +1 −1  Code/Network/RKRequestSerialization.h
  24. +1 −1  Code/ObjectMapping/RKDynamicObjectMapping.m
  25. +1 −1  Code/ObjectMapping/RKObjectLoader.h
  26. +1 −1  Code/ObjectMapping/RKObjectLoader.m
  27. +1 −1  Code/ObjectMapping/RKObjectManager.h
  28. +3 −3 Code/ObjectMapping/RKObjectManager.m
  29. +1 −1  Code/ObjectMapping/RKObjectMapper.h
  30. +1 −1  Code/ObjectMapping/RKObjectMapperError.h
  31. +1 −1  Code/ObjectMapping/RKObjectMapping.m
  32. +2 −2 Code/ObjectMapping/RKObjectMappingOperation.m
  33. +1 −1  Code/ObjectMapping/RKObjectMappingResult.m
  34. +1 −1  Code/ObjectMapping/RKObjectRouter.h
  35. +1 −1  Code/ObjectMapping/RKObjectSerializer.h
  36. +3 −3 Code/ObjectMapping/RKObjectSerializer.m
  37. +2 −2 Code/ObjectMapping/RKParserRegistry.h
  38. +1 −1  Code/ObjectMapping/RKRouter.h
  39. +3 −3 Code/RestKit.h
  40. +1 −1  Code/Support/NSString+RestKit.m
  41. +1 −1  Examples/RKCatalog/App/RKCatalog.h
  42. +1 −1  Examples/RKCatalog/Examples/RKCoreDataExample/RKCoreDataExample.m
  43. +1 −1  Examples/RKCatalog/Examples/RKRelationshipMappingExample/RKRelationshipMappingExample.m
  44. +44 −194 Examples/RKCatalog/RKCatalog.xcodeproj/project.pbxproj
  45. +1 −1  Examples/RKDiscussionBoardExample/DiscussionBoard/Code/Models/DBContentObject.h
  46. +1 −1  Examples/RKDiscussionBoardExample/DiscussionBoard/Code/Models/DBPost.h
  47. +1 −1  Examples/RKDiscussionBoardExample/DiscussionBoard/Code/Models/DBPost.m
  48. +1 −1  Examples/RKDiscussionBoardExample/DiscussionBoard/Code/Models/DBUser.h
  49. +39 −184 Examples/RKDiscussionBoardExample/DiscussionBoard/DiscussionBoard.xcodeproj/project.pbxproj
  50. +8 −30 Examples/RKTwitter/RKTwitter.xcodeproj/project.pbxproj
  51. +1 −1  Examples/RKTwitterCoreData/Classes/RKTStatus.h
  52. +1 −1  Examples/RKTwitterCoreData/Classes/RKTwitterAppDelegate.m
  53. +39 −158 Examples/RKTwitterCoreData/RKTwitterCoreData.xcodeproj/project.pbxproj
  54. +42 −153 Examples/RestKit CLI/RestKit CLI.xcodeproj/project.pbxproj
  55. +5 −6 README.md
  56. +2 −2 Resources/PLISTs/RestKitFramework-Info.plist
  57. +132 −101 RestKit.xcodeproj/project.pbxproj
  58. +4 −5 Specs/Network/RKParamsSpec.m
  59. +4 −0 Specs/Network/RKRequestQueueSpec.m
  60. +4 −0 Specs/Network/RKRequestSpec.m
  61. 0  Specs/Runner/{OCHamcrestIOS.framework → OCHamcrest/OCHamcrest.framework}/Headers
  62. +1 −0  Specs/Runner/OCHamcrest/OCHamcrest.framework/OCHamcrest
  63. 0  Specs/Runner/{OCHamcrestIOS.framework → OCHamcrest/OCHamcrest.framework}/Resources
  64. +43 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCAllOf.h
  65. +43 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCAnyOf.h
  66. +40 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCAssertThat.h
  67. +31 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCBaseDescription.h
  68. +25 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCBaseMatcher.h
  69. +1 −1  Specs/Runner/{OCHamcrestIOS.framework → OCHamcrest/OCHamcrest.framework}/Versions/A/Headers/HCBoxNumber.h
  70. +1 −0  ...ner/{OCHamcrestIOS.framework → OCHamcrest/OCHamcrest.framework}/Versions/A/Headers/HCCollectMatchers.h
  71. +48 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCDescribedAs.h
  72. 0  .../Runner/{OCHamcrestIOS.framework → OCHamcrest/OCHamcrest.framework}/Versions/A/Headers/HCDescription.h
  73. +61 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCHasCount.h
  74. +42 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCHasDescription.h
  75. +49 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCHasProperty.h
  76. +62 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCInvocationMatcher.h
  77. +52 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIs.h
  78. +61 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsAnything.h
  79. +45 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsCloseTo.h
  80. +67 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsCollectionContaining.h
  81. +45 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsCollectionContainingInAnyOrder.h
  82. +43 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsCollectionContainingInOrder.h
  83. +50 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsCollectionOnlyContaining.h
  84. +52 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsDictionaryContaining.h
  85. +51 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsDictionaryContainingEntries.h
  86. +47 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsDictionaryContainingKey.h
  87. +47 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsDictionaryContainingValue.h
  88. +34 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsEmptyCollection.h
  89. +42 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsEqual.h
  90. +47 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsEqualIgnoringCase.h
  91. +48 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsEqualIgnoringWhiteSpace.h
  92. +323 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsEqualToNumber.h
  93. +40 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsIn.h
  94. +43 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsInstanceOf.h
  95. +45 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsNil.h
  96. +45 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsNot.h
  97. +40 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCIsSame.h
  98. +54 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCMatcher.h
  99. +114 −111 ...Runner/{OCHamcrestIOS.framework → OCHamcrest/OCHamcrest.framework}/Versions/A/Headers/HCNumberAssert.h
  100. +113 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCOrderingComparison.h
  101. +1 −0  ...{OCHamcrestIOS.framework → OCHamcrest/OCHamcrest.framework}/Versions/A/Headers/HCRequireNonNilObject.h
  102. +2 −0  ...{OCHamcrestIOS.framework → OCHamcrest/OCHamcrest.framework}/Versions/A/Headers/HCRequireNonNilString.h
  103. 0  ...nner/{OCHamcrestIOS.framework → OCHamcrest/OCHamcrest.framework}/Versions/A/Headers/HCSelfDescribing.h
  104. +43 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCStringContains.h
  105. +48 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCStringContainsInOrder.h
  106. +41 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCStringDescription.h
  107. +43 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCStringEndsWith.h
  108. +43 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCStringStartsWith.h
  109. +18 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/HCSubstringMatcher.h
  110. +2 −0  ...unner/{OCHamcrestIOS.framework → OCHamcrest/OCHamcrest.framework}/Versions/A/Headers/HCWrapInMatcher.h
  111. 0  ...stIOS.framework → OCHamcrest/OCHamcrest.framework}/Versions/A/Headers/NSObject+HCSelfDescribingValue.h
  112. +134 −0 Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/Headers/OCHamcrest.h
  113. BIN  Specs/Runner/OCHamcrest/OCHamcrest.framework/Versions/A/OCHamcrest
  114. +7 −7 Specs/Runner/{OCHamcrestIOS.framework → OCHamcrest/OCHamcrest.framework}/Versions/A/Resources/Info.plist
  115. 0  Specs/Runner/{OCHamcrestIOS.framework → OCHamcrest/OCHamcrest.framework}/Versions/Current
  116. +1 −0  Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Headers
  117. 0  Specs/Runner/{ → OCHamcrest}/OCHamcrestIOS.framework/OCHamcrestIOS
  118. +1 −0  Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Resources
  119. +43 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCAllOf.h
  120. +43 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCAnyOf.h
  121. +40 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCAssertThat.h
  122. 0  Specs/Runner/{ → OCHamcrest}/OCHamcrestIOS.framework/Versions/A/Headers/HCBaseDescription.h
  123. +3 −3 Specs/Runner/{ → OCHamcrest}/OCHamcrestIOS.framework/Versions/A/Headers/HCBaseMatcher.h
  124. +88 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCBoxNumber.h
  125. +21 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCCollectMatchers.h
  126. +48 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCDescribedAs.h
  127. +55 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCDescription.h
  128. +61 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCHasCount.h
  129. +42 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCHasDescription.h
  130. +49 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCHasProperty.h
  131. 0  Specs/Runner/{ → OCHamcrest}/OCHamcrestIOS.framework/Versions/A/Headers/HCInvocationMatcher.h
  132. +52 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIs.h
  133. +61 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsAnything.h
  134. +45 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCloseTo.h
  135. +67 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContaining.h
  136. +45 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContainingInAnyOrder.h
  137. +43 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContainingInOrder.h
  138. +50 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionOnlyContaining.h
  139. +52 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContaining.h
  140. +51 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContainingEntries.h
  141. +47 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContainingKey.h
  142. +47 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContainingValue.h
  143. +7 −18 Specs/Runner/{ → OCHamcrest}/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEmptyCollection.h
  144. +42 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqual.h
  145. +47 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqualIgnoringCase.h
  146. +48 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqualIgnoringWhiteSpace.h
  147. +323 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqualToNumber.h
  148. +40 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsIn.h
  149. +43 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsInstanceOf.h
  150. +45 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsNil.h
  151. +45 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsNot.h
  152. +40 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCIsSame.h
  153. 0  Specs/Runner/{ → OCHamcrest}/OCHamcrestIOS.framework/Versions/A/Headers/HCMatcher.h
  154. +385 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCNumberAssert.h
  155. +40 −38 Specs/Runner/{ → OCHamcrest}/OCHamcrestIOS.framework/Versions/A/Headers/HCOrderingComparison.h
  156. +17 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCRequireNonNilObject.h
  157. +19 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCRequireNonNilString.h
  158. +30 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCSelfDescribing.h
  159. +43 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCStringContains.h
  160. +48 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCStringContainsInOrder.h
  161. 0  Specs/Runner/{ → OCHamcrest}/OCHamcrestIOS.framework/Versions/A/Headers/HCStringDescription.h
  162. +43 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCStringEndsWith.h
  163. +43 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCStringStartsWith.h
  164. +1 −1  Specs/Runner/{ → OCHamcrest}/OCHamcrestIOS.framework/Versions/A/Headers/HCSubstringMatcher.h
  165. +20 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/HCWrapInMatcher.h
  166. +28 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Headers/NSObject+HCSelfDescribingValue.h
  167. +42 −24 Specs/Runner/{ → OCHamcrest}/OCHamcrestIOS.framework/Versions/A/Headers/OCHamcrestIOS.h
  168. BIN  Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/OCHamcrestIOS
  169. +42 −0 Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/A/Resources/Info.plist
  170. +1 −0  Specs/Runner/OCHamcrest/OCHamcrestIOS.framework/Versions/Current
  171. +0 −54 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCAllOf.h
  172. +0 −54 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCAnyOf.h
  173. +0 −50 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCAssertThat.h
  174. +0 −62 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCDescribedAs.h
  175. +0 −71 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCHasCount.h
  176. +0 −54 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCHasDescription.h
  177. +0 −79 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIs.h
  178. +0 −75 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsAnything.h
  179. +0 −50 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCloseTo.h
  180. +0 −75 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContaining.h
  181. +0 −51 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContainingInAnyOrder.h
  182. +0 −51 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContainingInOrder.h
  183. +0 −71 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionOnlyContaining.h
  184. +0 −57 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContaining.h
  185. +0 −58 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContainingEntries.h
  186. +0 −51 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContainingKey.h
  187. +0 −51 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContainingValue.h
  188. +0 −55 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqual.h
  189. +0 −49 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqualIgnoringCase.h
  190. +0 −53 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqualIgnoringWhiteSpace.h
  191. +0 −307 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqualToNumber.h
  192. +0 −49 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsIn.h
  193. +0 −49 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsInstanceOf.h
  194. +0 −67 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsNil.h
  195. +0 −67 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsNot.h
  196. +0 −49 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCIsSame.h
  197. +0 −45 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCStringContains.h
  198. +0 −51 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCStringContainsInOrder.h
  199. +0 −45 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCStringEndsWith.h
  200. +0 −45 Specs/Runner/OCHamcrestIOS.framework/Versions/A/Headers/HCStringStartsWith.h
  201. BIN  Specs/Runner/OCHamcrestIOS.framework/Versions/A/OCHamcrestIOS
View
2  Code/CoreData/CoreData.h
@@ -19,7 +19,7 @@
//
#import <CoreData/CoreData.h>
-#import "../ObjectMapping/ObjectMapping.h"
+#import "ObjectMapping.h"
#import "NSManagedObject+ActiveRecord.h"
#import "RKManagedObjectStore.h"
#import "RKManagedObjectSeeder.h"
View
6 Code/CoreData/NSManagedObject+ActiveRecord.m
@@ -10,9 +10,9 @@
#import <objc/runtime.h>
#import "NSManagedObject+ActiveRecord.h"
-#import "../ObjectMapping/RKObjectManager.h"
-#import "../Support/RKLog.h"
-#import "../Support/RKFixCategoryBug.h"
+#import "RKObjectManager.h"
+#import "RKLog.h"
+#import "RKFixCategoryBug.h"
RK_FIX_CATEGORY_BUG(NSManagedObject_ActiveRecord)
View
2  Code/CoreData/RKManagedObjectLoader.h
@@ -18,7 +18,7 @@
// limitations under the License.
//
-#import "../ObjectMapping/RKObjectLoader.h"
+#import "RKObjectLoader.h"
#import "RKManagedObjectStore.h"
/**
View
6 Code/CoreData/RKManagedObjectLoader.m
@@ -24,9 +24,9 @@
#import "RKObjectMapper.h"
#import "RKManagedObjectThreadSafeInvocation.h"
#import "NSManagedObject+ActiveRecord.h"
-#import "../ObjectMapping/RKObjectLoader_Internals.h"
-#import "../Network/RKRequest_Internals.h"
-#import "../Support/RKLog.h"
+#import "RKObjectLoader_Internals.h"
+#import "RKRequest_Internals.h"
+#import "RKLog.h"
@implementation RKManagedObjectLoader
View
2  Code/CoreData/RKManagedObjectMapping.h
@@ -19,7 +19,7 @@
//
#import <CoreData/CoreData.h>
-#import "../ObjectMapping/RKObjectMapping.h"
+#import "RKObjectMapping.h"
@interface RKManagedObjectMapping : RKObjectMapping {
NSEntityDescription* _entity;
View
2  Code/CoreData/RKManagedObjectMapping.m
@@ -23,7 +23,7 @@
#import "RKObjectManager.h"
#import "RKManagedObjectStore.h"
#import "RKObjectPropertyInspector+CoreData.h"
-#import "../Support/RKLog.h"
+#import "RKLog.h"
// Set Logging Component
#undef RKLogComponent
View
2  Code/CoreData/RKManagedObjectMappingOperation.h
@@ -18,7 +18,7 @@
// limitations under the License.
//
-#import "../ObjectMapping/RKObjectMappingOperation.h"
+#import "RKObjectMappingOperation.h"
/**
Enhances the object mapping operation process with Core Data specific logic
View
2  Code/CoreData/RKManagedObjectMappingOperation.m
@@ -21,7 +21,7 @@
#import "RKManagedObjectMappingOperation.h"
#import "RKManagedObjectMapping.h"
#import "NSManagedObject+ActiveRecord.h"
-#import "../Support/RKLog.h"
+#import "RKLog.h"
// Set Logging Component
#undef RKLogComponent
View
2  Code/CoreData/RKManagedObjectSeeder.h
@@ -18,7 +18,7 @@
// limitations under the License.
//
-#import "../ObjectMapping/ObjectMapping.h"
+#import "ObjectMapping.h"
// The default seed database filename. Used when the object store has not been initialized
extern NSString* const RKDefaultSeedDatabaseFileName;
View
2  Code/CoreData/RKManagedObjectSeeder.m
@@ -24,7 +24,7 @@
#import "RKManagedObjectSeeder.h"
#import "RKManagedObjectStore.h"
-#import "../ObjectMapping/RKParserRegistry.h"
+#import "RKParserRegistry.h"
#import "RKLog.h"
// Set Logging Component
View
2  Code/CoreData/RKObjectPropertyInspector+CoreData.h
@@ -18,7 +18,7 @@
// limitations under the License.
//
-#import "../ObjectMapping/RKObjectPropertyInspector.h"
+#import "RKObjectPropertyInspector.h"
@interface RKObjectPropertyInspector (CoreData)
View
4 Code/CoreData/RKObjectPropertyInspector+CoreData.m
@@ -20,8 +20,8 @@
#import <CoreData/CoreData.h>
#import "RKObjectPropertyInspector+CoreData.h"
-#import "../Support/RKLog.h"
-#import "../Support/RKFixCategoryBug.h"
+#import "RKLog.h"
+#import "RKFixCategoryBug.h"
RK_FIX_CATEGORY_BUG(RKObjectPropertyInspector_CoreData)
View
2  Code/Network/NSData+MD5.m
@@ -20,7 +20,7 @@
#import <CommonCrypto/CommonDigest.h>
#import "NSData+MD5.h"
-#import "../Support/RKFixCategoryBug.h"
+#import "RKFixCategoryBug.h"
RK_FIX_CATEGORY_BUG(NSData_MD5)
View
2  Code/Network/NSDictionary+RKRequestSerialization.m
@@ -20,7 +20,7 @@
#import "NSDictionary+RKRequestSerialization.h"
#import "NSString+RestKit.h"
-#import "../Support/RKFixCategoryBug.h"
+#import "RKFixCategoryBug.h"
RK_FIX_CATEGORY_BUG(NSDictionary_RKRequestSerialization)
View
2  Code/Network/NSString+MD5.m
@@ -20,7 +20,7 @@
#import <CommonCrypto/CommonDigest.h>
#import "NSString+MD5.h"
-#import "../Support/RKFixCategoryBug.h"
+#import "RKFixCategoryBug.h"
RK_FIX_CATEGORY_BUG(NSString_MD5)
View
8 Code/Network/RKClient.m
@@ -21,10 +21,10 @@
#import "RKClient.h"
#import "RKURL.h"
#import "RKNotifications.h"
-#import "../Support/RKAlert.h"
-#import "../Support/RKLog.h"
-#import "../Support/RKPathMatcher.h"
-#import "../Support/NSString+RestKit.h"
+#import "RKAlert.h"
+#import "RKLog.h"
+#import "RKPathMatcher.h"
+#import "NSString+RestKit.h"
// Set Logging Component
#undef RKLogComponent
View
2  Code/Network/RKOAuthClient.m
@@ -19,7 +19,7 @@
//
#import "RKOAuthClient.h"
-#import "../Support/Errors.h"
+#import "Errors.h"
@implementation RKOAuthClient
View
2  Code/Network/RKParams.m
@@ -19,7 +19,7 @@
//
#import "RKParams.h"
-#import "../Support/RKLog.h"
+#import "RKLog.h"
#import "NSString+MD5.h"
// Need for iOS 5 UIDevice workaround
View
2  Code/Network/RKParamsAttachment.m
@@ -22,7 +22,7 @@
#import "RKLog.h"
#import "NSData+MD5.h"
#import "FileMD5Hash.h"
-#import "../Support/NSString+RestKit.h"
+#import "NSString+RestKit.h"
// Set Logging Component
#undef RKLogComponent
View
2  Code/Network/RKReachabilityObserver.m
@@ -25,7 +25,7 @@
#import "RKReachabilityObserver.h"
#include <netdb.h>
#include <arpa/inet.h>
-#import "../Support/RKLog.h"
+#import "RKLog.h"
// Set Logging Component
#undef RKLogComponent
View
2  Code/Network/RKRequest.m
@@ -22,7 +22,7 @@
#import "RKResponse.h"
#import "NSDictionary+RKRequestSerialization.h"
#import "RKNotifications.h"
-#import "../Support/Support.h"
+#import "Support.h"
#import "RKURL.h"
#import "NSData+MD5.h"
#import "NSString+MD5.h"
View
4 Code/Network/RKRequestQueue.m
@@ -26,8 +26,8 @@
#import "RKRequestQueue.h"
#import "RKResponse.h"
#import "RKNotifications.h"
-#import "../Support/RKLog.h"
-#import "../Support/RKFixCategoryBug.h"
+#import "RKLog.h"
+#import "RKFixCategoryBug.h"
RK_FIX_CATEGORY_BUG(UIApplication_RKNetworkActivity)
View
2  Code/Network/RKRequestSerialization.h
@@ -18,7 +18,7 @@
// limitations under the License.
//
-#import "../Network/RKRequestSerializable.h"
+#import "RKRequestSerializable.h"
/**
A simple implementation of the RKRequestSerializable protocol suitable
View
2  Code/ObjectMapping/RKDynamicObjectMapping.m
@@ -19,7 +19,7 @@
//
#import "RKDynamicObjectMapping.h"
-#import "../Support/RKLog.h"
+#import "RKLog.h"
// Set Logging Component
#undef RKLogComponent
View
2  Code/ObjectMapping/RKObjectLoader.h
@@ -18,7 +18,7 @@
// limitations under the License.
//
-#import "../Network/Network.h"
+#import "Network.h"
#import "RKObjectMapping.h"
#import "RKObjectMappingResult.h"
View
2  Code/ObjectMapping/RKObjectLoader.m
@@ -27,7 +27,7 @@
#import "RKParser.h"
#import "RKObjectLoader_Internals.h"
#import "RKParserRegistry.h"
-#import "../Network/RKRequest_Internals.h"
+#import "RKRequest_Internals.h"
#import "RKObjectSerializer.h"
// Set Logging Component
View
2  Code/ObjectMapping/RKObjectManager.h
@@ -18,7 +18,7 @@
// limitations under the License.
//
-#import "../Network/Network.h"
+#import "Network.h"
#import "RKObjectLoader.h"
#import "RKObjectRouter.h"
#import "RKObjectMappingProvider.h"
View
6 Code/ObjectMapping/RKObjectManager.m
@@ -20,9 +20,9 @@
#import "RKObjectManager.h"
#import "RKObjectSerializer.h"
-#import "../CoreData/RKManagedObjectStore.h"
-#import "../CoreData/RKManagedObjectLoader.h"
-#import "../Support/Support.h"
+#import "RKManagedObjectStore.h"
+#import "RKManagedObjectLoader.h"
+#import "Support.h"
#import "RKErrorMessage.h"
NSString* const RKDidEnterOfflineModeNotification = @"RKDidEnterOfflineModeNotification";
View
2  Code/ObjectMapping/RKObjectMapper.h
@@ -24,7 +24,7 @@
#import "RKObjectMappingResult.h"
#import "RKObjectMappingProvider.h"
#import "RKMappingOperationQueue.h"
-#import "../Support/Support.h"
+#import "Support.h"
/**
Maps parsed primitive dictionary and arrays into objects. This is the primary entry point
View
2  Code/ObjectMapping/RKObjectMapperError.h
@@ -18,7 +18,7 @@
// limitations under the License.
//
-#import "../Support/Errors.h"
+#import "Errors.h"
typedef enum RKObjectMapperErrors {
RKObjectMapperErrorObjectMappingNotFound = 1001, // No mapping found
View
2  Code/ObjectMapping/RKObjectMapping.m
@@ -21,7 +21,7 @@
#import "RKObjectMapping.h"
#import "RKObjectRelationshipMapping.h"
#import "RKObjectPropertyInspector.h"
-#import "../Support/RKLog.h"
+#import "RKLog.h"
// Constants
NSString* const RKObjectMappingNestingAttributeKeyName = @"<RK_NESTING_ATTRIBUTE>";
View
4 Code/ObjectMapping/RKObjectMappingOperation.m
@@ -25,8 +25,8 @@
#import "RKObjectPropertyInspector.h"
#import "RKObjectRelationshipMapping.h"
#import "RKObjectMapper.h"
-#import "../Support/Errors.h"
-#import "../Support/RKLog.h"
+#import "Errors.h"
+#import "RKLog.h"
// Set Logging Component
#undef RKLogComponent
View
2  Code/ObjectMapping/RKObjectMappingResult.m
@@ -20,7 +20,7 @@
#import "RKObjectMappingResult.h"
#import "RKObjectMapperError.h"
-#import "../Support/RKLog.h"
+#import "RKLog.h"
@implementation RKObjectMappingResult
View
2  Code/ObjectMapping/RKObjectRouter.h
@@ -18,7 +18,7 @@
// limitations under the License.
//
-#import "../Network/RKRequest.h"
+#import "RKRequest.h"
// TODO: Cleanup the comments in here
View
2  Code/ObjectMapping/RKObjectSerializer.h
@@ -20,7 +20,7 @@
#import "RKObjectMapping.h"
#import "RKObjectMappingOperation.h"
-#import "../Network/RKRequestSerializable.h"
+#import "RKRequestSerializable.h"
/**
Performs a serialization of an object and its relationships back into
View
6 Code/ObjectMapping/RKObjectSerializer.m
@@ -18,9 +18,9 @@
// limitations under the License.
//
-#import "../Network/RKRequestSerialization.h"
-#import "../Support/RKMIMETypes.h"
-#import "../Support/RKParser.h"
+#import "RKRequestSerialization.h"
+#import "RKMIMETypes.h"
+#import "RKParser.h"
#import "RKObjectSerializer.h"
#import "NSDictionary+RKRequestSerialization.h"
#import "RKParserRegistry.h"
View
4 Code/ObjectMapping/RKParserRegistry.h
@@ -18,8 +18,8 @@
// limitations under the License.
//
-#import "../Support/RKMIMETypes.h"
-#import "../Support/RKParser.h"
+#import "RKMIMETypes.h"
+#import "RKParser.h"
/**
The Parser Registry provides for the registration of RKParser classes
View
2  Code/ObjectMapping/RKRouter.h
@@ -18,7 +18,7 @@
// limitations under the License.
//
-#import "../Network/Network.h"
+#import "Network.h"
/**
* Defines a protocol for mapping Cocoa objects to remote resource locations and
View
6 Code/RestKit.h
@@ -18,9 +18,9 @@
// limitations under the License.
//
-#import "Network/Network.h"
-#import "Support/Support.h"
-#import "ObjectMapping/ObjectMapping.h"
+#import "Network.h"
+#import "Support.h"
+#import "ObjectMapping.h"
/**
Set the App logging component. This header
View
2  Code/Support/NSString+RestKit.m
@@ -24,7 +24,7 @@
#import <CoreServices/CoreServices.h>
#endif
#import "NSString+RestKit.h"
-#import "../Network/RKClient.h"
+#import "RKClient.h"
#import "RKFixCategoryBug.h"
#include <netdb.h>
#include <arpa/inet.h>
View
2  Examples/RKCatalog/App/RKCatalog.h
@@ -8,7 +8,7 @@
#import <UIKit/UIKit.h>
#import <RestKit/RestKit.h>
-#import <RestKit/CoreData/CoreData.h>
+#import <RestKit/CoreData.h>
// Import the base URL defined in the app delegate
extern NSString* gRKCatalogBaseURL;
View
2  Examples/RKCatalog/Examples/RKCoreDataExample/RKCoreDataExample.m
@@ -6,7 +6,7 @@
// Copyright 2011 Two Toasters. All rights reserved.
//
-#import <RestKit/CoreData/CoreData.h>
+#import <RestKit/CoreData.h>
#import "RKCoreDataExample.h"
@interface Article : NSManagedObject {
View
2  Examples/RKCatalog/Examples/RKRelationshipMappingExample/RKRelationshipMappingExample.m
@@ -7,7 +7,7 @@
//
#import <RestKit/RestKit.h>
-#import <RestKit/CoreData/CoreData.h>
+#import <RestKit/CoreData.h>
#import "RKRelationshipMappingExample.h"
#import "User.h"
#import "Project.h"
View
238 Examples/RKCatalog/RKCatalog.xcodeproj/project.pbxproj
@@ -43,119 +43,45 @@
258E219C1361BC42000D4DCF /* RKCoreDataExample.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 258E219A1361BC42000D4DCF /* RKCoreDataExample.xcdatamodeld */; };
258F33F41432CB11001EEEFC /* RKAuthenticationExample.m in Sources */ = {isa = PBXBuildFile; fileRef = 258F33F21432CB11001EEEFC /* RKAuthenticationExample.m */; };
258F33F51432CB11001EEEFC /* RKAuthenticationExample.xib in Resources */ = {isa = PBXBuildFile; fileRef = 258F33F31432CB11001EEEFC /* RKAuthenticationExample.xib */; };
- 258F86D914113396007AABCD /* libRestKitCoreData.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2501DEAF13607B74003DE9E4 /* libRestKitCoreData.a */; };
- 258F86DA14113396007AABCD /* libRestKitJSONParserJSONKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2501DEAB13607B74003DE9E4 /* libRestKitJSONParserJSONKit.a */; };
- 258F86DB14113396007AABCD /* libRestKitNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2501DEA113607B74003DE9E4 /* libRestKitNetwork.a */; };
- 258F86DC14113396007AABCD /* libRestKitObjectMapping.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2501DEA313607B74003DE9E4 /* libRestKitObjectMapping.a */; };
- 258F86DD14113396007AABCD /* libRestKitSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2501DEA513607B74003DE9E4 /* libRestKitSupport.a */; };
- 258F86DE14113396007AABCD /* libRestKitXMLParserLibxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2501DEAD13607B74003DE9E4 /* libRestKitXMLParserLibxml.a */; };
+ 25A34207147C4C540009758D /* libRestKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25A341FF147C4C300009758D /* libRestKit.a */; };
+ 25A3421D147D87800009758D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25A3421C147D87800009758D /* Security.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 2501DEA013607B74003DE9E4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 253A07FC1255161B00976E89;
- remoteInfo = RestKitNetwork;
- };
- 2501DEA213607B74003DE9E4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 253A08031255162C00976E89;
- remoteInfo = RestKitObjectMapping;
- };
- 2501DEA413607B74003DE9E4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 253A080C12551D3000976E89;
- remoteInfo = RestKitSupport;
- };
- 2501DEA613607B74003DE9E4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2590E64F125231F600531FA8;
- remoteInfo = "RestKitJSONParser+YAJL";
- };
- 2501DEA813607B74003DE9E4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2590E66B1252353700531FA8;
- remoteInfo = "RestKitJSONParser+SBJSON";
- };
- 2501DEAA13607B74003DE9E4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 73057FD11331AD2E001908EE;
- remoteInfo = "RestKitJSONParser+JSONKit";
- };
- 2501DEAC13607B74003DE9E4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25BD43BD1340315800DBACDD;
- remoteInfo = "RestKitXMLParser+Libxml";
- };
- 2501DEAE13607B74003DE9E4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 253A081412551D5300976E89;
- remoteInfo = RestKitCoreData;
- };
- 2501DEB013607B74003DE9E4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2523360511E79F090048F9B4;
- remoteInfo = RestKitThree20;
- };
- 2501DEB213607B74003DE9E4 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 3F6C39A510FE5C95008F47C5;
- remoteInfo = UISpec;
- };
2501DEB913607BD5003DE9E4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */;
proxyType = 1;
- remoteGlobalIDString = 255B7588133BABBF00ED76AD;
+ remoteGlobalIDString = 25160D1514564E810060A5C5;
remoteInfo = RestKit;
};
- 25FB6D4E13E4830800F48969 /* PBXContainerItemProxy */ = {
+ 25A341FE147C4C300009758D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 20808DBD13DE8CDC000A156A;
- remoteInfo = "RestKitJSONParser+NXJSON";
+ remoteGlobalIDString = 25160D1614564E810060A5C5;
+ remoteInfo = RestKit;
};
- 3F7C3F6D1379ADFC00B4A357 /* PBXContainerItemProxy */ = {
+ 25A34200147C4C300009758D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 253A081312551D5300976E89;
- remoteInfo = RestKitCoreData;
+ proxyType = 2;
+ remoteGlobalIDString = 25160D2614564E820060A5C5;
+ remoteInfo = RestKitTests;
};
- 3F7C3F7F1379AEAF00B4A357 /* PBXContainerItemProxy */ = {
+ 25A34202147C4C300009758D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 73057FD01331AD2E001908EE;
- remoteInfo = "RestKitJSONParser+JSONKit";
+ proxyType = 2;
+ remoteGlobalIDString = 25160E62145651060060A5C5;
+ remoteInfo = RestKitFramework;
};
- 3F7C3F811379AEB200B4A357 /* PBXContainerItemProxy */ = {
+ 25A34204147C4C300009758D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 259DF7791340290600233DF4;
- remoteInfo = "RestKitXMLParser+Libxml";
+ proxyType = 2;
+ remoteGlobalIDString = 25160E78145651060060A5C5;
+ remoteInfo = RestKitFrameworkTests;
};
/* End PBXContainerItemProxy section */
@@ -214,6 +140,7 @@
258F33F11432CB11001EEEFC /* RKAuthenticationExample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RKAuthenticationExample.h; path = RKAuthenticationExample/RKAuthenticationExample.h; sourceTree = "<group>"; };
258F33F21432CB11001EEEFC /* RKAuthenticationExample.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RKAuthenticationExample.m; path = RKAuthenticationExample/RKAuthenticationExample.m; sourceTree = "<group>"; };
258F33F31432CB11001EEEFC /* RKAuthenticationExample.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RKAuthenticationExample.xib; path = RKAuthenticationExample/RKAuthenticationExample.xib; sourceTree = "<group>"; };
+ 25A3421C147D87800009758D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -221,12 +148,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 258F86D914113396007AABCD /* libRestKitCoreData.a in Frameworks */,
- 258F86DA14113396007AABCD /* libRestKitJSONParserJSONKit.a in Frameworks */,
- 258F86DB14113396007AABCD /* libRestKitNetwork.a in Frameworks */,
- 258F86DC14113396007AABCD /* libRestKitObjectMapping.a in Frameworks */,
- 258F86DD14113396007AABCD /* libRestKitSupport.a in Frameworks */,
- 258F86DE14113396007AABCD /* libRestKitXMLParserLibxml.a in Frameworks */,
+ 25A3421D147D87800009758D /* Security.framework in Frameworks */,
+ 25A34207147C4C540009758D /* libRestKit.a in Frameworks */,
258BAA6513609F6D00ED0614 /* MobileCoreServices.framework in Frameworks */,
258BAA6313609F6400ED0614 /* CFNetwork.framework in Frameworks */,
258BAA6113609F5D00ED0614 /* SystemConfiguration.framework in Frameworks */,
@@ -262,11 +185,12 @@
2501DE5B13607B67003DE9E4 /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */,
+ 25A3421C147D87800009758D /* Security.framework */,
258BAA6413609F6D00ED0614 /* MobileCoreServices.framework */,
258BAA6213609F6400ED0614 /* CFNetwork.framework */,
258BAA6013609F5D00ED0614 /* SystemConfiguration.framework */,
258BAA5E13609F5200ED0614 /* libxml2.dylib */,
- 2501DE8113607B74003DE9E4 /* RestKit.xcodeproj */,
2501DE5C13607B67003DE9E4 /* UIKit.framework */,
2501DE5E13607B67003DE9E4 /* Foundation.framework */,
2501DE6013607B67003DE9E4 /* CoreGraphics.framework */,
@@ -278,17 +202,10 @@
2501DE8213607B74003DE9E4 /* Products */ = {
isa = PBXGroup;
children = (
- 2501DEA113607B74003DE9E4 /* libRestKitNetwork.a */,
- 2501DEA313607B74003DE9E4 /* libRestKitObjectMapping.a */,
- 2501DEA513607B74003DE9E4 /* libRestKitSupport.a */,
- 25FB6D4F13E4830800F48969 /* libRestKitJSONParserNXJSON.a */,
- 2501DEA713607B74003DE9E4 /* libRestKitJSONParserYAJL.a */,
- 2501DEA913607B74003DE9E4 /* libRestKitJSONParserSBJSON.a */,
- 2501DEAB13607B74003DE9E4 /* libRestKitJSONParserJSONKit.a */,
- 2501DEAD13607B74003DE9E4 /* libRestKitXMLParserLibxml.a */,
- 2501DEAF13607B74003DE9E4 /* libRestKitCoreData.a */,
- 2501DEB113607B74003DE9E4 /* libRestKitThree20.a */,
- 2501DEB313607B74003DE9E4 /* RestKitSpecs.app */,
+ 25A341FF147C4C300009758D /* libRestKit.a */,
+ 25A34201147C4C300009758D /* RestKitTests.octest */,
+ 25A34203147C4C300009758D /* RestKit.framework */,
+ 25A34205147C4C300009758D /* RestKitFrameworkTests.octest */,
);
name = Products;
sourceTree = "<group>";
@@ -429,10 +346,7 @@
buildRules = (
);
dependencies = (
- 3F7C3F821379AEB200B4A357 /* PBXTargetDependency */,
- 3F7C3F801379AEAF00B4A357 /* PBXTargetDependency */,
2501DEBA13607BD5003DE9E4 /* PBXTargetDependency */,
- 3F7C3F6E1379ADFC00B4A357 /* PBXTargetDependency */,
);
name = RKCatalog;
productName = RKCatalog;
@@ -472,81 +386,32 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
- 2501DEA113607B74003DE9E4 /* libRestKitNetwork.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitNetwork.a;
- remoteRef = 2501DEA013607B74003DE9E4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 2501DEA313607B74003DE9E4 /* libRestKitObjectMapping.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitObjectMapping.a;
- remoteRef = 2501DEA213607B74003DE9E4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 2501DEA513607B74003DE9E4 /* libRestKitSupport.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitSupport.a;
- remoteRef = 2501DEA413607B74003DE9E4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 2501DEA713607B74003DE9E4 /* libRestKitJSONParserYAJL.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitJSONParserYAJL.a;
- remoteRef = 2501DEA613607B74003DE9E4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 2501DEA913607B74003DE9E4 /* libRestKitJSONParserSBJSON.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitJSONParserSBJSON.a;
- remoteRef = 2501DEA813607B74003DE9E4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 2501DEAB13607B74003DE9E4 /* libRestKitJSONParserJSONKit.a */ = {
+ 25A341FF147C4C300009758D /* libRestKit.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libRestKitJSONParserJSONKit.a;
- remoteRef = 2501DEAA13607B74003DE9E4 /* PBXContainerItemProxy */;
+ path = libRestKit.a;
+ remoteRef = 25A341FE147C4C300009758D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 2501DEAD13607B74003DE9E4 /* libRestKitXMLParserLibxml.a */ = {
+ 25A34201147C4C300009758D /* RestKitTests.octest */ = {
isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitXMLParserLibxml.a;
- remoteRef = 2501DEAC13607B74003DE9E4 /* PBXContainerItemProxy */;
+ fileType = wrapper.cfbundle;
+ path = RestKitTests.octest;
+ remoteRef = 25A34200147C4C300009758D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 2501DEAF13607B74003DE9E4 /* libRestKitCoreData.a */ = {
+ 25A34203147C4C300009758D /* RestKit.framework */ = {
isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitCoreData.a;
- remoteRef = 2501DEAE13607B74003DE9E4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 2501DEB113607B74003DE9E4 /* libRestKitThree20.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitThree20.a;
- remoteRef = 2501DEB013607B74003DE9E4 /* PBXContainerItemProxy */;
+ fileType = wrapper.framework;
+ path = RestKit.framework;
+ remoteRef = 25A34202147C4C300009758D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 2501DEB313607B74003DE9E4 /* RestKitSpecs.app */ = {
+ 25A34205147C4C300009758D /* RestKitFrameworkTests.octest */ = {
isa = PBXReferenceProxy;
- fileType = wrapper.application;
- path = RestKitSpecs.app;
- remoteRef = 2501DEB213607B74003DE9E4 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 25FB6D4F13E4830800F48969 /* libRestKitJSONParserNXJSON.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitJSONParserNXJSON.a;
- remoteRef = 25FB6D4E13E4830800F48969 /* PBXContainerItemProxy */;
+ fileType = wrapper.cfbundle;
+ path = RestKitFrameworkTests.octest;
+ remoteRef = 25A34204147C4C300009758D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
@@ -605,21 +470,6 @@
name = RestKit;
targetProxy = 2501DEB913607BD5003DE9E4 /* PBXContainerItemProxy */;
};
- 3F7C3F6E1379ADFC00B4A357 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = RestKitCoreData;
- targetProxy = 3F7C3F6D1379ADFC00B4A357 /* PBXContainerItemProxy */;
- };
- 3F7C3F801379AEAF00B4A357 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "RestKitJSONParser+JSONKit";
- targetProxy = 3F7C3F7F1379AEAF00B4A357 /* PBXContainerItemProxy */;
- };
- 3F7C3F821379AEB200B4A357 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "RestKitXMLParser+Libxml";
- targetProxy = 3F7C3F811379AEB200B4A357 /* PBXContainerItemProxy */;
- };
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
@@ -700,7 +550,7 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "App/RKCatalog-Prefix.pch";
- HEADER_SEARCH_PATHS = "\"$(SOURCE_ROOT)/../../Build\"";
+ HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "App/RKCatalog-Info.plist";
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)\"";
OTHER_LDFLAGS = "-ObjC";
@@ -716,7 +566,7 @@
COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "App/RKCatalog-Prefix.pch";
- HEADER_SEARCH_PATHS = "\"$(SOURCE_ROOT)/../../Build\"";
+ HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "App/RKCatalog-Info.plist";
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)\"";
OTHER_LDFLAGS = "-ObjC";
View
2  Examples/RKDiscussionBoardExample/DiscussionBoard/Code/Models/DBContentObject.h
@@ -7,7 +7,7 @@
//
#import <RestKit/RestKit.h>
-#import <RestKit/CoreData/CoreData.h>
+#import <RestKit/CoreData.h>
#import "DBUser.h"
// Posted when a content object has changed
View
2  Examples/RKDiscussionBoardExample/DiscussionBoard/Code/Models/DBPost.h
@@ -7,7 +7,7 @@
//
#import <Foundation/Foundation.h>
-#import <RestKit/CoreData/CoreData.h>
+#import <RestKit/CoreData.h>
#import "DBUser.h"
#import "DBTopic.h"
#import "DBContentObject.h"
View
2  Examples/RKDiscussionBoardExample/DiscussionBoard/Code/Models/DBPost.m
@@ -7,7 +7,7 @@
//
#import <Three20/Three20+Additions.h>
-#import <RestKit/Support/NSDictionary+RKAdditions.h>
+#import <RestKit/NSDictionary+RKAdditions.h>
#import "DBPost.h"
@implementation DBPost
View
2  Examples/RKDiscussionBoardExample/DiscussionBoard/Code/Models/DBUser.h
@@ -7,7 +7,7 @@
//
#import <RestKit/RestKit.h>
-#import <RestKit/CoreData/CoreData.h>
+#import <RestKit/CoreData.h>
// Declared here and defined below
@class DBContentObject;
View
223 Examples/RKDiscussionBoardExample/DiscussionBoard/DiscussionBoard.xcodeproj/project.pbxproj
@@ -9,6 +9,8 @@
/* Begin PBXBuildFile section */
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
+ 250CA6E5147D918E0047D347 /* libRestKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 250CA6DD147D914C0047D347 /* libRestKit.a */; };
+ 250CA6E7147D91960047D347 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 250CA6E6147D91960047D347 /* Security.framework */; };
25359E6512E3E0A5008BF33D /* libThree20.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25359D4212E3E0A4008BF33D /* libThree20.a */; };
25359E6612E3E0A5008BF33D /* libThree20Core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25359D4312E3E0A4008BF33D /* libThree20Core.a */; };
25359E6712E3E0A5008BF33D /* libThree20Network.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25359D4412E3E0A4008BF33D /* libThree20Network.a */; };
@@ -22,11 +24,6 @@
25359ED712E512BB008BF33D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 25359ED612E512BB008BF33D /* main.m */; };
25359F4112E53966008BF33D /* RKObjectLoaderTTModel+Loading.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F49C15A12DE1D9900FDE614 /* RKObjectLoaderTTModel+Loading.m */; };
253E163412E8BA6500F3E4B0 /* DBContentObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 253E163312E8BA6500F3E4B0 /* DBContentObject.m */; };
- 258F853614106746007AABCD /* libRestKitJSONParserJSONKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25825AF41337CEAC00C0E3D2 /* libRestKitJSONParserJSONKit.a */; };
- 258F853714106746007AABCD /* libRestKitJSONParserNXJSON.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25FB6D6E13E483DE00F48969 /* libRestKitJSONParserNXJSON.a */; };
- 258F853814106746007AABCD /* libRestKitJSONParserSBJSON.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7A2D3B312D7822D00683D6F /* libRestKitJSONParserSBJSON.a */; };
- 258F853914106746007AABCD /* libRestKitJSONParserYAJL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7A2D3B112D7822D00683D6F /* libRestKitJSONParserYAJL.a */; };
- 258F853A14106746007AABCD /* libRestKitXMLParserLibxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25A7B1DB13421D28004816AA /* libRestKitXMLParserLibxml.a */; };
288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
3F22448812DDFCB30002559D /* UIViewController+RKLoading.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F22448712DDFCB30002559D /* UIViewController+RKLoading.m */; };
3F255C9812DB70E200AFD2D1 /* DBPostsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F255C9312DB70E200AFD2D1 /* DBPostsTableViewController.m */; };
@@ -39,11 +36,6 @@
3F255D1E12DB779B00AFD2D1 /* DBLoginOrSignUpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F255D1D12DB779B00AFD2D1 /* DBLoginOrSignUpViewController.m */; };
3F3239E112DBB9C600AB2F6E /* DBPostTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F3239E012DBB9C600AB2F6E /* DBPostTableViewController.m */; };
3F3239ED12DBBA8D00AB2F6E /* DBAuthenticatedTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F3239EC12DBBA8D00AB2F6E /* DBAuthenticatedTableViewController.m */; };
- 3F45615B12D7E31100BE25AD /* libRestKitCoreData.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7A2D3B512D7822D00683D6F /* libRestKitCoreData.a */; };
- 3F45615E12D7E31700BE25AD /* libRestKitNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7A2D3AB12D7822D00683D6F /* libRestKitNetwork.a */; };
- 3F45615F12D7E31700BE25AD /* libRestKitObjectMapping.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7A2D3AD12D7822D00683D6F /* libRestKitObjectMapping.a */; };
- 3F45616012D7E31800BE25AD /* libRestKitSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7A2D3AF12D7822D00683D6F /* libRestKitSupport.a */; };
- 3F45616112D7E31900BE25AD /* libRestKitThree20.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7A2D3B712D7822D00683D6F /* libRestKitThree20.a */; };
3F76BBD612D7DA9D001562DC /* DataModel.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 3F76BBD512D7DA9D001562DC /* DataModel.xcdatamodel */; };
3F8CF774131D78D70023C5EA /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F8CF773131D78D70023C5EA /* libxml2.dylib */; };
572C061713A37EAD003DB47C /* Three20.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 572C061613A37EAD003DB47C /* Three20.bundle */; };
@@ -68,110 +60,48 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 250647E7138EE4A30002F2FE /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 73057FD01331AD2E001908EE;
- remoteInfo = "RestKitJSONParser+JSONKit";
- };
- 25825AF31337CEAC00C0E3D2 /* PBXContainerItemProxy */ = {
+ 250CA6DC147D914C0047D347 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 73057FD11331AD2E001908EE;
- remoteInfo = "RestKitJSONParser+JSONKit";
+ remoteGlobalIDString = 25160D1614564E810060A5C5;
+ remoteInfo = RestKit;
};
- 25A7B1DA13421D28004816AA /* PBXContainerItemProxy */ = {
+ 250CA6DE147D914C0047D347 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 25BD43BD1340315800DBACDD;
- remoteInfo = "RestKitXMLParser+Libxml";
+ remoteGlobalIDString = 25160D2614564E820060A5C5;
+ remoteInfo = RestKitTests;
};
- 25FB6D6D13E483DE00F48969 /* PBXContainerItemProxy */ = {
+ 250CA6E0147D914C0047D347 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 20808DBD13DE8CDC000A156A;
- remoteInfo = "RestKitJSONParser+NXJSON";
+ remoteGlobalIDString = 25160E62145651060060A5C5;
+ remoteInfo = RestKitFramework;
};
- 3F2562F812DBA4C800AFD2D1 /* PBXContainerItemProxy */ = {
+ 250CA6E2147D914C0047D347 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 2523360411E79F090048F9B4;
- remoteInfo = RestKitThree20;
+ proxyType = 2;
+ remoteGlobalIDString = 25160E78145651060060A5C5;
+ remoteInfo = RestKitFrameworkTests;
};
3F45614B12D7E2C500BE25AD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
proxyType = 1;
- remoteGlobalIDString = 255B7588133BABBF00ED76AD;
+ remoteGlobalIDString = 25160D1514564E810060A5C5;
remoteInfo = RestKit;
};
- A7A2D3AA12D7822D00683D6F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 253A07FC1255161B00976E89;
- remoteInfo = RestKitNetwork;
- };
- A7A2D3AC12D7822D00683D6F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 253A08031255162C00976E89;
- remoteInfo = RestKitObjectMapping;
- };
- A7A2D3AE12D7822D00683D6F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 253A080C12551D3000976E89;
- remoteInfo = RestKitSupport;
- };
- A7A2D3B012D7822D00683D6F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2590E64F125231F600531FA8;
- remoteInfo = "RestKitJSONParser+YAJL";
- };
- A7A2D3B212D7822D00683D6F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2590E66B1252353700531FA8;
- remoteInfo = "RestKitJSONParser+SBJSON";
- };
- A7A2D3B412D7822D00683D6F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 253A081412551D5300976E89;
- remoteInfo = RestKitCoreData;
- };
- A7A2D3B612D7822D00683D6F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2523360511E79F090048F9B4;
- remoteInfo = RestKitThree20;
- };
- A7A2D3B812D7822D00683D6F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 3F6C39A510FE5C95008F47C5;
- remoteInfo = UISpec;
- };
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1D6058910D05DD3D006BFB54 /* Discussion Board.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Discussion Board.app"; sourceTree = BUILT_PRODUCTS_DIR; };
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+ 250CA6E6147D91960047D347 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
25359D4212E3E0A4008BF33D /* libThree20.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libThree20.a; sourceTree = "<group>"; };
25359D4312E3E0A4008BF33D /* libThree20Core.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libThree20Core.a; sourceTree = "<group>"; };
25359D4412E3E0A4008BF33D /* libThree20Network.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libThree20Network.a; sourceTree = "<group>"; };
@@ -518,11 +448,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 258F853614106746007AABCD /* libRestKitJSONParserJSONKit.a in Frameworks */,
- 258F853714106746007AABCD /* libRestKitJSONParserNXJSON.a in Frameworks */,
- 258F853814106746007AABCD /* libRestKitJSONParserSBJSON.a in Frameworks */,
- 258F853914106746007AABCD /* libRestKitJSONParserYAJL.a in Frameworks */,
- 258F853A14106746007AABCD /* libRestKitXMLParserLibxml.a in Frameworks */,
+ 250CA6E7147D91960047D347 /* Security.framework in Frameworks */,
+ 250CA6E5147D918E0047D347 /* libRestKit.a in Frameworks */,
3F8CF774131D78D70023C5EA /* libxml2.dylib in Frameworks */,
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
@@ -532,11 +459,6 @@
A7A2D3C612D7829E00683D6F /* CoreData.framework in Frameworks */,
A7A2D3C812D7829E00683D6F /* MobileCoreServices.framework in Frameworks */,
A7A2D3CA12D7829E00683D6F /* SystemConfiguration.framework in Frameworks */,
- 3F45615B12D7E31100BE25AD /* libRestKitCoreData.a in Frameworks */,
- 3F45615E12D7E31700BE25AD /* libRestKitNetwork.a in Frameworks */,
- 3F45615F12D7E31700BE25AD /* libRestKitObjectMapping.a in Frameworks */,
- 3F45616012D7E31800BE25AD /* libRestKitSupport.a in Frameworks */,
- 3F45616112D7E31900BE25AD /* libRestKitThree20.a in Frameworks */,
25359E6512E3E0A5008BF33D /* libThree20.a in Frameworks */,
25359E6612E3E0A5008BF33D /* libThree20Core.a in Frameworks */,
25359E6712E3E0A5008BF33D /* libThree20Network.a in Frameworks */,
@@ -996,6 +918,7 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 250CA6E6147D91960047D347 /* Security.framework */,
A7A2D33912D780DD00683D6F /* QuartzCore.framework */,
A7A2D3C312D7829E00683D6F /* CFNetwork.framework */,
A7A2D3C512D7829E00683D6F /* CoreData.framework */,
@@ -1100,17 +1023,10 @@
A7A2D39512D7822C00683D6F /* Products */ = {
isa = PBXGroup;
children = (
- A7A2D3AB12D7822D00683D6F /* libRestKitNetwork.a */,
- A7A2D3AD12D7822D00683D6F /* libRestKitObjectMapping.a */,
- A7A2D3AF12D7822D00683D6F /* libRestKitSupport.a */,
- 25FB6D6E13E483DE00F48969 /* libRestKitJSONParserNXJSON.a */,
- A7A2D3B112D7822D00683D6F /* libRestKitJSONParserYAJL.a */,
- A7A2D3B312D7822D00683D6F /* libRestKitJSONParserSBJSON.a */,
- 25825AF41337CEAC00C0E3D2 /* libRestKitJSONParserJSONKit.a */,
- 25A7B1DB13421D28004816AA /* libRestKitXMLParserLibxml.a */,
- A7A2D3B512D7822D00683D6F /* libRestKitCoreData.a */,
- A7A2D3B712D7822D00683D6F /* libRestKitThree20.a */,
- A7A2D3B912D7822D00683D6F /* RestKitSpecs.app */,
+ 250CA6DD147D914C0047D347 /* libRestKit.a */,
+ 250CA6DF147D914C0047D347 /* RestKitTests.octest */,
+ 250CA6E1147D914C0047D347 /* RestKit.framework */,
+ 250CA6E3147D914C0047D347 /* RestKitFrameworkTests.octest */,
);
name = Products;
sourceTree = "<group>";
@@ -1129,9 +1045,7 @@
buildRules = (
);
dependencies = (
- 250647E8138EE4A30002F2FE /* PBXTargetDependency */,
3F45614C12D7E2C500BE25AD /* PBXTargetDependency */,
- 3F2562F912DBA4C800AFD2D1 /* PBXTargetDependency */,
);
name = "Discussion Board";
productName = DiscussionBoard;
@@ -1173,81 +1087,32 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
- 25825AF41337CEAC00C0E3D2 /* libRestKitJSONParserJSONKit.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitJSONParserJSONKit.a;
- remoteRef = 25825AF31337CEAC00C0E3D2 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 25A7B1DB13421D28004816AA /* libRestKitXMLParserLibxml.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitXMLParserLibxml.a;
- remoteRef = 25A7B1DA13421D28004816AA /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 25FB6D6E13E483DE00F48969 /* libRestKitJSONParserNXJSON.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitJSONParserNXJSON.a;
- remoteRef = 25FB6D6D13E483DE00F48969 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- A7A2D3AB12D7822D00683D6F /* libRestKitNetwork.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitNetwork.a;
- remoteRef = A7A2D3AA12D7822D00683D6F /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- A7A2D3AD12D7822D00683D6F /* libRestKitObjectMapping.a */ = {
+ 250CA6DD147D914C0047D347 /* libRestKit.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libRestKitObjectMapping.a;
- remoteRef = A7A2D3AC12D7822D00683D6F /* PBXContainerItemProxy */;
+ path = libRestKit.a;
+ remoteRef = 250CA6DC147D914C0047D347 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- A7A2D3AF12D7822D00683D6F /* libRestKitSupport.a */ = {
+ 250CA6DF147D914C0047D347 /* RestKitTests.octest */ = {
isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitSupport.a;
- remoteRef = A7A2D3AE12D7822D00683D6F /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- A7A2D3B112D7822D00683D6F /* libRestKitJSONParserYAJL.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitJSONParserYAJL.a;
- remoteRef = A7A2D3B012D7822D00683D6F /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- A7A2D3B312D7822D00683D6F /* libRestKitJSONParserSBJSON.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitJSONParserSBJSON.a;
- remoteRef = A7A2D3B212D7822D00683D6F /* PBXContainerItemProxy */;
+ fileType = wrapper.cfbundle;
+ path = RestKitTests.octest;
+ remoteRef = 250CA6DE147D914C0047D347 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- A7A2D3B512D7822D00683D6F /* libRestKitCoreData.a */ = {
+ 250CA6E1147D914C0047D347 /* RestKit.framework */ = {
isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitCoreData.a;
- remoteRef = A7A2D3B412D7822D00683D6F /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- A7A2D3B712D7822D00683D6F /* libRestKitThree20.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitThree20.a;
- remoteRef = A7A2D3B612D7822D00683D6F /* PBXContainerItemProxy */;
+ fileType = wrapper.framework;
+ path = RestKit.framework;
+ remoteRef = 250CA6E0147D914C0047D347 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- A7A2D3B912D7822D00683D6F /* RestKitSpecs.app */ = {
+ 250CA6E3147D914C0047D347 /* RestKitFrameworkTests.octest */ = {
isa = PBXReferenceProxy;
- fileType = wrapper.application;
- path = RestKitSpecs.app;
- remoteRef = A7A2D3B812D7822D00683D6F /* PBXContainerItemProxy */;
+ fileType = wrapper.cfbundle;
+ path = RestKitFrameworkTests.octest;
+ remoteRef = 250CA6E2147D914C0047D347 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
@@ -1305,16 +1170,6 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
- 250647E8138EE4A30002F2FE /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = "RestKitJSONParser+JSONKit";
- targetProxy = 250647E7138EE4A30002F2FE /* PBXContainerItemProxy */;
- };
- 3F2562F912DBA4C800AFD2D1 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = RestKitThree20;
- targetProxy = 3F2562F812DBA4C800AFD2D1 /* PBXContainerItemProxy */;
- };
3F45614C12D7E2C500BE25AD /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = RestKit;
View
38 Examples/RKTwitter/RKTwitter.xcodeproj/project.pbxproj
@@ -11,14 +11,12 @@
1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
+ 250CA69A147D8FCC0047D347 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 250CA699147D8FCC0047D347 /* Security.framework */; };
+ 250CA69B147D8FD30047D347 /* libRestKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25160FB31456E8A30060A5C5 /* libRestKit.a */; };
+ 250CA69C147D8FFD0047D347 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2538E864123424F000ACB5D7 /* CoreData.framework */; };
2538E811123419CA00ACB5D7 /* RKTUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 2538E810123419CA00ACB5D7 /* RKTUser.m */; };
2538E814123419EC00ACB5D7 /* RKTStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 2538E813123419EC00ACB5D7 /* RKTStatus.m */; };
2538E8671234250100ACB5D7 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2538E8661234250100ACB5D7 /* SystemConfiguration.framework */; };
- 25CAF1311358CB8C00F53AF5 /* libRestKitJSONParserYAJL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25CAF12C1358CB8C00F53AF5 /* libRestKitJSONParserYAJL.a */; };
- 25CAF1321358CB8C00F53AF5 /* libRestKitNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25CAF12D1358CB8C00F53AF5 /* libRestKitNetwork.a */; };
- 25CAF1331358CB8C00F53AF5 /* libRestKitObjectMapping.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25CAF12E1358CB8C00F53AF5 /* libRestKitObjectMapping.a */; };
- 25CAF1341358CB8C00F53AF5 /* libRestKitSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25CAF12F1358CB8C00F53AF5 /* libRestKitSupport.a */; };
- 25CAF1351358CB8C00F53AF5 /* libRestKitXMLParserLibxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25CAF1301358CB8C00F53AF5 /* libRestKitXMLParserLibxml.a */; };
288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
28D7ACF80DDB3853001CB0EB /* RKTwitterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28D7ACF70DDB3853001CB0EB /* RKTwitterViewController.m */; };
3F02F592131D683A004E1F54 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F02F591131D683A004E1F54 /* libxml2.dylib */; };
@@ -77,22 +75,13 @@
1D6058910D05DD3D006BFB54 /* RKTwitter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RKTwitter.app; sourceTree = BUILT_PRODUCTS_DIR; };
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
250AC48A1358C79C006F084F /* RestKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RestKit.xcodeproj; path = ../../RestKit.xcodeproj; sourceTree = "<group>"; };
- 250AC4BC1358C7B5006F084F /* libRestKitJSONParserJSONKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libRestKitJSONParserJSONKit.a; path = "/Users/blake/Projects/two_toasters/BiteHunter-iOS/Libraries/RestKit/Build/Debug-iphoneos/libRestKitJSONParserJSONKit.a"; sourceTree = "<absolute>"; };
- 250AC4BD1358C7B5006F084F /* libRestKitNetwork.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libRestKitNetwork.a; path = "/Users/blake/Projects/two_toasters/BiteHunter-iOS/Libraries/RestKit/Build/Debug-iphoneos/libRestKitNetwork.a"; sourceTree = "<absolute>"; };
- 250AC4BE1358C7B5006F084F /* libRestKitObjectMapping.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libRestKitObjectMapping.a; path = "/Users/blake/Projects/two_toasters/BiteHunter-iOS/Libraries/RestKit/Build/Debug-iphoneos/libRestKitObjectMapping.a"; sourceTree = "<absolute>"; };
- 250AC4BF1358C7B5006F084F /* libRestKitSupport.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libRestKitSupport.a; path = "/Users/blake/Projects/two_toasters/BiteHunter-iOS/Libraries/RestKit/Build/Debug-iphoneos/libRestKitSupport.a"; sourceTree = "<absolute>"; };
- 250AC4C01358C7B5006F084F /* libRestKitXMLParserLibxml.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libRestKitXMLParserLibxml.a; path = "/Users/blake/Projects/two_toasters/BiteHunter-iOS/Libraries/RestKit/Build/Debug-iphoneos/libRestKitXMLParserLibxml.a"; sourceTree = "<absolute>"; };
+ 250CA699147D8FCC0047D347 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
2538E80F123419CA00ACB5D7 /* RKTUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKTUser.h; sourceTree = "<group>"; };
2538E810123419CA00ACB5D7 /* RKTUser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKTUser.m; sourceTree = "<group>"; };
2538E812123419EC00ACB5D7 /* RKTStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKTStatus.h; sourceTree = "<group>"; };
2538E813123419EC00ACB5D7 /* RKTStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKTStatus.m; sourceTree = "<group>"; };
2538E864123424F000ACB5D7 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
2538E8661234250100ACB5D7 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
- 25CAF12C1358CB8C00F53AF5 /* libRestKitJSONParserYAJL.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libRestKitJSONParserYAJL.a; path = "/Users/blake/Projects/two_toasters/BiteHunter-iOS/Libraries/RestKit/Build/Debug-iphoneos/libRestKitJSONParserYAJL.a"; sourceTree = "<absolute>"; };
- 25CAF12D1358CB8C00F53AF5 /* libRestKitNetwork.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libRestKitNetwork.a; path = "/Users/blake/Projects/two_toasters/BiteHunter-iOS/Libraries/RestKit/Build/Debug-iphoneos/libRestKitNetwork.a"; sourceTree = "<absolute>"; };
- 25CAF12E1358CB8C00F53AF5 /* libRestKitObjectMapping.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libRestKitObjectMapping.a; path = "/Users/blake/Projects/two_toasters/BiteHunter-iOS/Libraries/RestKit/Build/Debug-iphoneos/libRestKitObjectMapping.a"; sourceTree = "<absolute>"; };
- 25CAF12F1358CB8C00F53AF5 /* libRestKitSupport.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libRestKitSupport.a; path = "/Users/blake/Projects/two_toasters/BiteHunter-iOS/Libraries/RestKit/Build/Debug-iphoneos/libRestKitSupport.a"; sourceTree = "<absolute>"; };
- 25CAF1301358CB8C00F53AF5 /* libRestKitXMLParserLibxml.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libRestKitXMLParserLibxml.a; path = "/Users/blake/Projects/two_toasters/BiteHunter-iOS/Libraries/RestKit/Build/Debug-iphoneos/libRestKitXMLParserLibxml.a"; sourceTree = "<absolute>"; };
288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
28D7ACF60DDB3853001CB0EB /* RKTwitterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKTwitterViewController.h; sourceTree = "<group>"; };
28D7ACF70DDB3853001CB0EB /* RKTwitterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKTwitterViewController.m; sourceTree = "<group>"; };
@@ -115,11 +104,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 25CAF1321358CB8C00F53AF5 /* libRestKitNetwork.a in Frameworks */,
- 25CAF1311358CB8C00F53AF5 /* libRestKitJSONParserYAJL.a in Frameworks */,
- 25CAF1331358CB8C00F53AF5 /* libRestKitObjectMapping.a in Frameworks */,
- 25CAF1341358CB8C00F53AF5 /* libRestKitSupport.a in Frameworks */,
- 25CAF1351358CB8C00F53AF5 /* libRestKitXMLParserLibxml.a in Frameworks */,
+ 250CA69C147D8FFD0047D347 /* CoreData.framework in Frameworks */,
+ 250CA69B147D8FD30047D347 /* libRestKit.a in Frameworks */,
+ 250CA69A147D8FCC0047D347 /* Security.framework in Frameworks */,
3F02F592131D683A004E1F54 /* libxml2.dylib in Frameworks */,
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
@@ -206,16 +193,7 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
- 25CAF12C1358CB8C00F53AF5 /* libRestKitJSONParserYAJL.a */,
- 25CAF12D1358CB8C00F53AF5 /* libRestKitNetwork.a */,
- 25CAF12E1358CB8C00F53AF5 /* libRestKitObjectMapping.a */,
- 25CAF12F1358CB8C00F53AF5 /* libRestKitSupport.a */,
- 25CAF1301358CB8C00F53AF5 /* libRestKitXMLParserLibxml.a */,
- 250AC4BC1358C7B5006F084F /* libRestKitJSONParserJSONKit.a */,
- 250AC4BD1358C7B5006F084F /* libRestKitNetwork.a */,
- 250AC4BE1358C7B5006F084F /* libRestKitObjectMapping.a */,
- 250AC4BF1358C7B5006F084F /* libRestKitSupport.a */,
- 250AC4C01358C7B5006F084F /* libRestKitXMLParserLibxml.a */,
+ 250CA699147D8FCC0047D347 /* Security.framework */,
3F02F591131D683A004E1F54 /* libxml2.dylib */,
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
1D30AB110D05D00D00671497 /* Foundation.framework */,
View
2  Examples/RKTwitterCoreData/Classes/RKTStatus.h
@@ -7,7 +7,7 @@
//
#import <RestKit/RestKit.h>
-#import <RestKit/CoreData/CoreData.h>
+#import <RestKit/CoreData.h>
@interface RKTStatus : NSManagedObject {
}
View
2  Examples/RKTwitterCoreData/Classes/RKTwitterAppDelegate.m
@@ -7,7 +7,7 @@
//
#import <RestKit/RestKit.h>
-#import <RestKit/CoreData/CoreData.h>
+#import <RestKit/CoreData.h>
#import "RKTwitterAppDelegate.h"
#import "RKTwitterViewController.h"
#import "RKTStatus.h"
View
197 Examples/RKTwitterCoreData/RKTwitterCoreData.xcodeproj/project.pbxproj
@@ -11,6 +11,8 @@
1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
+ 250CA6CE147D90BA0047D347 /* libRestKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 250CA6C6147D90A50047D347 /* libRestKit.a */; };
+ 250CA6D0147D90C50047D347 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 250CA6CF147D90C50047D347 /* Security.framework */; };
2538E814123419EC00ACB5D7 /* RKTStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 2538E813123419EC00ACB5D7 /* RKTStatus.m */; };
2538E865123424F000ACB5D7 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2538E864123424F000ACB5D7 /* CoreData.framework */; };
2538E8671234250100ACB5D7 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2538E8661234250100ACB5D7 /* SystemConfiguration.framework */; };
@@ -30,11 +32,6 @@
25F2A1891322D59400A33DE4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
25F2A18A1322D59400A33DE4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2538E864123424F000ACB5D7 /* CoreData.framework */; };
25F2A18B1322D59400A33DE4 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2538E8661234250100ACB5D7 /* SystemConfiguration.framework */; };
- 25F2A18C1322D59400A33DE4 /* libRestKitCoreData.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F3CE2CF125B93780083FDCB /* libRestKitCoreData.a */; };
- 25F2A18D1322D59400A33DE4 /* libRestKitNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F3CE2C5125B93780083FDCB /* libRestKitNetwork.a */; };
- 25F2A18E1322D59400A33DE4 /* libRestKitObjectMapping.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F3CE2C7125B93780083FDCB /* libRestKitObjectMapping.a */; };
- 25F2A18F1322D59400A33DE4 /* libRestKitJSONParserYAJL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F3CE2CB125B93780083FDCB /* libRestKitJSONParserYAJL.a */; };
- 25F2A1901322D59400A33DE4 /* libRestKitSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F3CE2C9125B93780083FDCB /* libRestKitSupport.a */; };
25F2A1911322D59400A33DE4 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8452D3F8128244D90069F4A9 /* CFNetwork.framework */; };
25F2A1921322D59400A33DE4 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8452D3FC128244E60069F4A9 /* MobileCoreServices.framework */; };
25F2A1991322D93500A33DE4 /* restkit.json in Resources */ = {isa = PBXBuildFile; fileRef = 25F2A1981322D93500A33DE4 /* restkit.json */; };
@@ -42,7 +39,6 @@
25F2A2D913240CEC00A33DE4 /* RKSeedDatabase.sqlite in Resources */ = {isa = PBXBuildFile; fileRef = 25F2A2D813240CEC00A33DE4 /* RKSeedDatabase.sqlite */; };
288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
28D7ACF80DDB3853001CB0EB /* RKTwitterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28D7ACF70DDB3853001CB0EB /* RKTwitterViewController.m */; };
- 3F3CE34C125B95F60083FDCB /* libRestKitCoreData.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F3CE2CF125B93780083FDCB /* libRestKitCoreData.a */; };
3F3CE3FC125B9A6E0083FDCB /* listbg.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE3FA125B9A6E0083FDCB /* listbg.png */; };
3F3CE3FD125B9A6E0083FDCB /* listbg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE3FB125B9A6E0083FDCB /* listbg@2x.png */; };
3F3CE40E125B9B450083FDCB /* BG.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE40A125B9B450083FDCB /* BG.png */; };
@@ -51,104 +47,51 @@
3F3CE411125B9B450083FDCB /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE40D125B9B450083FDCB /* Default@2x.png */; };
3F94E0C7125BA8C0001E8585 /* RKTwitterCoreData.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 3F94E0C6125BA8C0001E8585 /* RKTwitterCoreData.xcdatamodel */; };
3FB46641131D78A400E37C51 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FB46640131D78A400E37C51 /* libxml2.dylib */; };
- 8452D39E1282446A0069F4A9 /* libRestKitNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F3CE2C5125B93780083FDCB /* libRestKitNetwork.a */; };
- 8452D39F1282446D0069F4A9 /* libRestKitObjectMapping.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F3CE2C7125B93780083FDCB /* libRestKitObjectMapping.a */; };
- 8452D3A0128244710069F4A9 /* libRestKitJSONParserYAJL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F3CE2CB125B93780083FDCB /* libRestKitJSONParserYAJL.a */; };
- 8452D3A3128244830069F4A9 /* libRestKitSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F3CE2C9125B93780083FDCB /* libRestKitSupport.a */; };
8452D3F9128244D90069F4A9 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8452D3F8128244D90069F4A9 /* CFNetwork.framework */; };
8452D3FD128244E60069F4A9 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8452D3FC128244E60069F4A9 /* MobileCoreServices.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 251E0D52134189230017A6DA /* PBXContainerItemProxy */ = {
+ 250CA6C5147D90A50047D347 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 25BD43BD1340315800DBACDD;
- remoteInfo = "RestKitXMLParser+Libxml";
+ remoteGlobalIDString = 25160D1614564E810060A5C5;
+ remoteInfo = RestKit;
};
- 2538E807123417E500ACB5D7 /* PBXContainerItemProxy */ = {
+ 250CA6C7147D90A50047D347 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 2523360511E79F090048F9B4;
- remoteInfo = "Three20 Support";
+ remoteGlobalIDString = 25160D2614564E820060A5C5;
+ remoteInfo = RestKitTests;
};
- 2538E809123417E500ACB5D7 /* PBXContainerItemProxy */ = {
+ 250CA6C9147D90A50047D347 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 3F6C39A510FE5C95008F47C5;
- remoteInfo = UISpec;
+ remoteGlobalIDString = 25160E62145651060060A5C5;
+ remoteInfo = RestKitFramework;
};
- 25E5EEB3133BB2D700C33091 /* PBXContainerItemProxy */ = {
+ 250CA6CB147D90A50047D347 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 73057FD11331AD2E001908EE;
- remoteInfo = "RestKitJSONParser+JSONKit";
+ remoteGlobalIDString = 25160E78145651060060A5C5;
+ remoteInfo = RestKitFrameworkTests;
};
25F2A1771322D59400A33DE4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
proxyType = 1;
- remoteGlobalIDString = 255B7588133BABBF00ED76AD;
+ remoteGlobalIDString = 25160D1514564E810060A5C5;
remoteInfo = RestKit;
};
- 25FB6DDC13E4868300F48969 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 20808DBD13DE8CDC000A156A;
- remoteInfo = "RestKitJSONParser+NXJSON";
- };
- 3F3CE2C4125B93780083FDCB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 253A07FC1255161B00976E89;
- remoteInfo = RestKitNetwork;
- };
- 3F3CE2C6125B93780083FDCB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 253A08031255162C00976E89;
- remoteInfo = RestKitObjectMapping;
- };
- 3F3CE2C8125B93780083FDCB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 253A080C12551D3000976E89;
- remoteInfo = RestKitSupport;
- };
- 3F3CE2CA125B93780083FDCB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2590E64F125231F600531FA8;
- remoteInfo = "RestKitJSONParser+YAJL";
- };
- 3F3CE2CC125B93780083FDCB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2590E66B1252353700531FA8;
- remoteInfo = "RestKitJSONParser+SBJSON";
- };
- 3F3CE2CE125B93780083FDCB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 253A081412551D5300976E89;
- remoteInfo = RestKitCoreData;
- };
3F3CE2E3125B93EB0083FDCB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
proxyType = 1;
- remoteGlobalIDString = 255B7588133BABBF00ED76AD;
+ remoteGlobalIDString = 25160D1514564E810060A5C5;
remoteInfo = RestKit;
};
/* End PBXContainerItemProxy section */
@@ -159,6 +102,7 @@
1D3623250D0F684500981E51 /* RKTwitterAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKTwitterAppDelegate.m; sourceTree = "<group>"; };
1D6058910D05DD3D006BFB54 /* RKTwitterCoreData.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RKTwitterCoreData.app; sourceTree = BUILT_PRODUCTS_DIR; };
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+ 250CA6CF147D90C50047D347 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RestKit.xcodeproj; path = ../../RestKit.xcodeproj; sourceTree = SOURCE_ROOT; };
2538E812123419EC00ACB5D7 /* RKTStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKTStatus.h; sourceTree = "<group>"; };
2538E813123419EC00ACB5D7 /* RKTStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKTStatus.m; sourceTree = "<group>"; };
@@ -191,17 +135,14 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 250CA6D0147D90C50047D347 /* Security.framework in Frameworks */,
+ 250CA6CE147D90BA0047D347 /* libRestKit.a in Frameworks */,
3FB46641131D78A400E37C51 /* libxml2.dylib in Frameworks */,
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */,
2538E865123424F000ACB5D7 /* CoreData.framework in Frameworks */,
2538E8671234250100ACB5D7 /* SystemConfiguration.framework in Frameworks */,
- 3F3CE34C125B95F60083FDCB /* libRestKitCoreData.a in Frameworks */,
- 8452D39E1282446A0069F4A9 /* libRestKitNetwork.a in Frameworks */,
- 8452D39F1282446D0069F4A9 /* libRestKitObjectMapping.a in Frameworks */,
- 8452D3A0128244710069F4A9 /* libRestKitJSONParserYAJL.a in Frameworks */,
- 8452D3A3128244830069F4A9 /* libRestKitSupport.a in Frameworks */,
8452D3F9128244D90069F4A9 /* CFNetwork.framework in Frameworks */,
8452D3FD128244E60069F4A9 /* MobileCoreServices.framework in Frameworks */,
);
@@ -216,11 +157,6 @@
25F2A1891322D59400A33DE4 /* CoreGraphics.framework in Frameworks */,
25F2A18A1322D59400A33DE4 /* CoreData.framework in Frameworks */,
25F2A18B1322D59400A33DE4 /* SystemConfiguration.framework in Frameworks */,
- 25F2A18C1322D59400A33DE4 /* libRestKitCoreData.a in Frameworks */,
- 25F2A18D1322D59400A33DE4 /* libRestKitNetwork.a in Frameworks */,
- 25F2A18E1322D59400A33DE4 /* libRestKitObjectMapping.a in Frameworks */,
- 25F2A18F1322D59400A33DE4 /* libRestKitJSONParserYAJL.a in Frameworks */,
- 25F2A1901322D59400A33DE4 /* libRestKitSupport.a in Frameworks */,
25F2A1911322D59400A33DE4 /* CFNetwork.framework in Frameworks */,
25F2A1921322D59400A33DE4 /* MobileCoreServices.framework in Frameworks */,
);
@@ -254,17 +190,10 @@
2538E800123417E500ACB5D7 /* Products */ = {
isa = PBXGroup;
children = (
- 3F3CE2C5125B93780083FDCB /* libRestKitNetwork.a */,
- 3F3CE2C7125B93780083FDCB /* libRestKitObjectMapping.a */,
- 3F3CE2C9125B93780083FDCB /* libRestKitSupport.a */,
- 25FB6DDD13E4868300F48969 /* libRestKitJSONParserNXJSON.a */,
- 3F3CE2CB125B93780083FDCB /* libRestKitJSONParserYAJL.a */,
- 3F3CE2CD125B93780083FDCB /* libRestKitJSONParserSBJSON.a */,
- 25E5EEB4133BB2D700C33091 /* libRestKitJSONParserJSONKit.a */,
- 251E0D53134189230017A6DA /* libRestKitXMLParserLibxml.a */,
- 3F3CE2CF125B93780083FDCB /* libRestKitCoreData.a */,
- 2538E808123417E500ACB5D7 /* libRestKitThree20.a */,
- 2538E80A123417E500ACB5D7 /* RestKitSpecs.app */,
+ 250CA6C6147D90A50047D347 /* libRestKit.a */,
+ 250CA6C8147D90A50047D347 /* RestKitTests.octest */,
+ 250CA6CA147D90A50047D347 /* RestKit.framework */,
+ 250CA6CC147D90A50047D347 /* RestKitFrameworkTests.octest */,
);
name = Products;
sourceTree = "<group>";
@@ -312,6 +241,7 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 250CA6CF147D90C50047D347 /* Security.framework */,
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
1D30AB110D05D00D00671497 /* Foundation.framework */,
288765A40DF7441C002DB57D /* CoreGraphics.framework */,
@@ -398,81 +328,32 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
- 251E0D53134189230017A6DA /* libRestKitXMLParserLibxml.a */ = {
+ 250CA6C6147D90A50047D347 /* libRestKit.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libRestKitXMLParserLibxml.a;
- remoteRef = 251E0D52134189230017A6DA /* PBXContainerItemProxy */;
+ path = libRestKit.a;
+ remoteRef = 250CA6C5147D90A50047D347 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 2538E808123417E500ACB5D7 /* libRestKitThree20.a */ = {
+ 250CA6C8147D90A50047D347 /* RestKitTests.octest */ = {
isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitThree20.a;
- remoteRef = 2538E807123417E500ACB5D7 /* PBXContainerItemProxy */;
+ fileType = wrapper.cfbundle;
+ path = RestKitTests.octest;
+ remoteRef = 250CA6C7147D90A50047D347 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 2538E80A123417E500ACB5D7 /* RestKitSpecs.app */ = {
+ 250CA6CA147D90A50047D347 /* RestKit.framework */ = {
isa = PBXReferenceProxy;
- fileType = wrapper.application;
- path = RestKitSpecs.app;
- remoteRef = 2538E809123417E500ACB5D7 /* PBXContainerItemProxy */;
+ fileType = wrapper.framework;
+ path = RestKit.framework;
+ remoteRef = 250CA6C9147D90A50047D347 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 25E5EEB4133BB2D700C33091 /* libRestKitJSONParserJSONKit.a */ = {
+ 250CA6CC147D90A50047D347 /* RestKitFrameworkTests.octest */ = {
isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitJSONParserJSONKit.a;
- remoteRef = 25E5EEB3133BB2D700C33091 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 25FB6DDD13E4868300F48969 /* libRestKitJSONParserNXJSON.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitJSONParserNXJSON.a;
- remoteRef = 25FB6DDC13E4868300F48969 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 3F3CE2C5125B93780083FDCB /* libRestKitNetwork.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitNetwork.a;
- remoteRef = 3F3CE2C4125B93780083FDCB /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 3F3CE2C7125B93780083FDCB /* libRestKitObjectMapping.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitObjectMapping.a;
- remoteRef = 3F3CE2C6125B93780083FDCB /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 3F3CE2C9125B93780083FDCB /* libRestKitSupport.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitSupport.a;
- remoteRef = 3F3CE2C8125B93780083FDCB /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 3F3CE2CB125B93780083FDCB /* libRestKitJSONParserYAJL.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitJSONParserYAJL.a;
- remoteRef = 3F3CE2CA125B93780083FDCB /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 3F3CE2CD125B93780083FDCB /* libRestKitJSONParserSBJSON.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitJSONParserSBJSON.a;
- remoteRef = 3F3CE2CC125B93780083FDCB /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 3F3CE2CF125B93780083FDCB /* libRestKitCoreData.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRestKitCoreData.a;
- remoteRef = 3F3CE2CE125B93780083FDCB /* PBXContainerItemProxy */;
+ fileType = wrapper.cfbundle;
+ path = RestKitFrameworkTests.octest;
+ remoteRef = 250CA6CB147D90A50047D347 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
View
195 Examples/RestKit CLI/RestKit CLI.xcodeproj/project.pbxproj
@@ -10,100 +10,47 @@
2516F0FC144A8577004631A1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2516F0FB144A8577004631A1 /* Foundation.framework */; };
2516F0FF144A8577004631A1 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2516F0FE144A8577004631A1 /* main.m */; };
2516F103144A8577004631A1 /* RestKit_CLI.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2516F102144A8577004631A1 /* RestKit_CLI.1 */; };
- 2516F156144A88EC004631A1 /* libRestKitJSONParserJSONKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2516F129144A8841004631A1 /* libRestKitJSONParserJSONKit.a */; };
- 2516F157144A88EC004631A1 /* libRestKitNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2516F11D144A8841004631A1 /* libRestKitNetwork.a */; };
- 2516F158144A88EC004631A1 /* libRestKitObjectMapping.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2516F11F144A8841004631A1 /* libRestKitObjectMapping.a */; };
- 2516F159144A88EC004631A1 /* libRestKitSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2516F121144A8841004631A1 /* libRestKitSupport.a */; };
- 2516F15A144A88EC004631A1 /* libRestKitXMLParserLibxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2516F12B144A8841004631A1 /* libRestKitXMLParserLibxml.a */; };
2516F15E144A8923004631A1 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2516F15D144A8923004631A1 /* SystemConfiguration.framework */; };
2516F160144A895E004631A1 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2516F15F144A895E004631A1 /* libxml2.dylib */; };
2516F162144A8AED004631A1 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2516F161144A8AED004631A1 /* CoreServices.framework */; };
+ 25A34230147D88630009758D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25A3422F147D88620009758D /* Security.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 2516F11C144A8841004631A1 /* PBXContainerItemProxy */ = {
+ 25A34226147D885B0009758D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2516F10D144A8841004631A1 /* RestKit.xcodeproj */;
proxyType = 2;
- remoteGlobalIDString = 253A07FC1255161B00976E89;
- remoteInfo = RestKitNetwork;
- };
- 2516F11E144A8841004631A1 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2516F10D144A8841004631A1 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 253A08031255162C00976E89;
- remoteInfo = RestKitObjectMapping;
- };
- 2516F120144A8841004631A1 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2516F10D144A8841004631A1 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 253A080C12551D3000976E89;
- remoteInfo = RestKitSupport;
- };
- 2516F122144A8841004631A1 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2516F10D144A8841004631A1 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 20808DBD13DE8CDC000A156A;
- remoteInfo = "RestKitJSONParser+NXJSON";
- };
- 2516F124144A8841004631A1 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2516F10D144A8841004631A1 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2590E64F125231F600531FA8;
- remoteInfo = "RestKitJSONParser+YAJL";
- };
- 2516F126144A8841004631A1 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2516F10D144A8841004631A1 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2590E66B1252353700531FA8;
- remoteInfo = "RestKitJSONParser+SBJSON";
- };
- 2516F128144A8841004631A1 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2516F10D144A8841004631A1 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 73057FD11331AD2E001908EE;
- remoteInfo = "RestKitJSONParser+JSONKit";
- };
- 2516F12A144A8841004631A1 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2516F10D144A8841004631A1 /* RestKit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 25BD43BD1340315800DBACDD;
- remoteInfo = "RestKitXMLParser+Libxml";
+ remoteGlobalIDString = 25160D1614564E810060A5C5;