diff --git a/SocketTesterARC.xcodeproj/project.pbxproj b/SocketTesterARC.xcodeproj/project.pbxproj index 00d995d..ff94d41 100644 --- a/SocketTesterARC.xcodeproj/project.pbxproj +++ b/SocketTesterARC.xcodeproj/project.pbxproj @@ -9,21 +9,19 @@ /* Begin PBXBuildFile section */ 4A444FA11589E28800B44ABB /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A444FA01589E28800B44ABB /* libicucore.dylib */; }; 4A444FA31589E29500B44ABB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A444FA21589E29500B44ABB /* Security.framework */; }; - 4A44536C1589EE5900B44ABB /* NSObject+SBJson.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A4453541589EE5900B44ABB /* NSObject+SBJson.m */; }; - 4A44536D1589EE5900B44ABB /* SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A4453571589EE5900B44ABB /* SBJsonParser.m */; }; - 4A44536E1589EE5900B44ABB /* SBJsonStreamParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A4453591589EE5900B44ABB /* SBJsonStreamParser.m */; }; - 4A44536F1589EE5900B44ABB /* SBJsonStreamParserAccumulator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A44535B1589EE5900B44ABB /* SBJsonStreamParserAccumulator.m */; }; - 4A4453701589EE5900B44ABB /* SBJsonStreamParserAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A44535D1589EE5900B44ABB /* SBJsonStreamParserAdapter.m */; }; - 4A4453711589EE5900B44ABB /* SBJsonStreamParserState.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A44535F1589EE5900B44ABB /* SBJsonStreamParserState.m */; }; - 4A4453721589EE5900B44ABB /* SBJsonStreamWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A4453611589EE5900B44ABB /* SBJsonStreamWriter.m */; }; - 4A4453731589EE5900B44ABB /* SBJsonStreamWriterAccumulator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A4453631589EE5900B44ABB /* SBJsonStreamWriterAccumulator.m */; }; - 4A4453741589EE5900B44ABB /* SBJsonStreamWriterState.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A4453651589EE5900B44ABB /* SBJsonStreamWriterState.m */; }; - 4A4453751589EE5900B44ABB /* SBJsonTokeniser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A4453671589EE5900B44ABB /* SBJsonTokeniser.m */; }; - 4A4453761589EE5900B44ABB /* SBJsonUTF8Stream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A4453691589EE5900B44ABB /* SBJsonUTF8Stream.m */; }; - 4A4453771589EE5900B44ABB /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A44536B1589EE5900B44ABB /* SBJsonWriter.m */; }; 4A4453811589EE9100B44ABB /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A44537A1589EE9100B44ABB /* base64.c */; }; 4A4453821589EE9100B44ABB /* NSData+SRB64Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A44537D1589EE9100B44ABB /* NSData+SRB64Additions.m */; }; 4A4453831589EE9100B44ABB /* SRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A4453801589EE9100B44ABB /* SRWebSocket.m */; }; + 4A92E916179548B40077B69C /* SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E903179548B40077B69C /* SBJsonParser.m */; }; + 4A92E917179548B40077B69C /* SBJsonStreamParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E905179548B40077B69C /* SBJsonStreamParser.m */; }; + 4A92E918179548B40077B69C /* SBJsonStreamParserAccumulator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E907179548B40077B69C /* SBJsonStreamParserAccumulator.m */; }; + 4A92E919179548B40077B69C /* SBJsonStreamParserAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E909179548B40077B69C /* SBJsonStreamParserAdapter.m */; }; + 4A92E91A179548B40077B69C /* SBJsonStreamParserState.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E90B179548B40077B69C /* SBJsonStreamParserState.m */; }; + 4A92E91B179548B40077B69C /* SBJsonStreamTokeniser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E90D179548B40077B69C /* SBJsonStreamTokeniser.m */; }; + 4A92E91C179548B40077B69C /* SBJsonStreamWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E90F179548B40077B69C /* SBJsonStreamWriter.m */; }; + 4A92E91D179548B40077B69C /* SBJsonStreamWriterAccumulator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E911179548B40077B69C /* SBJsonStreamWriterAccumulator.m */; }; + 4A92E91E179548B40077B69C /* SBJsonStreamWriterState.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E913179548B40077B69C /* SBJsonStreamWriterState.m */; }; + 4A92E91F179548B40077B69C /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E915179548B40077B69C /* SBJsonWriter.m */; }; 4AD96DF41680853E00D9E42D /* SocketIOPacket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AD96DF31680853E00D9E42D /* SocketIOPacket.m */; }; 4AD96DF816808B7900D9E42D /* SocketIOTransportWebsocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AD96DF716808B7900D9E42D /* SocketIOTransportWebsocket.m */; }; 4AD96DFC16822DE300D9E42D /* SocketIOTransportXHR.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AD96DFB16822DE300D9E42D /* SocketIOTransportXHR.m */; }; @@ -45,31 +43,6 @@ /* Begin PBXFileReference section */ 4A444FA01589E28800B44ABB /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; }; 4A444FA21589E29500B44ABB /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; - 4A4453531589EE5900B44ABB /* NSObject+SBJson.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSObject+SBJson.h"; path = "submodules/json-framework/Classes/NSObject+SBJson.h"; sourceTree = ""; }; - 4A4453541589EE5900B44ABB /* NSObject+SBJson.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSObject+SBJson.m"; path = "submodules/json-framework/Classes/NSObject+SBJson.m"; sourceTree = ""; }; - 4A4453551589EE5900B44ABB /* SBJson.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJson.h; path = "submodules/json-framework/Classes/SBJson.h"; sourceTree = ""; }; - 4A4453561589EE5900B44ABB /* SBJsonParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonParser.h; path = "submodules/json-framework/Classes/SBJsonParser.h"; sourceTree = ""; }; - 4A4453571589EE5900B44ABB /* SBJsonParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonParser.m; path = "submodules/json-framework/Classes/SBJsonParser.m"; sourceTree = ""; }; - 4A4453581589EE5900B44ABB /* SBJsonStreamParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamParser.h; path = "submodules/json-framework/Classes/SBJsonStreamParser.h"; sourceTree = ""; }; - 4A4453591589EE5900B44ABB /* SBJsonStreamParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamParser.m; path = "submodules/json-framework/Classes/SBJsonStreamParser.m"; sourceTree = ""; }; - 4A44535A1589EE5900B44ABB /* SBJsonStreamParserAccumulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamParserAccumulator.h; path = "submodules/json-framework/Classes/SBJsonStreamParserAccumulator.h"; sourceTree = ""; }; - 4A44535B1589EE5900B44ABB /* SBJsonStreamParserAccumulator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamParserAccumulator.m; path = "submodules/json-framework/Classes/SBJsonStreamParserAccumulator.m"; sourceTree = ""; }; - 4A44535C1589EE5900B44ABB /* SBJsonStreamParserAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamParserAdapter.h; path = "submodules/json-framework/Classes/SBJsonStreamParserAdapter.h"; sourceTree = ""; }; - 4A44535D1589EE5900B44ABB /* SBJsonStreamParserAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamParserAdapter.m; path = "submodules/json-framework/Classes/SBJsonStreamParserAdapter.m"; sourceTree = ""; }; - 4A44535E1589EE5900B44ABB /* SBJsonStreamParserState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamParserState.h; path = "submodules/json-framework/Classes/SBJsonStreamParserState.h"; sourceTree = ""; }; - 4A44535F1589EE5900B44ABB /* SBJsonStreamParserState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamParserState.m; path = "submodules/json-framework/Classes/SBJsonStreamParserState.m"; sourceTree = ""; }; - 4A4453601589EE5900B44ABB /* SBJsonStreamWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamWriter.h; path = "submodules/json-framework/Classes/SBJsonStreamWriter.h"; sourceTree = ""; }; - 4A4453611589EE5900B44ABB /* SBJsonStreamWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamWriter.m; path = "submodules/json-framework/Classes/SBJsonStreamWriter.m"; sourceTree = ""; }; - 4A4453621589EE5900B44ABB /* SBJsonStreamWriterAccumulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamWriterAccumulator.h; path = "submodules/json-framework/Classes/SBJsonStreamWriterAccumulator.h"; sourceTree = ""; }; - 4A4453631589EE5900B44ABB /* SBJsonStreamWriterAccumulator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamWriterAccumulator.m; path = "submodules/json-framework/Classes/SBJsonStreamWriterAccumulator.m"; sourceTree = ""; }; - 4A4453641589EE5900B44ABB /* SBJsonStreamWriterState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamWriterState.h; path = "submodules/json-framework/Classes/SBJsonStreamWriterState.h"; sourceTree = ""; }; - 4A4453651589EE5900B44ABB /* SBJsonStreamWriterState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamWriterState.m; path = "submodules/json-framework/Classes/SBJsonStreamWriterState.m"; sourceTree = ""; }; - 4A4453661589EE5900B44ABB /* SBJsonTokeniser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonTokeniser.h; path = "submodules/json-framework/Classes/SBJsonTokeniser.h"; sourceTree = ""; }; - 4A4453671589EE5900B44ABB /* SBJsonTokeniser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonTokeniser.m; path = "submodules/json-framework/Classes/SBJsonTokeniser.m"; sourceTree = ""; }; - 4A4453681589EE5900B44ABB /* SBJsonUTF8Stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonUTF8Stream.h; path = "submodules/json-framework/Classes/SBJsonUTF8Stream.h"; sourceTree = ""; }; - 4A4453691589EE5900B44ABB /* SBJsonUTF8Stream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonUTF8Stream.m; path = "submodules/json-framework/Classes/SBJsonUTF8Stream.m"; sourceTree = ""; }; - 4A44536A1589EE5900B44ABB /* SBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonWriter.h; path = "submodules/json-framework/Classes/SBJsonWriter.h"; sourceTree = ""; }; - 4A44536B1589EE5900B44ABB /* SBJsonWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonWriter.m; path = "submodules/json-framework/Classes/SBJsonWriter.m"; sourceTree = ""; }; 4A44537A1589EE9100B44ABB /* base64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = base64.c; path = "submodules/socket-rocket/SocketRocket/base64.c"; sourceTree = SOURCE_ROOT; }; 4A44537B1589EE9100B44ABB /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = "submodules/socket-rocket/SocketRocket/base64.h"; sourceTree = SOURCE_ROOT; }; 4A44537C1589EE9100B44ABB /* NSData+SRB64Additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSData+SRB64Additions.h"; path = "submodules/socket-rocket/SocketRocket/NSData+SRB64Additions.h"; sourceTree = SOURCE_ROOT; }; @@ -77,6 +50,27 @@ 4A44537E1589EE9100B44ABB /* SocketRocket-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SocketRocket-Prefix.pch"; path = "submodules/socket-rocket/SocketRocket/SocketRocket-Prefix.pch"; sourceTree = SOURCE_ROOT; }; 4A44537F1589EE9100B44ABB /* SRWebSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SRWebSocket.h; path = "submodules/socket-rocket/SocketRocket/SRWebSocket.h"; sourceTree = SOURCE_ROOT; }; 4A4453801589EE9100B44ABB /* SRWebSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SRWebSocket.m; path = "submodules/socket-rocket/SocketRocket/SRWebSocket.m"; sourceTree = SOURCE_ROOT; }; + 4A92E901179548B40077B69C /* SBJson.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJson.h; path = "submodules/json-framework/src/main/objc/SBJson.h"; sourceTree = ""; }; + 4A92E902179548B40077B69C /* SBJsonParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonParser.h; path = "submodules/json-framework/src/main/objc/SBJsonParser.h"; sourceTree = ""; }; + 4A92E903179548B40077B69C /* SBJsonParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonParser.m; path = "submodules/json-framework/src/main/objc/SBJsonParser.m"; sourceTree = ""; }; + 4A92E904179548B40077B69C /* SBJsonStreamParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamParser.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamParser.h"; sourceTree = ""; }; + 4A92E905179548B40077B69C /* SBJsonStreamParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamParser.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamParser.m"; sourceTree = ""; }; + 4A92E906179548B40077B69C /* SBJsonStreamParserAccumulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamParserAccumulator.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamParserAccumulator.h"; sourceTree = ""; }; + 4A92E907179548B40077B69C /* SBJsonStreamParserAccumulator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamParserAccumulator.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamParserAccumulator.m"; sourceTree = ""; }; + 4A92E908179548B40077B69C /* SBJsonStreamParserAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamParserAdapter.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamParserAdapter.h"; sourceTree = ""; }; + 4A92E909179548B40077B69C /* SBJsonStreamParserAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamParserAdapter.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamParserAdapter.m"; sourceTree = ""; }; + 4A92E90A179548B40077B69C /* SBJsonStreamParserState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamParserState.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamParserState.h"; sourceTree = ""; }; + 4A92E90B179548B40077B69C /* SBJsonStreamParserState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamParserState.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamParserState.m"; sourceTree = ""; }; + 4A92E90C179548B40077B69C /* SBJsonStreamTokeniser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamTokeniser.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamTokeniser.h"; sourceTree = ""; }; + 4A92E90D179548B40077B69C /* SBJsonStreamTokeniser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamTokeniser.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamTokeniser.m"; sourceTree = ""; }; + 4A92E90E179548B40077B69C /* SBJsonStreamWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamWriter.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamWriter.h"; sourceTree = ""; }; + 4A92E90F179548B40077B69C /* SBJsonStreamWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamWriter.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamWriter.m"; sourceTree = ""; }; + 4A92E910179548B40077B69C /* SBJsonStreamWriterAccumulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamWriterAccumulator.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamWriterAccumulator.h"; sourceTree = ""; }; + 4A92E911179548B40077B69C /* SBJsonStreamWriterAccumulator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamWriterAccumulator.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamWriterAccumulator.m"; sourceTree = ""; }; + 4A92E912179548B40077B69C /* SBJsonStreamWriterState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamWriterState.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamWriterState.h"; sourceTree = ""; }; + 4A92E913179548B40077B69C /* SBJsonStreamWriterState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamWriterState.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamWriterState.m"; sourceTree = ""; }; + 4A92E914179548B40077B69C /* SBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonWriter.h; path = "submodules/json-framework/src/main/objc/SBJsonWriter.h"; sourceTree = ""; }; + 4A92E915179548B40077B69C /* SBJsonWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonWriter.m; path = "submodules/json-framework/src/main/objc/SBJsonWriter.m"; sourceTree = ""; }; 4AD96DF21680853E00D9E42D /* SocketIOPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketIOPacket.h; sourceTree = SOURCE_ROOT; }; 4AD96DF31680853E00D9E42D /* SocketIOPacket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SocketIOPacket.m; sourceTree = SOURCE_ROOT; }; 4AD96DF616808B7900D9E42D /* SocketIOTransportWebsocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SocketIOTransportWebsocket.h; path = ../SocketIOTransportWebsocket.h; sourceTree = ""; }; @@ -128,31 +122,27 @@ 4A4453781589EE6300B44ABB /* SBJson */ = { isa = PBXGroup; children = ( - 4A4453531589EE5900B44ABB /* NSObject+SBJson.h */, - 4A4453541589EE5900B44ABB /* NSObject+SBJson.m */, - 4A4453551589EE5900B44ABB /* SBJson.h */, - 4A4453561589EE5900B44ABB /* SBJsonParser.h */, - 4A4453571589EE5900B44ABB /* SBJsonParser.m */, - 4A4453581589EE5900B44ABB /* SBJsonStreamParser.h */, - 4A4453591589EE5900B44ABB /* SBJsonStreamParser.m */, - 4A44535A1589EE5900B44ABB /* SBJsonStreamParserAccumulator.h */, - 4A44535B1589EE5900B44ABB /* SBJsonStreamParserAccumulator.m */, - 4A44535C1589EE5900B44ABB /* SBJsonStreamParserAdapter.h */, - 4A44535D1589EE5900B44ABB /* SBJsonStreamParserAdapter.m */, - 4A44535E1589EE5900B44ABB /* SBJsonStreamParserState.h */, - 4A44535F1589EE5900B44ABB /* SBJsonStreamParserState.m */, - 4A4453601589EE5900B44ABB /* SBJsonStreamWriter.h */, - 4A4453611589EE5900B44ABB /* SBJsonStreamWriter.m */, - 4A4453621589EE5900B44ABB /* SBJsonStreamWriterAccumulator.h */, - 4A4453631589EE5900B44ABB /* SBJsonStreamWriterAccumulator.m */, - 4A4453641589EE5900B44ABB /* SBJsonStreamWriterState.h */, - 4A4453651589EE5900B44ABB /* SBJsonStreamWriterState.m */, - 4A4453661589EE5900B44ABB /* SBJsonTokeniser.h */, - 4A4453671589EE5900B44ABB /* SBJsonTokeniser.m */, - 4A4453681589EE5900B44ABB /* SBJsonUTF8Stream.h */, - 4A4453691589EE5900B44ABB /* SBJsonUTF8Stream.m */, - 4A44536A1589EE5900B44ABB /* SBJsonWriter.h */, - 4A44536B1589EE5900B44ABB /* SBJsonWriter.m */, + 4A92E901179548B40077B69C /* SBJson.h */, + 4A92E902179548B40077B69C /* SBJsonParser.h */, + 4A92E903179548B40077B69C /* SBJsonParser.m */, + 4A92E904179548B40077B69C /* SBJsonStreamParser.h */, + 4A92E905179548B40077B69C /* SBJsonStreamParser.m */, + 4A92E906179548B40077B69C /* SBJsonStreamParserAccumulator.h */, + 4A92E907179548B40077B69C /* SBJsonStreamParserAccumulator.m */, + 4A92E908179548B40077B69C /* SBJsonStreamParserAdapter.h */, + 4A92E909179548B40077B69C /* SBJsonStreamParserAdapter.m */, + 4A92E90A179548B40077B69C /* SBJsonStreamParserState.h */, + 4A92E90B179548B40077B69C /* SBJsonStreamParserState.m */, + 4A92E90C179548B40077B69C /* SBJsonStreamTokeniser.h */, + 4A92E90D179548B40077B69C /* SBJsonStreamTokeniser.m */, + 4A92E90E179548B40077B69C /* SBJsonStreamWriter.h */, + 4A92E90F179548B40077B69C /* SBJsonStreamWriter.m */, + 4A92E910179548B40077B69C /* SBJsonStreamWriterAccumulator.h */, + 4A92E911179548B40077B69C /* SBJsonStreamWriterAccumulator.m */, + 4A92E912179548B40077B69C /* SBJsonStreamWriterState.h */, + 4A92E913179548B40077B69C /* SBJsonStreamWriterState.m */, + 4A92E914179548B40077B69C /* SBJsonWriter.h */, + 4A92E915179548B40077B69C /* SBJsonWriter.m */, ); name = SBJson; path = ..; @@ -267,7 +257,7 @@ 4ADCCB9415790D760022990C /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0430; + LastUpgradeCheck = 0460; ORGANIZATIONNAME = beta_interactive; }; buildConfigurationList = 4ADCCB9715790D760022990C /* Build configuration list for PBXProject "SocketTesterARC" */; @@ -308,18 +298,6 @@ 4ADCCBAE15790D760022990C /* main.m in Sources */, 4ADCCBB215790D760022990C /* AppDelegate.m in Sources */, 4ADCCBB515790D760022990C /* ViewController.m in Sources */, - 4A44536C1589EE5900B44ABB /* NSObject+SBJson.m in Sources */, - 4A44536D1589EE5900B44ABB /* SBJsonParser.m in Sources */, - 4A44536E1589EE5900B44ABB /* SBJsonStreamParser.m in Sources */, - 4A44536F1589EE5900B44ABB /* SBJsonStreamParserAccumulator.m in Sources */, - 4A4453701589EE5900B44ABB /* SBJsonStreamParserAdapter.m in Sources */, - 4A4453711589EE5900B44ABB /* SBJsonStreamParserState.m in Sources */, - 4A4453721589EE5900B44ABB /* SBJsonStreamWriter.m in Sources */, - 4A4453731589EE5900B44ABB /* SBJsonStreamWriterAccumulator.m in Sources */, - 4A4453741589EE5900B44ABB /* SBJsonStreamWriterState.m in Sources */, - 4A4453751589EE5900B44ABB /* SBJsonTokeniser.m in Sources */, - 4A4453761589EE5900B44ABB /* SBJsonUTF8Stream.m in Sources */, - 4A4453771589EE5900B44ABB /* SBJsonWriter.m in Sources */, 4A4453811589EE9100B44ABB /* base64.c in Sources */, 4A4453821589EE9100B44ABB /* NSData+SRB64Additions.m in Sources */, 4A4453831589EE9100B44ABB /* SRWebSocket.m in Sources */, @@ -327,6 +305,16 @@ 4AD96DF41680853E00D9E42D /* SocketIOPacket.m in Sources */, 4AD96DF816808B7900D9E42D /* SocketIOTransportWebsocket.m in Sources */, 4AD96DFC16822DE300D9E42D /* SocketIOTransportXHR.m in Sources */, + 4A92E916179548B40077B69C /* SBJsonParser.m in Sources */, + 4A92E917179548B40077B69C /* SBJsonStreamParser.m in Sources */, + 4A92E918179548B40077B69C /* SBJsonStreamParserAccumulator.m in Sources */, + 4A92E919179548B40077B69C /* SBJsonStreamParserAdapter.m in Sources */, + 4A92E91A179548B40077B69C /* SBJsonStreamParserState.m in Sources */, + 4A92E91B179548B40077B69C /* SBJsonStreamTokeniser.m in Sources */, + 4A92E91C179548B40077B69C /* SBJsonStreamWriter.m in Sources */, + 4A92E91D179548B40077B69C /* SBJsonStreamWriterAccumulator.m in Sources */, + 4A92E91E179548B40077B69C /* SBJsonStreamWriterState.m in Sources */, + 4A92E91F179548B40077B69C /* SBJsonWriter.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -358,6 +346,10 @@ ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -384,6 +376,10 @@ ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; GCC_C_LANGUAGE_STANDARD = gnu99; diff --git a/submodules/json-framework b/submodules/json-framework index 8007b27..f304818 160000 --- a/submodules/json-framework +++ b/submodules/json-framework @@ -1 +1 @@ -Subproject commit 8007b273c2e22cc20a70ade19662353ca3f29b14 +Subproject commit f30481843f7cc49be9b9e8f8fd0fe8f0162c9241 diff --git a/submodules/socket-rocket b/submodules/socket-rocket index f61e3c3..ce02374 160000 --- a/submodules/socket-rocket +++ b/submodules/socket-rocket @@ -1 +1 @@ -Subproject commit f61e3c3ae532bf72f0c75524c92e95d625283a13 +Subproject commit ce02374210f6e158d44a90eaaaf43fa7373eff21