Skip to content
This repository has been archived by the owner on Jan 13, 2022. It is now read-only.

[extJSON] update SBJson to 3.0.2 #636

Merged
merged 2 commits into from Aug 3, 2011
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/extThree20JSON/Source/TTExtensionLoader.m
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ - (TTExtensionInfo*)extensionInfoNamedThree20JSON {

extension.name = @"Three20 JSON";
extension.description = @"The JSON extension provides support for parsing json files and receiving JSON responses.";
extension.version = @"1.0";
extension.copyright = @"Copyright 2009-2010 Facebook.";
extension.version = @"2.0";
extension.copyright = @"Copyright 2009-2011 Facebook.";
extension.license = @"Apache 2.0";
extension.authors = [NSArray arrayWithObjects:
[TTExtensionAuthor authorWithName:@"Jeff Verkoeyen"],
nil];

#ifdef EXTJSON_SBJSON
extension.version = [extension.version stringByAppendingString:@" SBJSON 2.3.1"];
extension.copyright = [extension.copyright stringByAppendingString:@" 2009-2010 Stig Brautaset."];
extension.version = [extension.version stringByAppendingString:@" SBJSON 3.0.2"];
extension.copyright = [extension.copyright stringByAppendingString:@" 2009-2011 Stig Brautaset."];
#elif defined(EXTJSON_YAJL)
extension.version = [extension.version stringByAppendingString:@" YAJL 1.0.11"];
extension.copyright = [extension.copyright stringByAppendingString:@" 2009 Gabriel Handford. 2010 Lloyd Hilaiel."];
Expand Down
3 changes: 2 additions & 1 deletion src/extThree20JSON/Source/TTURLJSONResponse.m
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
// extJSON
#import "extThree20JSON/TTErrorCodes.h"
#ifdef EXTJSON_SBJSON
#import "extThree20JSON/JSON.h"
#import "extThree20JSON/SBJson.h"
#import "extThree20JSON/NSString+SBJSON.h"
#elif defined(EXTJSON_YAJL)
#import "extThree20JSON/NSObject+YAJL.h"
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/extThree20JSON/UnitTests/extJSONTests+SBJSON.m
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#import <SenTestingKit/SenTestingKit.h>

#import "extThree20JSON/JSON.h"
#import "extThree20JSON/SBJson.h"

/**
* Unit tests for the Core JSON parser. These tests are a part of the comprehensive test suite
Expand Down
201 changes: 0 additions & 201 deletions src/extThree20JSON/Vendors/JSON/Changes.markdown

This file was deleted.

Loading