Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:CocoaPods/CocoaPods

* 'master' of github.com:CocoaPods/CocoaPods:
  Make all the examples build on 1.9.3 as well.
  Silence warnings while loading Faraday for Octokit. See #278.
  Remove stray file.
  Update RKTwitter example. ALL EXAMPLES BUILD!
  • Loading branch information...
commit e32e42552157585a0fff0b4f430b3c5597e484a6 2 parents eca25a1 + 4b9c210
@fabiopelosin fabiopelosin authored
Showing with 190 additions and 487 deletions.
  1. +2 −7 Gemfile
  2. +5 −8 Gemfile.lock
  3. +2 −7 cocoapods.gemspec
  4. +8 −8 examples/RKTwitter/Classes/RKTStatus.h
  5. +6 −6 examples/RKTwitter/Classes/RKTStatus.m
  6. +4 −4 examples/RKTwitter/Classes/RKTUser.h
  7. +4 −4 examples/RKTwitter/Classes/RKTUser.m
  8. +1 −1  examples/RKTwitter/Classes/RKTwitterAppDelegate.h
  9. +29 −28 examples/RKTwitter/Classes/RKTwitterAppDelegate.m
  10. +3 −3 examples/RKTwitter/Classes/RKTwitterViewController.h
  11. +44 −50 examples/RKTwitter/Classes/RKTwitterViewController.m
  12. +0 −202 examples/RKTwitter/LICENSE
  13. +30 −11 examples/RKTwitter/Podfile.lock
  14. +30 −50 examples/RKTwitter/RKTwitter.xcodeproj/project.pbxproj
  15. 0  examples/RKTwitter/RKTwitter.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  16. +0 −84 examples/RKTwitter/RKTwitter.xcodeproj/xcshareddata/xcschemes/RKTwitter.xcscheme
  17. 0  examples/RKTwitter/RKTwitter_Prefix.pch
  18. 0  examples/RKTwitter/Resources/BG.png
  19. 0  examples/RKTwitter/Resources/BG@2x.png
  20. 0  examples/RKTwitter/Resources/Default.png
  21. 0  examples/RKTwitter/Resources/Default@2x.png
  22. 0  examples/RKTwitter/Resources/RKTwitter-Info.plist
  23. 0  examples/RKTwitter/Resources/listbg.png
  24. 0  examples/RKTwitter/Resources/listbg@2x.png
  25. +2 −2 examples/RKTwitter/main.m
  26. +0 −11 lib/cocoapods/better_installer.rb
  27. +8 −0 lib/cocoapods/command/spec.rb
  28. +4 −1 lib/cocoapods/specification.rb
  29. +8 −0 lib/cocoapods/specification/statistics.rb
