Merge pull request #636 from aporat/extThree20JSON_Update

update SBJson to 3.0.2 fixes #618
facebookarchive · Aug 3, 2011 · 1753a13 · 1753a13
2 parents 304692c + 0002d7e
commit 1753a13
Show file tree

Hide file tree

Showing 40 changed files with 2,023 additions and 1,736 deletions.
diff --git a/src/extThree20JSON/Source/TTExtensionLoader.m b/src/extThree20JSON/Source/TTExtensionLoader.m
@@ -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."];

diff --git a/src/extThree20JSON/Source/TTURLJSONResponse.m b/src/extThree20JSON/Source/TTURLJSONResponse.m
@@ -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

diff --git a/src/extThree20JSON/UnitTests/extJSONTests+SBJSON.m b/src/extThree20JSON/UnitTests/extJSONTests+SBJSON.m
@@ -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

diff --git a/src/extThree20JSON/Vendors/JSON/Changes.markdown b/src/extThree20JSON/Vendors/JSON/Changes.markdown