Skip to content

Commit

Permalink
replace SBJSON with AnyJSON
Browse files Browse the repository at this point in the history
  • Loading branch information
@moredip
moredip committed Oct 20, 2012
1 parent d50f348 commit eeef857
Show file tree
Hide file tree
Showing 25 changed files with 57 additions and 1,742 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@
[submodule "lib/PublicAutomation"]
path = lib/PublicAutomation
url = https://github.com/TestingWithFrank/PublicAutomation.git
[submodule "lib/AnyJSON"]
path = lib/AnyJSON
url = https://github.com/mattt/AnyJSON.git
78 changes: 18 additions & 60 deletions Frank.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
ABA9E4C815C81E7A00112290 /* DDTTYLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = ABA9E4C315C81E7A00112290 /* DDTTYLogger.m */; };
ABA9E4CD15C81E8700112290 /* ContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = ABA9E4CA15C81E8700112290 /* ContextFilterLogFormatter.m */; };
ABA9E4CE15C81E8700112290 /* DispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = ABA9E4CC15C81E8700112290 /* DispatchQueueLogFormatter.m */; };
C177A4CC1632319A0081DF77 /* AnyJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = C177A4CA1632319A0081DF77 /* AnyJSON.h */; };
C177A4CD1632319A0081DF77 /* AnyJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = C177A4CB1632319A0081DF77 /* AnyJSON.m */; };
C18A5EF0160D4AB400DC25F6 /* ImageCaptureRoute.h in Headers */ = {isa = PBXBuildFile; fileRef = C18A5EEE160D4AB400DC25F6 /* ImageCaptureRoute.h */; };
C18A5EF1160D4AB400DC25F6 /* ImageCaptureRoute.m in Sources */ = {isa = PBXBuildFile; fileRef = C18A5EEF160D4AB400DC25F6 /* ImageCaptureRoute.m */; };
C18A5EF5160D4AD300DC25F6 /* UIView+ImageCapture.h in Headers */ = {isa = PBXBuildFile; fileRef = C18A5EF3160D4AD300DC25F6 /* UIView+ImageCapture.h */; };
Expand Down Expand Up @@ -88,23 +90,10 @@
D6D05CC211C883AA0081C5A5 /* StaticResourcesRoute.m in Sources */ = {isa = PBXBuildFile; fileRef = D6D05CB011C883AA0081C5A5 /* StaticResourcesRoute.m */; };
D6D79B5D11D7FB8B003E0E60 /* Operation.h in Headers */ = {isa = PBXBuildFile; fileRef = D6D79B5B11D7FB8B003E0E60 /* Operation.h */; };
D6D79B5E11D7FB8B003E0E60 /* Operation.m in Sources */ = {isa = PBXBuildFile; fileRef = D6D79B5C11D7FB8B003E0E60 /* Operation.m */; };
D6E7B47A11B36D42005CAA34 /* JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = D6E7B46D11B36D42005CAA34 /* JSON.h */; };
D6FA01B714283C4F00576AE1 /* FranklyProtocolHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = D6FA01B714283C4F00576AE0 /* FranklyProtocolHelper.m */; };
D6FA01B714283C4F00576AE3 /* FranklyProtocolHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = D6FA01B714283C4F00576AE2 /* FranklyProtocolHelper.h */; };
D6FA01B714283C4F00576AEF /* EnginesCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = D6FA01B714283C4F00576AEE /* EnginesCommand.m */; };
D6FA01B714283C4F00576AF1 /* EnginesCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = D6FA01B714283C4F00576AF0 /* EnginesCommand.h */; };
FC4EC7D815ED1C8B00B1F119 /* Franks_SBJsonBase.h in Headers */ = {isa = PBXBuildFile; fileRef = FC4EC7D615ED1C8B00B1F119 /* Franks_SBJsonBase.h */; };
FC4EC7D915ED1C8B00B1F119 /* Franks_SBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = FC4EC7D715ED1C8B00B1F119 /* Franks_SBJsonBase.m */; };
FC4EC7DC15ED1CC500B1F119 /* Franks_SBJsonParser.h in Headers */ = {isa = PBXBuildFile; fileRef = FC4EC7DA15ED1CC500B1F119 /* Franks_SBJsonParser.h */; };
FC4EC7DD15ED1CC500B1F119 /* Franks_SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = FC4EC7DB15ED1CC500B1F119 /* Franks_SBJsonParser.m */; };
FC4EC7E015ED1CFB00B1F119 /* Franks_SBJsonWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = FC4EC7DE15ED1CFB00B1F119 /* Franks_SBJsonWriter.h */; };
FC4EC7E115ED1CFB00B1F119 /* Franks_SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = FC4EC7DF15ED1CFB00B1F119 /* Franks_SBJsonWriter.m */; };
FC4EC7E415ED1D3400B1F119 /* Franks_SBJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = FC4EC7E215ED1D3400B1F119 /* Franks_SBJSON.h */; };
FC4EC7E515ED1D3400B1F119 /* Franks_SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = FC4EC7E315ED1D3400B1F119 /* Franks_SBJSON.m */; };
FC4EC7EA15ED1E0A00B1F119 /* NSObject+Franks_SBJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = FC4EC7E615ED1E0A00B1F119 /* NSObject+Franks_SBJSON.h */; };
FC4EC7EB15ED1E0A00B1F119 /* NSObject+Franks_SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = FC4EC7E715ED1E0A00B1F119 /* NSObject+Franks_SBJSON.m */; };
FC4EC7EC15ED1E0A00B1F119 /* NSString+Franks_SBJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = FC4EC7E815ED1E0A00B1F119 /* NSString+Franks_SBJSON.h */; };
FC4EC7ED15ED1E0A00B1F119 /* NSString+Franks_SBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = FC4EC7E915ED1E0A00B1F119 /* NSString+Franks_SBJSON.m */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -201,6 +190,9 @@
ABA9E4CA15C81E8700112290 /* ContextFilterLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContextFilterLogFormatter.m; sourceTree = "<group>"; };
ABA9E4CB15C81E8700112290 /* DispatchQueueLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DispatchQueueLogFormatter.h; sourceTree = "<group>"; };
ABA9E4CC15C81E8700112290 /* DispatchQueueLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DispatchQueueLogFormatter.m; sourceTree = "<group>"; };
C177A4CA1632319A0081DF77 /* AnyJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnyJSON.h; path = AnyJSON/AnyJSON.h; sourceTree = "<group>"; };
C177A4CB1632319A0081DF77 /* AnyJSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AnyJSON.m; path = AnyJSON/AnyJSON.m; sourceTree = "<group>"; };
C177A4CE163234B60081DF77 /* JSON.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSON.h; sourceTree = "<group>"; };
C18A5EEE160D4AB400DC25F6 /* ImageCaptureRoute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageCaptureRoute.h; sourceTree = "<group>"; };
C18A5EEF160D4AB400DC25F6 /* ImageCaptureRoute.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ImageCaptureRoute.m; sourceTree = "<group>"; };
C18A5EF3160D4AD300DC25F6 /* UIView+ImageCapture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+ImageCapture.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -239,23 +231,10 @@
D6D05CB011C883AA0081C5A5 /* StaticResourcesRoute.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StaticResourcesRoute.m; sourceTree = "<group>"; };
D6D79B5B11D7FB8B003E0E60 /* Operation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Operation.h; sourceTree = "<group>"; };
D6D79B5C11D7FB8B003E0E60 /* Operation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Operation.m; sourceTree = "<group>"; };
D6E7B46D11B36D42005CAA34 /* JSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSON.h; sourceTree = "<group>"; };
D6FA01B714283C4F00576AE0 /* FranklyProtocolHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FranklyProtocolHelper.m; sourceTree = "<group>"; };
D6FA01B714283C4F00576AE2 /* FranklyProtocolHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FranklyProtocolHelper.h; sourceTree = "<group>"; };
D6FA01B714283C4F00576AEE /* EnginesCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EnginesCommand.m; sourceTree = "<group>"; };
D6FA01B714283C4F00576AF0 /* EnginesCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EnginesCommand.h; sourceTree = "<group>"; };
FC4EC7D615ED1C8B00B1F119 /* Franks_SBJsonBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Franks_SBJsonBase.h; sourceTree = "<group>"; };
FC4EC7D715ED1C8B00B1F119 /* Franks_SBJsonBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Franks_SBJsonBase.m; sourceTree = "<group>"; };
FC4EC7DA15ED1CC500B1F119 /* Franks_SBJsonParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Franks_SBJsonParser.h; sourceTree = "<group>"; };
FC4EC7DB15ED1CC500B1F119 /* Franks_SBJsonParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Franks_SBJsonParser.m; sourceTree = "<group>"; };
FC4EC7DE15ED1CFB00B1F119 /* Franks_SBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Franks_SBJsonWriter.h; sourceTree = "<group>"; };
FC4EC7DF15ED1CFB00B1F119 /* Franks_SBJsonWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Franks_SBJsonWriter.m; sourceTree = "<group>"; };
FC4EC7E215ED1D3400B1F119 /* Franks_SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Franks_SBJSON.h; sourceTree = "<group>"; };
FC4EC7E315ED1D3400B1F119 /* Franks_SBJSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Franks_SBJSON.m; sourceTree = "<group>"; };
FC4EC7E615ED1E0A00B1F119 /* NSObject+Franks_SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+Franks_SBJSON.h"; sourceTree = "<group>"; };
FC4EC7E715ED1E0A00B1F119 /* NSObject+Franks_SBJSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+Franks_SBJSON.m"; sourceTree = "<group>"; };
FC4EC7E815ED1E0A00B1F119 /* NSString+Franks_SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Franks_SBJSON.h"; sourceTree = "<group>"; };
FC4EC7E915ED1E0A00B1F119 /* NSString+Franks_SBJSON.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Franks_SBJSON.m"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -426,6 +405,15 @@
name = Products;
sourceTree = "<group>";
};
C177A4C9163231870081DF77 /* AnyJSON */ = {
isa = PBXGroup;
children = (
C177A4CA1632319A0081DF77 /* AnyJSON.h */,
C177A4CB1632319A0081DF77 /* AnyJSON.m */,
);
name = AnyJSON;
sourceTree = "<group>";
};
C9605E6F1606C42200170F88 /* Commands */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -504,15 +492,16 @@
C9605E661606BF8E00170F88 /* UIView+MapKitWorkaround.m */,
C18A5F1D160D547A00DC25F6 /* UIView+PublicAutomation.m */,
00E864BA161D6E6400E01209 /* UIScrollView+FrankScrolling.m */,
C177A4CE163234B60081DF77 /* JSON.h */,
);
name = Additions;
sourceTree = "<group>";
};
D629926711AB2CF700CE0FB0 /* lib */ = {
isa = PBXGroup;
children = (
C177A4C9163231870081DF77 /* AnyJSON */,
C18A5F16160D528C00DC25F6 /* PublicAutomation.xcodeproj */,
D6E7B46C11B36D42005CAA34 /* JSON */,
D629926811AB2D0500CE0FB0 /* cocoahttpserver */,
D67F2B3313F5F82700A0BFF1 /* LoadableCategory.h */,
);
Expand Down Expand Up @@ -542,26 +531,6 @@
path = cocoahttpserver;
sourceTree = "<group>";
};
D6E7B46C11B36D42005CAA34 /* JSON */ = {
isa = PBXGroup;
children = (
FC4EC7E615ED1E0A00B1F119 /* NSObject+Franks_SBJSON.h */,
FC4EC7E715ED1E0A00B1F119 /* NSObject+Franks_SBJSON.m */,
FC4EC7E815ED1E0A00B1F119 /* NSString+Franks_SBJSON.h */,
FC4EC7E915ED1E0A00B1F119 /* NSString+Franks_SBJSON.m */,
FC4EC7E215ED1D3400B1F119 /* Franks_SBJSON.h */,
FC4EC7E315ED1D3400B1F119 /* Franks_SBJSON.m */,
FC4EC7DE15ED1CFB00B1F119 /* Franks_SBJsonWriter.h */,
FC4EC7DF15ED1CFB00B1F119 /* Franks_SBJsonWriter.m */,
FC4EC7DA15ED1CC500B1F119 /* Franks_SBJsonParser.h */,
FC4EC7DB15ED1CC500B1F119 /* Franks_SBJsonParser.m */,
FC4EC7D615ED1C8B00B1F119 /* Franks_SBJsonBase.h */,
FC4EC7D715ED1C8B00B1F119 /* Franks_SBJsonBase.m */,
D6E7B46D11B36D42005CAA34 /* JSON.h */,
);
path = JSON;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand All @@ -571,7 +540,6 @@
files = (
D6BD521E146C34BF001770B1 /* SelectorEngineRegistry.h in Headers */,
AA747D9F0F9514B9006C5449 /* Frank_Prefix.pch in Headers */,
D6E7B47A11B36D42005CAA34 /* JSON.h in Headers */,
D6D05CB311C883AA0081C5A5 /* DumpCommand.h in Headers */,
D6D05CB511C883AA0081C5A5 /* FrankCommandRoute.h in Headers */,
D6D05CB711C883AA0081C5A5 /* FrankServer.h in Headers */,
Expand All @@ -596,16 +564,11 @@
AB7947BB15C4412300052B74 /* WebSocket.h in Headers */,
D6FA01B714283C4F00576AF1 /* EnginesCommand.h in Headers */,
A91F3AA615F6E456003F434F /* ExitCommand.h in Headers */,
FC4EC7D815ED1C8B00B1F119 /* Franks_SBJsonBase.h in Headers */,
FC4EC7DC15ED1CC500B1F119 /* Franks_SBJsonParser.h in Headers */,
FC4EC7E015ED1CFB00B1F119 /* Franks_SBJsonWriter.h in Headers */,
FC4EC7E415ED1D3400B1F119 /* Franks_SBJSON.h in Headers */,
FC4EC7EA15ED1E0A00B1F119 /* NSObject+Franks_SBJSON.h in Headers */,
FC4EC7EC15ED1E0A00B1F119 /* NSString+Franks_SBJSON.h in Headers */,
C9605E641606BF2900170F88 /* KeyboardCommand.h in Headers */,
C9605E6A1606BFAE00170F88 /* UIImage+Frank.h in Headers */,
C18A5EF0160D4AB400DC25F6 /* ImageCaptureRoute.h in Headers */,
C18A5EF5160D4AD300DC25F6 /* UIView+ImageCapture.h in Headers */,
C177A4CC1632319A0081DF77 /* AnyJSON.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -759,19 +722,14 @@
D6A1D28015A8D05E00EC056C /* UIView+Frank.m in Sources */,
D6FA01B714283C4F00576AEF /* EnginesCommand.m in Sources */,
A91F3AA715F6E456003F434F /* ExitCommand.m in Sources */,
FC4EC7D915ED1C8B00B1F119 /* Franks_SBJsonBase.m in Sources */,
FC4EC7DD15ED1CC500B1F119 /* Franks_SBJsonParser.m in Sources */,
FC4EC7E115ED1CFB00B1F119 /* Franks_SBJsonWriter.m in Sources */,
FC4EC7E515ED1D3400B1F119 /* Franks_SBJSON.m in Sources */,
FC4EC7EB15ED1E0A00B1F119 /* NSObject+Franks_SBJSON.m in Sources */,
FC4EC7ED15ED1E0A00B1F119 /* NSString+Franks_SBJSON.m in Sources */,
C9605E651606BF2900170F88 /* KeyboardCommand.m in Sources */,
C9605E671606BF8E00170F88 /* UIView+MapKitWorkaround.m in Sources */,
C9605E6B1606BFAE00170F88 /* UIImage+Frank.m in Sources */,
C18A5EF1160D4AB400DC25F6 /* ImageCaptureRoute.m in Sources */,
C18A5EF6160D4AD300DC25F6 /* UIView+ImageCapture.m in Sources */,
C18A5F1E160D547A00DC25F6 /* UIView+PublicAutomation.m in Sources */,
00E864BC161D6E6400E01209 /* UIScrollView+FrankScrolling.m in Sources */,
C177A4CD1632319A0081DF77 /* AnyJSON.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
1 change: 1 addition & 0 deletions lib/AnyJSON
Submodule AnyJSON added at ef21ea
73 changes: 0 additions & 73 deletions lib/JSON/Franks_SBJSON.h
View file

This file was deleted.

Loading

0 comments on commit eeef857

Please sign in to comment.