View
9 Gemfile
@@ -5,13 +5,8 @@ gem "escape"
gem "json"
gem "open4"
-# We don't want octokit to pull in faraday 0.8.0, as it prints a warning about
-# the `system_timer` gem being needed, which isn't available on 1.9.x
-#
-# Once faraday 0.8.1 is released this should be resolved:
-# https://github.com/technoweenie/faraday/pull/147
-gem "faraday", "0.7.6"
-gem "octokit", "<= 1.0.3"
+gem "faraday", ">= 0.8.1"
+gem "octokit"
group :development do
gem "xcodeproj", :git => "git://github.com/CocoaPods/Xcodeproj.git"
View
13 Gemfile.lock
@@ -14,10 +14,8 @@ GEM
colored (1.2)
crack (0.3.1)
escape (0.0.4)
- faraday (0.7.6)
- addressable (~> 2.2)
+ faraday (0.8.1)
multipart-post (~> 1.1)
- rack (~> 1.1)
faraday_middleware (0.8.7)
faraday (>= 0.7.4, < 0.9)
hashie (1.2.0)
@@ -32,9 +30,9 @@ GEM
mocha (>= 0.9.8)
multi_json (1.3.6)
multipart-post (1.1.5)
- octokit (1.0.3)
+ octokit (1.3.0)
addressable (~> 2.2)
- faraday (~> 0.7)
+ faraday (~> 0.8)
faraday_middleware (~> 0.8)
hashie (~> 1.2)
multi_json (~> 1.3)
@@ -43,7 +41,6 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.7.1)
slop (>= 2.4.4, < 3)
- rack (1.4.1)
rake (0.9.2.2)
rb-fsevent (0.9.1)
slop (2.4.4)
@@ -60,11 +57,11 @@ DEPENDENCIES
bacon
colored
escape
- faraday (= 0.7.6)
+ faraday (>= 0.8.1)
json
kicker
mocha-on-bacon
- octokit (<= 1.0.3)
+ octokit
open4
pry
rake
View
9 cocoapods.gemspec
@@ -28,13 +28,8 @@ Gem::Specification.new do |s|
s.post_install_message = "[!] If this is your first time install of CocoaPods, or if " \
"you are upgrading, first run: $ pod setup"
- # We don't want octokit to pull in faraday 0.8.0, as it prints a warning about
- # the `system_timer` gem being needed, which isn't available on 1.9.x
- #
- # Once faraday 0.8.1 is released this should be resolved:
- # https://github.com/technoweenie/faraday/pull/147
- s.add_runtime_dependency 'faraday', '~> 0.7.6'
- s.add_runtime_dependency 'octokit', '<= 1.0.3'
+ s.add_runtime_dependency 'faraday', '~> 0.8.1'
+ s.add_runtime_dependency 'octokit', '~> 1.3.0'
s.add_runtime_dependency 'colored', '~> 1.2'
s.add_runtime_dependency 'escape', '~> 0.0.4'
View
16 examples/RKTwitter/Classes/RKTStatus.h 100644 → 100755
@@ -3,19 +3,19 @@
// RKTwitter
//
// Created by Blake Watters on 9/5/10.
-// Copyright 2010 Two Toasters. All rights reserved.
+// Copyright (c) 2009-2012 RestKit. All rights reserved.
//
#import "RKTUser.h"
@interface RKTStatus : NSObject {
- NSNumber* _statusID;
- NSDate* _createdAt;
- NSString* _text;
- NSString* _urlString;
- NSString* _inReplyToScreenName;
- NSNumber* _isFavorited;
- RKTUser* _user;
+ NSNumber* _statusID;
+ NSDate* _createdAt;
+ NSString* _text;
+ NSString* _urlString;
+ NSString* _inReplyToScreenName;
+ NSNumber* _isFavorited;
+ RKTUser* _user;
}
/**
View
12 examples/RKTwitter/Classes/RKTStatus.m 100644 → 100755
@@ -3,7 +3,7 @@
// RKTwitter
//
// Created by Blake Watters on 9/5/10.
-// Copyright 2010 Two Toasters. All rights reserved.
+// Copyright (c) 2009-2012 RestKit. All rights reserved.
//
#import "RKTStatus.h"
@@ -15,21 +15,21 @@ @implementation RKTStatus
@synthesize text = _text;
@synthesize urlString = _urlString;
@synthesize inReplyToScreenName = _inReplyToScreenName;
-@synthesize isFavorited = _isFavorited;
+@synthesize isFavorited = _isFavorited;
@synthesize user = _user;
- (NSString*)description {
- return [NSString stringWithFormat:@"%@ (ID: %@)", self.text, self.statusID];
+ return [NSString stringWithFormat:@"%@ (ID: %@)", self.text, self.statusID];
}
- (void)dealloc {
[_statusID release];
- [_createdAt release];
- [_text release];
+ [_createdAt release];
+ [_text release];
[_urlString release];
[_inReplyToScreenName release];
[_user release];
-
+
[super dealloc];
}
View
8 examples/RKTwitter/Classes/RKTUser.h 100644 → 100755
@@ -3,13 +3,13 @@
// RKTwitter
//
// Created by Blake Watters on 9/5/10.
-// Copyright 2010 Two Toasters. All rights reserved.
+// Copyright (c) 2009-2012 RestKit. All rights reserved.
//
@interface RKTUser : NSObject {
- NSNumber* _userID;
- NSString* _name;
- NSString* _screenName;
+ NSNumber* _userID;
+ NSString* _name;
+ NSString* _screenName;
}
@property (nonatomic, retain) NSNumber* userID;
View
8 examples/RKTwitter/Classes/RKTUser.m 100644 → 100755
@@ -3,7 +3,7 @@
// RKTwitter
//
// Created by Blake Watters on 9/5/10.
-// Copyright 2010 Two Toasters. All rights reserved.
+// Copyright (c) 2009-2012 RestKit. All rights reserved.
//
#import "RKTUser.h"
@@ -16,9 +16,9 @@ @implementation RKTUser
- (void)dealloc {
[_userID release];
- [_name release];
- [_screenName release];
-
+ [_name release];
+ [_screenName release];
+
[super dealloc];
}
View
2  examples/RKTwitter/Classes/RKTwitterAppDelegate.h 100644 → 100755
@@ -3,7 +3,7 @@
// RKTwitter
//
// Created by Blake Watters on 9/5/10.
-// Copyright Two Toasters 2010. All rights reserved.
+// Copyright (c) 2009-2012 RestKit. All rights reserved.
//
#import <UIKit/UIKit.h>
View
57 examples/RKTwitter/Classes/RKTwitterAppDelegate.m 100644 → 100755
@@ -3,7 +3,7 @@
// RKTwitter
//
// Created by Blake Watters on 9/5/10.
-// Copyright Two Toasters 2010. All rights reserved.
+// Copyright (c) 2009-2012 RestKit. All rights reserved.
//
#import <RestKit/RestKit.h>
@@ -19,47 +19,48 @@ @implementation RKTwitterAppDelegate
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
RKLogConfigureByName("RestKit/Network*", RKLogLevelTrace);
+ RKLogConfigureByName("RestKit/ObjectMapping", RKLogLevelTrace);
+
// Initialize RestKit
- RKObjectManager* objectManager = [RKObjectManager objectManagerWithBaseURL:@"http://twitter.com"];
-
+ RKObjectManager* objectManager = [RKObjectManager managerWithBaseURLString:@"http://twitter.com"];
+
// Enable automatic network activity indicator management
- //objectManager.client.requestQueue.showsNetworkActivityIndicatorWhenBusy = YES;
-
+ objectManager.client.requestQueue.showsNetworkActivityIndicatorWhenBusy = YES;
+
// Setup our object mappings
RKObjectMapping* userMapping = [RKObjectMapping mappingForClass:[RKTUser class]];
[userMapping mapKeyPath:@"id" toAttribute:@"userID"];
[userMapping mapKeyPath:@"screen_name" toAttribute:@"screenName"];
[userMapping mapAttributes:@"name", nil];
-
+
RKObjectMapping* statusMapping = [RKObjectMapping mappingForClass:[RKTStatus class]];
[statusMapping mapKeyPathsToAttributes:@"id", @"statusID",
- @"created_at", @"createdAt",
- @"text", @"text",
- @"url", @"urlString",
- @"in_reply_to_screen_name", @"inReplyToScreenName",
- @"favorited", @"isFavorited",
- nil];
+ @"created_at", @"createdAt",
+ @"text", @"text",
+ @"url", @"urlString",
+ @"in_reply_to_screen_name", @"inReplyToScreenName",
+ @"favorited", @"isFavorited",
+ nil];
[statusMapping mapRelationship:@"user" withMapping:userMapping];
-
+
// Update date format so that we can parse Twitter dates properly
- // Wed Sep 29 15:31:08 +0000 2010
- [statusMapping.dateFormatStrings addObject:@"E MMM d HH:mm:ss Z y"];
-
- // Register our mappings with the provider
- [objectManager.mappingProvider setMapping:userMapping forKeyPath:@"user"];
- [objectManager.mappingProvider setMapping:statusMapping forKeyPath:@"status"];
-
- // Uncomment this to use XML, comment it to use JSON
-// objectManager.acceptMIMEType = RKMIMETypeXML;
-// [objectManager.mappingProvider setMapping:statusMapping forKeyPath:@"statuses.status"];
-
+ // Wed Sep 29 15:31:08 +0000 2010
+ [RKObjectMapping addDefaultDateFormatterForString:@"E MMM d HH:mm:ss Z y" inTimeZone:nil];
+
+ // Uncomment these lines to use XML, comment it to use JSON
+ // objectManager.acceptMIMEType = RKMIMETypeXML;
+ // statusMapping.rootKeyPath = @"statuses.status";
+
+ // Register our mappings with the provider using a resource path pattern
+ [objectManager.mappingProvider setObjectMapping:statusMapping forResourcePathPattern:@"/status/user_timeline/:username"];
+
// Create Window and View Controllers
- RKTwitterViewController* viewController = [[[RKTwitterViewController alloc] initWithNibName:nil bundle:nil] autorelease];
- UINavigationController* controller = [[UINavigationController alloc] initWithRootViewController:viewController];
- UIWindow* window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, 320, 480)];
+ RKTwitterViewController* viewController = [[[RKTwitterViewController alloc] initWithNibName:nil bundle:nil] autorelease];
+ UINavigationController* controller = [[UINavigationController alloc] initWithRootViewController:viewController];
+ UIWindow* window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, 320, 480)];
[window addSubview:controller.view];
[window makeKeyAndVisible];
-
+
return YES;
}
View
6 examples/RKTwitter/Classes/RKTwitterViewController.h 100644 → 100755
@@ -3,15 +3,15 @@
// RKTwitter
//
// Created by Blake Watters on 9/5/10.
-// Copyright Two Toasters 2010. All rights reserved.
+// Copyright (c) 2009-2012 RestKit. All rights reserved.
//
#import <UIKit/UIKit.h>
#import <RestKit/RestKit.h>
@interface RKTwitterViewController : UIViewController <UITableViewDelegate, UITableViewDataSource, RKObjectLoaderDelegate> {
- UITableView* _tableView;
- NSArray* _statuses;
+ UITableView* _tableView;
+ NSArray* _statuses;
}
@end
View
94 examples/RKTwitter/Classes/RKTwitterViewController.m 100644 → 100755
@@ -3,7 +3,7 @@
// RKTwitter
//
// Created by Blake Watters on 9/5/10.
-// Copyright Two Toasters 2010. All rights reserved.
+// Copyright (c) 2009-2012 RestKit. All rights reserved.
//
#import "RKTwitterViewController.h"
@@ -16,45 +16,39 @@ - (void)loadData;
@implementation RKTwitterViewController
- (void)loadTimeline {
- // Load the object model via RestKit
+ // Load the object model via RestKit
RKObjectManager* objectManager = [RKObjectManager sharedManager];
- objectManager.client.baseURL = @"http://www.twitter.com";
- [objectManager loadObjectsAtResourcePath:@"/status/user_timeline/RestKit" delegate:self block:^(RKObjectLoader* loader) {
- // Twitter returns statuses as a naked array in JSON, so we instruct the loader
- // to user the appropriate object mapping
- if ([objectManager.acceptMIMEType isEqualToString:RKMIMETypeJSON]) {
- loader.objectMapping = [objectManager.mappingProvider objectMappingForClass:[RKTStatus class]];
- }
- }];
+ objectManager.client.baseURL = [RKURL URLWithString:@"http://www.twitter.com"];
+ [objectManager loadObjectsAtResourcePath:@"/status/user_timeline/RestKit" delegate:self];
}
- (void)loadView {
[super loadView];
-
- // Setup View and Table View
- self.title = @"RestKit Tweets";
+
+ // Setup View and Table View
+ self.title = @"RestKit Tweets";
[UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleBlackTranslucent;
self.navigationController.navigationBar.tintColor = [UIColor blackColor];
- self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemRefresh target:self action:@selector(loadTimeline)] autorelease];
-
- UIImageView* imageView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"BG.png"]] autorelease];
- imageView.frame = CGRectOffset(imageView.frame, 0, -64);
-
- [self.view insertSubview:imageView atIndex:0];
-
- _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, 320, 480-64) style:UITableViewStylePlain];
- _tableView.dataSource = self;
- _tableView.delegate = self;
- _tableView.backgroundColor = [UIColor clearColor];
- _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+ self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemRefresh target:self action:@selector(loadTimeline)] autorelease];
+
+ UIImageView* imageView = [[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"BG.png"]] autorelease];
+ imageView.frame = CGRectOffset(imageView.frame, 0, -64);
+
+ [self.view insertSubview:imageView atIndex:0];
+
+ _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, 320, 480-64) style:UITableViewStylePlain];
+ _tableView.dataSource = self;
+ _tableView.delegate = self;
+ _tableView.backgroundColor = [UIColor clearColor];
+ _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
[self.view addSubview:_tableView];
-
- [self loadTimeline];
+
+ [self loadTimeline];
}
- (void)dealloc {
- [_tableView release];
- [_statuses release];
+ [_tableView release];
+ [_statuses release];
[super dealloc];
}
@@ -65,43 +59,43 @@ - (void)request:(RKRequest*)request didLoadResponse:(RKResponse*)response {
}
- (void)objectLoader:(RKObjectLoader*)objectLoader didLoadObjects:(NSArray*)objects {
- NSLog(@"Loaded statuses: %@", objects);
- [_statuses release];
- _statuses = [objects retain];
- [_tableView reloadData];
+ NSLog(@"Loaded statuses: %@", objects);
+ [_statuses release];
+ _statuses = [objects retain];
+ [_tableView reloadData];
}
- (void)objectLoader:(RKObjectLoader*)objectLoader didFailWithError:(NSError*)error {
- UIAlertView* alert = [[[UIAlertView alloc] initWithTitle:@"Error" message:[error localizedDescription] delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil] autorelease];
- [alert show];
- NSLog(@"Hit error: %@", error);
+ UIAlertView* alert = [[[UIAlertView alloc] initWithTitle:@"Error" message:[error localizedDescription] delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil] autorelease];
+ [alert show];
+ NSLog(@"Hit error: %@", error);
}
#pragma mark UITableViewDelegate methods
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
- CGSize size = [[[_statuses objectAtIndex:indexPath.row] text] sizeWithFont:[UIFont systemFontOfSize:14] constrainedToSize:CGSizeMake(300, 9000)];
- return size.height + 10;
+ CGSize size = [[[_statuses objectAtIndex:indexPath.row] text] sizeWithFont:[UIFont systemFontOfSize:14] constrainedToSize:CGSizeMake(300, 9000)];
+ return size.height + 10;
}
#pragma mark UITableViewDataSource methods
- (NSInteger)tableView:(UITableView *)table numberOfRowsInSection:(NSInteger)section {
- return [_statuses count];
+ return [_statuses count];
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
- NSString* reuseIdentifier = @"Tweet Cell";
- UITableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:reuseIdentifier];
- if (nil == cell) {
- cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier] autorelease];
- cell.textLabel.font = [UIFont systemFontOfSize:14];
- cell.textLabel.numberOfLines = 0;
- cell.textLabel.backgroundColor = [UIColor clearColor];
- cell.contentView.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"listbg.png"]];
- }
- cell.textLabel.text = [[_statuses objectAtIndex:indexPath.row] text];
- return cell;
+ NSString* reuseIdentifier = @"Tweet Cell";
+ UITableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:reuseIdentifier];
+ if (nil == cell) {
+ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier] autorelease];
+ cell.textLabel.font = [UIFont systemFontOfSize:14];
+ cell.textLabel.numberOfLines = 0;
+ cell.textLabel.backgroundColor = [UIColor clearColor];
+ cell.contentView.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"listbg.png"]];
+ }
+ cell.textLabel.text = [[_statuses objectAtIndex:indexPath.row] text];
+ return cell;
}
@end
View
202 examples/RKTwitter/LICENSE
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright 2009 Two Toasters
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
View
41 examples/RKTwitter/Podfile.lock
@@ -1,17 +1,36 @@
PODS:
- - JSONKit (1.4)
+ - FileMD5Hash (0.0.1)
+ - ISO8601DateFormatter (0.6)
+ - JSONKit (1.5pre)
- LibComponentLogging-Core (1.1.6)
- LibComponentLogging-NSLog (1.0.4):
- LibComponentLogging-Core (>= 1.1.6)
- - RestKit/ObjectMapping/JSONKit (0.9.3):
- - JSONKit
- - RestKit (= 0.9.3)
- - RestKit/ObjectMapping (= 0.9.3)
-
-DOWNLOAD_ONLY:
- - RestKit (0.9.3)
- - RestKit/Network (0.9.3)
- - RestKit/ObjectMapping (0.9.3)
+ - NSData+Base64 (1.0.0)
+ - RestKit (0.10.0):
+ - RestKit/JSON (= 0.10.0)
+ - RestKit/JSON (0.10.0):
+ - RestKit/Network
+ - RestKit/ObjectMapping/CoreData
+ - RestKit/ObjectMapping/JSON
+ - RestKit/UI
+ - RestKit/Network (0.10.0):
+ - FileMD5Hash
+ - LibComponentLogging-NSLog (>= 1.0.4)
+ - SOCKit
+ - cocoa-oauth
+ - RestKit/ObjectMapping/CoreData (0.10.0):
+ - ISO8601DateFormatter (>= 0.6)
+ - RestKit/Network
+ - RestKit/ObjectMapping/JSON (0.10.0):
+ - ISO8601DateFormatter (>= 0.6)
+ - JSONKit (>= 1.5pre)
+ - RestKit/Network
+ - RestKit/UI (0.10.0):
+ - UDTableView
+ - SOCKit (1.0)
+ - UDTableView (1.0.0)
+ - cocoa-oauth (0.0.1):
+ - NSData+Base64 (~> 1.0)
DEPENDENCIES:
- - RestKit/ObjectMapping/JSONKit
+ - RestKit
View
80 examples/RKTwitter/RKTwitter.xcodeproj/project.pbxproj
@@ -13,7 +13,6 @@
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.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 */; };
288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
28D7ACF80DDB3853001CB0EB /* RKTwitterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28D7ACF70DDB3853001CB0EB /* RKTwitterViewController.m */; };
3F3CE3FC125B9A6E0083FDCB /* listbg.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE3FA125B9A6E0083FDCB /* listbg.png */; };
@@ -22,51 +21,33 @@
3F3CE40F125B9B450083FDCB /* BG@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE40B125B9B450083FDCB /* BG@2x.png */; };
3F3CE410125B9B450083FDCB /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE40C125B9B450083FDCB /* Default.png */; };
3F3CE411125B9B450083FDCB /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F3CE40D125B9B450083FDCB /* Default@2x.png */; };
- 5119E4781437F0280037EDB5 /* Pods.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 5119E4771437F0280037EDB5 /* Pods.xcconfig */; };
- 5119E47A1437F0B80037EDB5 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5119E4791437F0B80037EDB5 /* libPods.a */; };
- 84F524C212824D5000C370EA /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F524C112824D5000C370EA /* CFNetwork.framework */; };
- 84F524C612824D5B00C370EA /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F524C512824D5B00C370EA /* MobileCoreServices.framework */; };
+ 420AA0D3093343A59375A4A7 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57FFE12DE575489F8CC48721 /* libPods.a */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
- 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+ 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1D3623240D0F684500981E51 /* RKTwitterAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKTwitterAppDelegate.h; sourceTree = "<group>"; };
1D3623250D0F684500981E51 /* RKTwitterAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKTwitterAppDelegate.m; sourceTree = "<group>"; };
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; };
- 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>"; };
+ 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.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; };
+ 288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; includeInIndex = 1; 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>"; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
32CA4F630368D1EE00C91783 /* RKTwitter_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKTwitter_Prefix.pch; sourceTree = "<group>"; };
- 3F02F591131D683A004E1F54 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
3F3CE3FA125B9A6E0083FDCB /* listbg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = listbg.png; sourceTree = "<group>"; };
3F3CE3FB125B9A6E0083FDCB /* listbg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "listbg@2x.png"; sourceTree = "<group>"; };
3F3CE40A125B9B450083FDCB /* BG.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = BG.png; sourceTree = "<group>"; };
3F3CE40B125B9B450083FDCB /* BG@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "BG@2x.png"; sourceTree = "<group>"; };
3F3CE40C125B9B450083FDCB /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
3F3CE40D125B9B450083FDCB /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
- 5119E4771437F0280037EDB5 /* Pods.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = "<group>"; };
- 5119E4791437F0B80037EDB5 /* libPods.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPods.a; path = "Pods/build/Release-iphoneos/libPods.a"; sourceTree = "<group>"; };
- 84F524C112824D5000C370EA /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
- 84F524C512824D5B00C370EA /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
+ 57FFE12DE575489F8CC48721 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
8D1107310486CEB800E47090 /* RKTwitter-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "RKTwitter-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
+ 8E386D7130E847E884FA57B1 /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -74,13 +55,10 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 5119E47A1437F0B80037EDB5 /* libPods.a in Frameworks */,
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */,
- 2538E8671234250100ACB5D7 /* SystemConfiguration.framework in Frameworks */,
- 84F524C212824D5000C370EA /* CFNetwork.framework in Frameworks */,
- 84F524C612824D5B00C370EA /* MobileCoreServices.framework in Frameworks */,
+ 420AA0D3093343A59375A4A7 /* libPods.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -113,13 +91,12 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
- 5119E4791437F0B80037EDB5 /* libPods.a */,
- 5119E4771437F0280037EDB5 /* Pods.xcconfig */,
080E96DDFE201D6D7F000001 /* Classes */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
29B97317FDCFA39411CA2CEA /* Resources */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
+ 8E386D7130E847E884FA57B1 /* Pods.xcconfig */,
);
name = CustomTemplate;
sourceTree = "<group>";
@@ -150,24 +127,10 @@
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 */,
- 3F02F591131D683A004E1F54 /* libxml2.dylib */,
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
1D30AB110D05D00D00671497 /* Foundation.framework */,
288765A40DF7441C002DB57D /* CoreGraphics.framework */,
- 2538E864123424F000ACB5D7 /* CoreData.framework */,
- 2538E8661234250100ACB5D7 /* SystemConfiguration.framework */,
- 84F524C112824D5000C370EA /* CFNetwork.framework */,
- 84F524C512824D5B00C370EA /* MobileCoreServices.framework */,
+ 57FFE12DE575489F8CC48721 /* libPods.a */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -182,6 +145,7 @@
1D60588D0D05DD3D006BFB54 /* Resources */,
1D60588E0D05DD3D006BFB54 /* Sources */,
1D60588F0D05DD3D006BFB54 /* Frameworks */,
+ 539A97B3650143098666EC68 /* Copy Pods Resources */,
);
buildRules = (
);
@@ -198,7 +162,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0430;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "RKTwitter" */;
compatibilityVersion = "Xcode 3.2";
@@ -230,12 +194,28 @@
3F3CE40F125B9B450083FDCB /* BG@2x.png in Resources */,
3F3CE410125B9B450083FDCB /* Default.png in Resources */,
3F3CE411125B9B450083FDCB /* Default@2x.png in Resources */,
- 5119E4781437F0280037EDB5 /* Pods.xcconfig in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
+/* Begin PBXShellScriptBuildPhase section */
+ 539A97B3650143098666EC68 /* Copy Pods Resources */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Copy Pods Resources";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n";
+ };
+/* End PBXShellScriptBuildPhase section */
+
/* Begin PBXSourcesBuildPhase section */
1D60588E0D05DD3D006BFB54 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -254,7 +234,7 @@
/* Begin XCBuildConfiguration section */
1D6058940D05DD3E006BFB54 /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 5119E4771437F0280037EDB5 /* Pods.xcconfig */;
+ baseConfigurationReference = 8E386D7130E847E884FA57B1 /* Pods.xcconfig */;
buildSettings = {
BUILD_STYLE = Debug;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -270,7 +250,7 @@
};
1D6058950D05DD3E006BFB54 /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 5119E4771437F0280037EDB5 /* Pods.xcconfig */;
+ baseConfigurationReference = 8E386D7130E847E884FA57B1 /* Pods.xcconfig */;
buildSettings = {
BUILD_STYLE = Release;
COPY_PHASE_STRIP = YES;
View
0  examples/RKTwitter/RKTwitter.xcodeproj/project.xcworkspace/contents.xcworkspacedata 100644 → 100755
File mode changed
View
84 examples/RKTwitter/RKTwitter.xcodeproj/xcshareddata/xcschemes/RKTwitter.xcscheme
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
- version = "1.3">
- <BuildAction
- parallelizeBuildables = "YES"
- buildImplicitDependencies = "YES">
- <BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
- BuildableName = "RKTwitter.app"
- BlueprintName = "RKTwitter"
- ReferencedContainer = "container:RKTwitter.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- </BuildActionEntries>
- </BuildAction>
- <TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
- shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
- <Testables>
- </Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
- BuildableName = "RKTwitter.app"
- BlueprintName = "RKTwitter"
- ReferencedContainer = "container:RKTwitter.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- </TestAction>
- <LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
- launchStyle = "0"
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
- debugDocumentVersioning = "YES"
- allowLocationSimulation = "YES">
- <BuildableProductRunnable>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
- BuildableName = "RKTwitter.app"
- BlueprintName = "RKTwitter"
- ReferencedContainer = "container:RKTwitter.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
- </LaunchAction>
- <ProfileAction
- shouldUseLaunchSchemeArgsEnv = "YES"
- savedToolIdentifier = ""
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
- debugDocumentVersioning = "YES">
- <BuildableProductRunnable>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
- BuildableName = "RKTwitter.app"
- BlueprintName = "RKTwitter"
- ReferencedContainer = "container:RKTwitter.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- </ProfileAction>
- <AnalyzeAction
- buildConfiguration = "Debug">
- </AnalyzeAction>
- <ArchiveAction
- buildConfiguration = "Release"
- revealArchiveInOrganizer = "YES">
- </ArchiveAction>
-</Scheme>
View
0  examples/RKTwitter/RKTwitter_Prefix.pch 100644 → 100755
File mode changed
View
0  examples/RKTwitter/Resources/BG.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  examples/RKTwitter/Resources/BG@2x.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  examples/RKTwitter/Resources/Default.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  examples/RKTwitter/Resources/Default@2x.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  examples/RKTwitter/Resources/RKTwitter-Info.plist 100644 → 100755
File mode changed
View
0  examples/RKTwitter/Resources/listbg.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  examples/RKTwitter/Resources/listbg@2x.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
4 examples/RKTwitter/main.m 100644 → 100755
@@ -3,13 +3,13 @@
// RKTwitter
//
// Created by Blake Watters on 9/5/10.
-// Copyright Two Toasters 2010. All rights reserved.
+// Copyright (c) 2009-2012 RestKit. All rights reserved.
//
#import <UIKit/UIKit.h>
int main(int argc, char *argv[]) {
-
+
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
int retVal = UIApplicationMain(argc, argv, nil, @"RKTwitterAppDelegate");
[pool release];
View
11 lib/cocoapods/better_installer.rb
@@ -1,11 +0,0 @@
-module Pod
- class DependencyInstaller
- def initialize(sandbox)
- @sandbox = sandbox
- end
-
- def install(dependency)
-
- end
- end
-end
View
8 lib/cocoapods/command/spec.rb
@@ -48,7 +48,15 @@ def run
def create
if repo_id_match = (@url || @name_or_url).match(/github.com\/([^\/\.]*\/[^\/\.]*)\.*/)
+ # This is to make sure Faraday doesn't warn the user about the `system_timer` gem missing.
+ old_warn, $-w = $-w, nil
+ begin
+ require 'faraday'
+ ensure
+ $-w = old_warn
+ end
require 'octokit'
+
repo_id = repo_id_match[1]
data = github_data_for_template(repo_id)
data[:name] = @name_or_url if @url
View
5 lib/cocoapods/specification.rb
@@ -217,7 +217,10 @@ def raw_xconfig
def compiler_flags
if @parent
- chained = @compiler_flags[active_platform].clone.unshift @parent.compiler_flags[active_platform]
+ chained = @compiler_flags[active_platform].clone
+ # TODO hack to get the parent's compiler flags without it being
+ # converted to a String by Specification#compiler_flags.
+ chained.unshift @parent.instance_variable_get(:@compiler_flags)[active_platform]
else
chained = @compiler_flags[active_platform].clone
chained.unshift '-fobjc-arc' if @requires_arc
View
8 lib/cocoapods/specification/statistics.rb
@@ -1,4 +1,12 @@
require 'yaml'
+
+# This is to make sure Faraday doesn't warn the user about the `system_timer` gem missing.
+old_warn, $-w = $-w, nil
+begin
+ require 'faraday'
+ensure
+ $-w = old_warn
+end
require 'octokit'
module Pod
Please sign in to comment.
Something went wrong with that request. Please try again.