diff --git a/.gitignore b/.gitignore index 0dbaeb2..d047bb7 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ xcuserdata *.perspectivev3 # Carthage -Carthage/ +Carthage/Build # Third party tools .idea/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..7bf11fd --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "Carthage/Checkouts/CocoaAsyncSocket"] + path = Carthage/Checkouts/CocoaAsyncSocket + url = https://github.com/robbiehanson/CocoaAsyncSocket.git +[submodule "Carthage/Checkouts/HTTPParserC"] + path = Carthage/Checkouts/HTTPParserC + url = https://github.com/Building42/HTTPParserC.git diff --git a/.travis.yml b/.travis.yml index ee7ca59..a4de0e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ before_install: before_script: # Build the dependencies - - carthage bootstrap --cache-builds + - carthage bootstrap --use-submodules --no-build script: # Produce a failure return code if any command errors diff --git a/Cartfile b/Cartfile index cde0d35..cb72860 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "robbiehanson/CocoaAsyncSocket" ~> 7.6.3 -github "Building42/HTTPParserC" ~> 2.9.2 +github "robbiehanson/CocoaAsyncSocket" "b179ea4" +github "Building42/HTTPParserC" "b0a01bc" diff --git a/Cartfile.resolved b/Cartfile.resolved index 4eed99b..214d7e1 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "Building42/HTTPParserC" "2.9.2" -github "robbiehanson/CocoaAsyncSocket" "7.6.3" +github "Building42/HTTPParserC" "b0a01bc2743df3a8668d54bef35432abf0d77e93" +github "robbiehanson/CocoaAsyncSocket" "b179ea4013e94e31e6e637955e520ea4fb9d1b13" diff --git a/Carthage/Checkouts/CocoaAsyncSocket b/Carthage/Checkouts/CocoaAsyncSocket new file mode 160000 index 0000000..b179ea4 --- /dev/null +++ b/Carthage/Checkouts/CocoaAsyncSocket @@ -0,0 +1 @@ +Subproject commit b179ea4013e94e31e6e637955e520ea4fb9d1b13 diff --git a/Carthage/Checkouts/HTTPParserC b/Carthage/Checkouts/HTTPParserC new file mode 160000 index 0000000..b0a01bc --- /dev/null +++ b/Carthage/Checkouts/HTTPParserC @@ -0,0 +1 @@ +Subproject commit b0a01bc2743df3a8668d54bef35432abf0d77e93 diff --git a/Examples/iOS Example.xcodeproj/project.pbxproj b/Examples/iOS Example.xcodeproj/project.pbxproj index 3e0c4a9..fb80c2f 100644 --- a/Examples/iOS Example.xcodeproj/project.pbxproj +++ b/Examples/iOS Example.xcodeproj/project.pbxproj @@ -7,10 +7,13 @@ objects = { /* Begin PBXBuildFile section */ - 822E961B218CD02400567C72 /* Telegraph.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E961A218CD02400567C72 /* Telegraph.framework */; }; - 822E962E218CD16F00567C72 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E962C218CD16F00567C72 /* CocoaAsyncSocket.framework */; }; - 822E962F218CD16F00567C72 /* HTTPParserC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E962D218CD16F00567C72 /* HTTPParserC.framework */; }; 8284FF211ECEA0BB00303A00 /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = 8284FF201ECEA0BB00303A00 /* index.html */; }; + 82E02AA922DFB4800026C3B1 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02AA822DFB4800026C3B1 /* CocoaAsyncSocket.framework */; }; + 82E02AAB22DFB4800026C3B1 /* HTTPParserC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02AAA22DFB4800026C3B1 /* HTTPParserC.framework */; }; + 82E02AAD22DFB4800026C3B1 /* Telegraph.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02AAC22DFB4800026C3B1 /* Telegraph.framework */; }; + 82E02AB022DFB49F0026C3B1 /* Telegraph.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02AAC22DFB4800026C3B1 /* Telegraph.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 82E02AB122DFB4A20026C3B1 /* HTTPParserC.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02AAA22DFB4800026C3B1 /* HTTPParserC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 82E02AB222DFB4A40026C3B1 /* CocoaAsyncSocket.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02AA822DFB4800026C3B1 /* CocoaAsyncSocket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 82EF33F41ECD330C002DC910 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82EF33F31ECD330C002DC910 /* AppDelegate.swift */; }; 82EF33F61ECD330C002DC910 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82EF33F51ECD330C002DC910 /* ViewController.swift */; }; 82EF33F91ECD330C002DC910 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 82EF33F71ECD330C002DC910 /* Main.storyboard */; }; @@ -22,11 +25,27 @@ 82EF34591ECD3C19002DC910 /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 82EF34541ECD3C19002DC910 /* logo.png */; }; /* End PBXBuildFile section */ +/* Begin PBXCopyFilesBuildPhase section */ + 82E02A8422DFB2990026C3B1 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 82E02AB222DFB4A40026C3B1 /* CocoaAsyncSocket.framework in Embed Frameworks */, + 82E02AB122DFB4A20026C3B1 /* HTTPParserC.framework in Embed Frameworks */, + 82E02AB022DFB49F0026C3B1 /* Telegraph.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ - 822E961A218CD02400567C72 /* Telegraph.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Telegraph.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 822E962C218CD16F00567C72 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CocoaAsyncSocket.framework; path = ../Carthage/Build/iOS/CocoaAsyncSocket.framework; sourceTree = ""; }; - 822E962D218CD16F00567C72 /* HTTPParserC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HTTPParserC.framework; path = ../Carthage/Build/iOS/HTTPParserC.framework; sourceTree = ""; }; 8284FF201ECEA0BB00303A00 /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = ""; }; + 82E02AA822DFB4800026C3B1 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CocoaAsyncSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 82E02AAA22DFB4800026C3B1 /* HTTPParserC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = HTTPParserC.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 82E02AAC22DFB4800026C3B1 /* Telegraph.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Telegraph.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 82EF33F01ECD330C002DC910 /* iOS Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iOS Example.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 82EF33F31ECD330C002DC910 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 82EF33F51ECD330C002DC910 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -45,9 +64,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 822E961B218CD02400567C72 /* Telegraph.framework in Frameworks */, - 822E962E218CD16F00567C72 /* CocoaAsyncSocket.framework in Frameworks */, - 822E962F218CD16F00567C72 /* HTTPParserC.framework in Frameworks */, + 82E02AA922DFB4800026C3B1 /* CocoaAsyncSocket.framework in Frameworks */, + 82E02AAB22DFB4800026C3B1 /* HTTPParserC.framework in Frameworks */, + 82E02AAD22DFB4800026C3B1 /* Telegraph.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -110,9 +129,9 @@ D4C1ED80EA03A2C0B2A71305 /* Frameworks */ = { isa = PBXGroup; children = ( - 822E962C218CD16F00567C72 /* CocoaAsyncSocket.framework */, - 822E962D218CD16F00567C72 /* HTTPParserC.framework */, - 822E961A218CD02400567C72 /* Telegraph.framework */, + 82E02AA822DFB4800026C3B1 /* CocoaAsyncSocket.framework */, + 82E02AAA22DFB4800026C3B1 /* HTTPParserC.framework */, + 82E02AAC22DFB4800026C3B1 /* Telegraph.framework */, ); name = Frameworks; sourceTree = ""; @@ -127,7 +146,7 @@ 82EF33EC1ECD330C002DC910 /* Sources */, 82EF33ED1ECD330C002DC910 /* Frameworks */, 82EF33EE1ECD330C002DC910 /* Resources */, - 822E9603218CCB6300567C72 /* [Carthage] Copy Frameworks */, + 82E02A8422DFB2990026C3B1 /* Embed Frameworks */, ); buildRules = ( ); @@ -190,31 +209,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 822E9603218CCB6300567C72 /* [Carthage] Copy Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "$(SRCROOT)/../Carthage/Build/iOS/CocoaAsyncSocket.framework", - "$(SRCROOT)/../Carthage/Build/iOS/HTTPParserC.framework", - ); - name = "[Carthage] Copy Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/CocoaAsyncSocket.framework", - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/HTTPParserC.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "carthage copy-frameworks\n"; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 82EF33EC1ECD330C002DC910 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -284,7 +278,6 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../Carthage/Build/iOS"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -346,7 +339,6 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../Carthage/Build/iOS"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/Examples/macOS Example.xcodeproj/project.pbxproj b/Examples/macOS Example.xcodeproj/project.pbxproj index 9bb88fb..dda17a4 100644 --- a/Examples/macOS Example.xcodeproj/project.pbxproj +++ b/Examples/macOS Example.xcodeproj/project.pbxproj @@ -7,11 +7,14 @@ objects = { /* Begin PBXBuildFile section */ - 822E9607218CCBF200567C72 /* Telegraph.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E95F4218CC78D00567C72 /* Telegraph.framework */; }; - 822E960A218CCBFF00567C72 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E9608218CCBFF00567C72 /* CocoaAsyncSocket.framework */; }; - 822E960B218CCBFF00567C72 /* HTTPParserC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E9609218CCBFF00567C72 /* HTTPParserC.framework */; }; 8284FF271ECEA4B200303A00 /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = 8284FF261ECEA4B200303A00 /* index.html */; }; 82DD426D1FD86ADE00136B81 /* AppWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82DD426C1FD86ADE00136B81 /* AppWindow.swift */; }; + 82E02AC322DFB5070026C3B1 /* Telegraph.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02AC222DFB5070026C3B1 /* Telegraph.framework */; }; + 82E02AC522DFB50A0026C3B1 /* HTTPParserC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02AC422DFB50A0026C3B1 /* HTTPParserC.framework */; }; + 82E02AC722DFB50E0026C3B1 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02AC622DFB50E0026C3B1 /* CocoaAsyncSocket.framework */; }; + 82E02AC822DFB5170026C3B1 /* Telegraph.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02AC222DFB5070026C3B1 /* Telegraph.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 82E02AC922DFB5190026C3B1 /* HTTPParserC.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02AC422DFB50A0026C3B1 /* HTTPParserC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 82E02ACA22DFB51C0026C3B1 /* CocoaAsyncSocket.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02AC622DFB50E0026C3B1 /* CocoaAsyncSocket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 82EF34391ECD356A002DC910 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82EF34381ECD356A002DC910 /* AppDelegate.swift */; }; 82EF343B1ECD356A002DC910 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82EF343A1ECD356A002DC910 /* ViewController.swift */; }; 82EF343D1ECD356A002DC910 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 82EF343C1ECD356A002DC910 /* Assets.xcassets */; }; @@ -22,12 +25,28 @@ 82EF34721ECD3C8B002DC910 /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 82EF346D1ECD3C8B002DC910 /* logo.png */; }; /* End PBXBuildFile section */ +/* Begin PBXCopyFilesBuildPhase section */ + 82E02A8B22DFB3200026C3B1 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 82E02ACA22DFB51C0026C3B1 /* CocoaAsyncSocket.framework in Embed Frameworks */, + 82E02AC922DFB5190026C3B1 /* HTTPParserC.framework in Embed Frameworks */, + 82E02AC822DFB5170026C3B1 /* Telegraph.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ - 822E95F4218CC78D00567C72 /* Telegraph.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Telegraph.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 822E9608218CCBFF00567C72 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CocoaAsyncSocket.framework; path = ../Carthage/Build/Mac/CocoaAsyncSocket.framework; sourceTree = ""; }; - 822E9609218CCBFF00567C72 /* HTTPParserC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HTTPParserC.framework; path = ../Carthage/Build/Mac/HTTPParserC.framework; sourceTree = ""; }; 8284FF261ECEA4B200303A00 /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = ""; }; 82DD426C1FD86ADE00136B81 /* AppWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppWindow.swift; sourceTree = ""; }; + 82E02AC222DFB5070026C3B1 /* Telegraph.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Telegraph.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 82E02AC422DFB50A0026C3B1 /* HTTPParserC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = HTTPParserC.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 82E02AC622DFB50E0026C3B1 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CocoaAsyncSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 82EF34351ECD356A002DC910 /* macOS Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "macOS Example.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 82EF34381ECD356A002DC910 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 82EF343A1ECD356A002DC910 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -45,9 +64,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 822E960A218CCBFF00567C72 /* CocoaAsyncSocket.framework in Frameworks */, - 822E960B218CCBFF00567C72 /* HTTPParserC.framework in Frameworks */, - 822E9607218CCBF200567C72 /* Telegraph.framework in Frameworks */, + 82E02AC722DFB50E0026C3B1 /* CocoaAsyncSocket.framework in Frameworks */, + 82E02AC522DFB50A0026C3B1 /* HTTPParserC.framework in Frameworks */, + 82E02AC322DFB5070026C3B1 /* Telegraph.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -110,9 +129,9 @@ ED78A2D0236679E4CE6C4163 /* Frameworks */ = { isa = PBXGroup; children = ( - 822E9608218CCBFF00567C72 /* CocoaAsyncSocket.framework */, - 822E9609218CCBFF00567C72 /* HTTPParserC.framework */, - 822E95F4218CC78D00567C72 /* Telegraph.framework */, + 82E02AC622DFB50E0026C3B1 /* CocoaAsyncSocket.framework */, + 82E02AC422DFB50A0026C3B1 /* HTTPParserC.framework */, + 82E02AC222DFB5070026C3B1 /* Telegraph.framework */, ); name = Frameworks; sourceTree = ""; @@ -127,7 +146,7 @@ 82EF34311ECD356A002DC910 /* Sources */, 82EF34321ECD356A002DC910 /* Frameworks */, 82EF34331ECD356A002DC910 /* Resources */, - 822E9631218CD25D00567C72 /* [Carthage] Copy Frameworks */, + 82E02A8B22DFB3200026C3B1 /* Embed Frameworks */, ); buildRules = ( ); @@ -189,31 +208,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 822E9631218CD25D00567C72 /* [Carthage] Copy Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "$(SRCROOT)/../Carthage/Build/Mac/CocoaAsyncSocket.framework", - "$(SRCROOT)/../Carthage/Build/Mac/HTTPParserC.framework", - ); - name = "[Carthage] Copy Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/CocoaAsyncSocket.framework", - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/HTTPParserC.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "carthage copy-frameworks\n"; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 82EF34311ECD356A002DC910 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -275,7 +269,6 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../Carthage/Build/Mac"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -334,7 +327,6 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../Carthage/Build/Mac"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/Examples/tvOS Example.xcodeproj/project.pbxproj b/Examples/tvOS Example.xcodeproj/project.pbxproj index ef8408c..c5da2cb 100644 --- a/Examples/tvOS Example.xcodeproj/project.pbxproj +++ b/Examples/tvOS Example.xcodeproj/project.pbxproj @@ -7,10 +7,13 @@ objects = { /* Begin PBXBuildFile section */ - 822E95F3218CC78500567C72 /* Telegraph.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E95F2218CC78500567C72 /* Telegraph.framework */; }; - 822E9612218CCC3B00567C72 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E9610218CCC3B00567C72 /* CocoaAsyncSocket.framework */; }; - 822E9613218CCC3B00567C72 /* HTTPParserC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E9611218CCC3B00567C72 /* HTTPParserC.framework */; }; 8284FF251ECEA49900303A00 /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = 8284FF241ECEA49900303A00 /* index.html */; }; + 82E02B0422DFB8DD0026C3B1 /* Telegraph.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02B0322DFB8DD0026C3B1 /* Telegraph.framework */; }; + 82E02B0822DFB8E30026C3B1 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02B0722DFB8E30026C3B1 /* CocoaAsyncSocket.framework */; }; + 82E02B0C22DFB8F80026C3B1 /* HTTPParserC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02B0522DFB8E10026C3B1 /* HTTPParserC.framework */; }; + 82E02B1822DFB9440026C3B1 /* Telegraph.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02B0322DFB8DD0026C3B1 /* Telegraph.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 82E02B1922DFB9470026C3B1 /* HTTPParserC.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02B0522DFB8E10026C3B1 /* HTTPParserC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 82E02B1A22DFB94A0026C3B1 /* CocoaAsyncSocket.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02B0722DFB8E30026C3B1 /* CocoaAsyncSocket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 82EF341E1ECD33CF002DC910 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82EF341D1ECD33CF002DC910 /* AppDelegate.swift */; }; 82EF34201ECD33CF002DC910 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82EF341F1ECD33CF002DC910 /* ViewController.swift */; }; 82EF34231ECD33CF002DC910 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 82EF34211ECD33CF002DC910 /* Main.storyboard */; }; @@ -21,11 +24,27 @@ 82EF34641ECD3C52002DC910 /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 82EF345F1ECD3C52002DC910 /* logo.png */; }; /* End PBXBuildFile section */ +/* Begin PBXCopyFilesBuildPhase section */ + 82E02B1022DFB9020026C3B1 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 82E02B1A22DFB94A0026C3B1 /* CocoaAsyncSocket.framework in Embed Frameworks */, + 82E02B1922DFB9470026C3B1 /* HTTPParserC.framework in Embed Frameworks */, + 82E02B1822DFB9440026C3B1 /* Telegraph.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ - 822E95F2218CC78500567C72 /* Telegraph.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Telegraph.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 822E9610218CCC3B00567C72 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CocoaAsyncSocket.framework; path = ../Carthage/Build/tvOS/CocoaAsyncSocket.framework; sourceTree = ""; }; - 822E9611218CCC3B00567C72 /* HTTPParserC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HTTPParserC.framework; path = ../Carthage/Build/tvOS/HTTPParserC.framework; sourceTree = ""; }; 8284FF241ECEA49900303A00 /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = ""; }; + 82E02B0322DFB8DD0026C3B1 /* Telegraph.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Telegraph.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 82E02B0522DFB8E10026C3B1 /* HTTPParserC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = HTTPParserC.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 82E02B0722DFB8E30026C3B1 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CocoaAsyncSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 82EF341A1ECD33CF002DC910 /* tvOS Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "tvOS Example.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 82EF341D1ECD33CF002DC910 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 82EF341F1ECD33CF002DC910 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -43,9 +62,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 822E9612218CCC3B00567C72 /* CocoaAsyncSocket.framework in Frameworks */, - 822E9613218CCC3B00567C72 /* HTTPParserC.framework in Frameworks */, - 822E95F3218CC78500567C72 /* Telegraph.framework in Frameworks */, + 82E02B0822DFB8E30026C3B1 /* CocoaAsyncSocket.framework in Frameworks */, + 82E02B0C22DFB8F80026C3B1 /* HTTPParserC.framework in Frameworks */, + 82E02B0422DFB8DD0026C3B1 /* Telegraph.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -55,9 +74,9 @@ 7A76BC6732A40F727598219C /* Frameworks */ = { isa = PBXGroup; children = ( - 822E9610218CCC3B00567C72 /* CocoaAsyncSocket.framework */, - 822E9611218CCC3B00567C72 /* HTTPParserC.framework */, - 822E95F2218CC78500567C72 /* Telegraph.framework */, + 82E02B0722DFB8E30026C3B1 /* CocoaAsyncSocket.framework */, + 82E02B0522DFB8E10026C3B1 /* HTTPParserC.framework */, + 82E02B0322DFB8DD0026C3B1 /* Telegraph.framework */, ); name = Frameworks; sourceTree = ""; @@ -124,7 +143,7 @@ 82EF34161ECD33CF002DC910 /* Sources */, 82EF34171ECD33CF002DC910 /* Frameworks */, 82EF34181ECD33CF002DC910 /* Resources */, - 822E9630218CD25400567C72 /* [Carthage] Copy Frameworks */, + 82E02B1022DFB9020026C3B1 /* Embed Frameworks */, ); buildRules = ( ); @@ -186,31 +205,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 822E9630218CD25400567C72 /* [Carthage] Copy Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "$(SRCROOT)/../Carthage/Build/tvOS/CocoaAsyncSocket.framework", - "$(SRCROOT)/../Carthage/Build/tvOS/HTTPParserC.framework", - ); - name = "[Carthage] Copy Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/CocoaAsyncSocket.framework", - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/HTTPParserC.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "carthage copy-frameworks\n"; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 82EF34161ECD33CF002DC910 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -271,7 +265,6 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../Carthage/Build/tvOS"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -331,7 +324,6 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../Carthage/Build/tvOS"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/README.md b/README.md index fa0e268..2317fe5 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ You can build the Telegraph framework and the examples with these steps: 1. install [Carthage](https://github.com/Carthage/Carthage) using Homebrew 2. clone the repository -3. run `carthage bootstrap` +3. run `carthage bootstrap --use-submodules --no-build` 4. open Telegraph.xcworkspace, select a scheme and build This is only necessary if you want to make changes to the framework or try out the examples. diff --git a/Telegraph.xcodeproj/project.pbxproj b/Telegraph.xcodeproj/project.pbxproj index 231475a..7b1e9a7 100644 --- a/Telegraph.xcodeproj/project.pbxproj +++ b/Telegraph.xcodeproj/project.pbxproj @@ -10,19 +10,11 @@ 820EA1DA20F9662F00CCCF6C /* SynchronizedSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 820EA1D920F9662F00CCCF6C /* SynchronizedSet.swift */; }; 820EA1DB20F9662F00CCCF6C /* SynchronizedSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 820EA1D920F9662F00CCCF6C /* SynchronizedSet.swift */; }; 820EA1DC20F9662F00CCCF6C /* SynchronizedSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 820EA1D920F9662F00CCCF6C /* SynchronizedSet.swift */; }; - 820F1FEA218CE06600C0F374 /* Telegraph.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 825A71A21ECD28710043AC8D /* Telegraph.framework */; }; - 820F1FEB218CE07500C0F374 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E9620218CD14000567C72 /* CocoaAsyncSocket.framework */; }; - 820F1FEC218CE07500C0F374 /* HTTPParserC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E9621218CD14000567C72 /* HTTPParserC.framework */; }; 821FD9F1216BE58E00D0F486 /* RFC1123.swift in Sources */ = {isa = PBXBuildFile; fileRef = 821FD9F0216BE58E00D0F486 /* RFC1123.swift */; }; 821FD9F2216BE58E00D0F486 /* RFC1123.swift in Sources */ = {isa = PBXBuildFile; fileRef = 821FD9F0216BE58E00D0F486 /* RFC1123.swift */; }; 821FD9F3216BE58E00D0F486 /* RFC1123.swift in Sources */ = {isa = PBXBuildFile; fileRef = 821FD9F0216BE58E00D0F486 /* RFC1123.swift */; }; + 82248EDA22DF9091008EB1B5 /* Telegraph.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 825A71A21ECD28710043AC8D /* Telegraph.framework */; }; 8226A7DA22D3D486002DEFA9 /* RouteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8226A7D822D3D46D002DEFA9 /* RouteTests.swift */; }; - 822E9622218CD14000567C72 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E9620218CD14000567C72 /* CocoaAsyncSocket.framework */; }; - 822E9623218CD14000567C72 /* HTTPParserC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E9621218CD14000567C72 /* HTTPParserC.framework */; }; - 822E9626218CD14900567C72 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E9624218CD14800567C72 /* CocoaAsyncSocket.framework */; }; - 822E9627218CD14900567C72 /* HTTPParserC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E9625218CD14900567C72 /* HTTPParserC.framework */; }; - 822E962A218CD15100567C72 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E9628218CD15100567C72 /* CocoaAsyncSocket.framework */; }; - 822E962B218CD15100567C72 /* HTTPParserC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 822E9629218CD15100567C72 /* HTTPParserC.framework */; }; 825A718A1ECD230E0043AC8D /* HelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 825A71811ECD22F60043AC8D /* HelperTests.swift */; }; 825A718B1ECD23100043AC8D /* SecurityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 825A71831ECD22F60043AC8D /* SecurityTests.swift */; }; 825A718C1ECD23140043AC8D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 825A71851ECD22F60043AC8D /* AppDelegate.swift */; }; @@ -220,6 +212,16 @@ 82D2AF04210D354600BF5BBA /* DataStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82D2AF03210D354600BF5BBA /* DataStream.swift */; }; 82D2AF05210D354600BF5BBA /* DataStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82D2AF03210D354600BF5BBA /* DataStream.swift */; }; 82D2AF06210D354600BF5BBA /* DataStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82D2AF03210D354600BF5BBA /* DataStream.swift */; }; + 82E02B3A22DFBB550026C3B1 /* HTTPParserC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02B3922DFBB550026C3B1 /* HTTPParserC.framework */; }; + 82E02B3C22DFBB580026C3B1 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02B3B22DFBB580026C3B1 /* CocoaAsyncSocket.framework */; }; + 82E02B3E22DFBB600026C3B1 /* HTTPParserC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02B3D22DFBB600026C3B1 /* HTTPParserC.framework */; }; + 82E02B4022DFBB650026C3B1 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02B3F22DFBB650026C3B1 /* CocoaAsyncSocket.framework */; }; + 82E02B4222DFBB6F0026C3B1 /* HTTPParserC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02B4122DFBB6F0026C3B1 /* HTTPParserC.framework */; }; + 82E02B4422DFBB730026C3B1 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82E02B4322DFBB730026C3B1 /* CocoaAsyncSocket.framework */; }; + 82E02B4622DFBC400026C3B1 /* HTTPParserC.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 82E02B4122DFBB6F0026C3B1 /* HTTPParserC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 82E02B4722DFBC470026C3B1 /* CocoaAsyncSocket.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 82E02B4322DFBB730026C3B1 /* CocoaAsyncSocket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 82E02B4922DFBC670026C3B1 /* HTTPParserC.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 82E02B4122DFBB6F0026C3B1 /* HTTPParserC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 82E02B4A22DFBC6A0026C3B1 /* CocoaAsyncSocket.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 82E02B4322DFBB730026C3B1 /* CocoaAsyncSocket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 82EC461F22CD1E26008A6A22 /* HTTPHeader+Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82EC461E22CD1E26008A6A22 /* HTTPHeader+Common.swift */; }; 82EC462022CD1E26008A6A22 /* HTTPHeader+Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82EC461E22CD1E26008A6A22 /* HTTPHeader+Common.swift */; }; 82EC462122CD1E26008A6A22 /* HTTPHeader+Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82EC461E22CD1E26008A6A22 /* HTTPHeader+Common.swift */; }; @@ -238,16 +240,35 @@ }; /* End PBXContainerItemProxy section */ +/* Begin PBXCopyFilesBuildPhase section */ + 82E02B4522DFBC310026C3B1 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 82E02B4722DFBC470026C3B1 /* CocoaAsyncSocket.framework in CopyFiles */, + 82E02B4622DFBC400026C3B1 /* HTTPParserC.framework in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 82E02B4822DFBC5D0026C3B1 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 82E02B4A22DFBC6A0026C3B1 /* CocoaAsyncSocket.framework in CopyFiles */, + 82E02B4922DFBC670026C3B1 /* HTTPParserC.framework in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 820EA1D920F9662F00CCCF6C /* SynchronizedSet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SynchronizedSet.swift; sourceTree = ""; }; 821FD9F0216BE58E00D0F486 /* RFC1123.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RFC1123.swift; sourceTree = ""; }; 8226A7D822D3D46D002DEFA9 /* RouteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RouteTests.swift; sourceTree = ""; }; - 822E9620218CD14000567C72 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CocoaAsyncSocket.framework; path = Carthage/Build/iOS/CocoaAsyncSocket.framework; sourceTree = ""; }; - 822E9621218CD14000567C72 /* HTTPParserC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HTTPParserC.framework; path = Carthage/Build/iOS/HTTPParserC.framework; sourceTree = ""; }; - 822E9624218CD14800567C72 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CocoaAsyncSocket.framework; path = Carthage/Build/tvOS/CocoaAsyncSocket.framework; sourceTree = ""; }; - 822E9625218CD14900567C72 /* HTTPParserC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HTTPParserC.framework; path = Carthage/Build/tvOS/HTTPParserC.framework; sourceTree = ""; }; - 822E9628218CD15100567C72 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CocoaAsyncSocket.framework; path = Carthage/Build/Mac/CocoaAsyncSocket.framework; sourceTree = ""; }; - 822E9629218CD15100567C72 /* HTTPParserC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HTTPParserC.framework; path = Carthage/Build/Mac/HTTPParserC.framework; sourceTree = ""; }; 8253CA141E498EBA0078D520 /* Telegraph TestsHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Telegraph TestsHost.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 825A71811ECD22F60043AC8D /* HelperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HelperTests.swift; sourceTree = ""; }; 825A71831ECD22F60043AC8D /* SecurityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecurityTests.swift; sourceTree = ""; }; @@ -324,6 +345,12 @@ 8284FF1C1ECE8C8E00303A00 /* HTTPFileHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTTPFileHandler.swift; sourceTree = ""; }; 82897602217402B60089D662 /* Endpoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Endpoint.swift; sourceTree = ""; }; 82D2AF03210D354600BF5BBA /* DataStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataStream.swift; sourceTree = ""; }; + 82E02B3922DFBB550026C3B1 /* HTTPParserC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = HTTPParserC.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 82E02B3B22DFBB580026C3B1 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CocoaAsyncSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 82E02B3D22DFBB600026C3B1 /* HTTPParserC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = HTTPParserC.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 82E02B3F22DFBB650026C3B1 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CocoaAsyncSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 82E02B4122DFBB6F0026C3B1 /* HTTPParserC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = HTTPParserC.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 82E02B4322DFBB730026C3B1 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CocoaAsyncSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 82EC461E22CD1E26008A6A22 /* HTTPHeader+Common.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "HTTPHeader+Common.swift"; sourceTree = ""; }; 82FB49BD2195BBFB00C4E574 /* Deprecations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Deprecations.swift; sourceTree = ""; }; D9899DD31DF4A092008766B5 /* Telegraph Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Telegraph Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -334,9 +361,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 820F1FEA218CE06600C0F374 /* Telegraph.framework in Frameworks */, - 820F1FEB218CE07500C0F374 /* CocoaAsyncSocket.framework in Frameworks */, - 820F1FEC218CE07500C0F374 /* HTTPParserC.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -344,8 +368,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 822E9622218CD14000567C72 /* CocoaAsyncSocket.framework in Frameworks */, - 822E9623218CD14000567C72 /* HTTPParserC.framework in Frameworks */, + 82E02B3C22DFBB580026C3B1 /* CocoaAsyncSocket.framework in Frameworks */, + 82E02B3A22DFBB550026C3B1 /* HTTPParserC.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -353,8 +377,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 822E9626218CD14900567C72 /* CocoaAsyncSocket.framework in Frameworks */, - 822E9627218CD14900567C72 /* HTTPParserC.framework in Frameworks */, + 82E02B4022DFBB650026C3B1 /* CocoaAsyncSocket.framework in Frameworks */, + 82E02B3E22DFBB600026C3B1 /* HTTPParserC.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -362,8 +386,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 822E962A218CD15100567C72 /* CocoaAsyncSocket.framework in Frameworks */, - 822E962B218CD15100567C72 /* HTTPParserC.framework in Frameworks */, + 82E02B4422DFBB730026C3B1 /* CocoaAsyncSocket.framework in Frameworks */, + 82E02B4222DFBB6F0026C3B1 /* HTTPParserC.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -371,49 +395,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 82248EDA22DF9091008EB1B5 /* Telegraph.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 822E95F6218CCA3F00567C72 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 822E9632218CD38600567C72 /* iOS */, - 822E9633218CD38F00567C72 /* tvOS */, - 822E9634218CD39400567C72 /* macOS */, - ); - name = Frameworks; - sourceTree = ""; - }; - 822E9632218CD38600567C72 /* iOS */ = { - isa = PBXGroup; - children = ( - 822E9620218CD14000567C72 /* CocoaAsyncSocket.framework */, - 822E9621218CD14000567C72 /* HTTPParserC.framework */, - ); - name = iOS; - sourceTree = ""; - }; - 822E9633218CD38F00567C72 /* tvOS */ = { - isa = PBXGroup; - children = ( - 822E9624218CD14800567C72 /* CocoaAsyncSocket.framework */, - 822E9625218CD14900567C72 /* HTTPParserC.framework */, - ); - name = tvOS; - sourceTree = ""; - }; - 822E9634218CD39400567C72 /* macOS */ = { - isa = PBXGroup; - children = ( - 822E9628218CD15100567C72 /* CocoaAsyncSocket.framework */, - 822E9629218CD15100567C72 /* HTTPParserC.framework */, - ); - name = macOS; - sourceTree = ""; - }; 825A717F1ECD22F60043AC8D /* Tests */ = { isa = PBXGroup; children = ( @@ -633,13 +621,26 @@ path = Helpers; sourceTree = ""; }; + 82E02B3022DFBB2B0026C3B1 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 82E02B4322DFBB730026C3B1 /* CocoaAsyncSocket.framework */, + 82E02B4122DFBB6F0026C3B1 /* HTTPParserC.framework */, + 82E02B3F22DFBB650026C3B1 /* CocoaAsyncSocket.framework */, + 82E02B3D22DFBB600026C3B1 /* HTTPParserC.framework */, + 82E02B3B22DFBB580026C3B1 /* CocoaAsyncSocket.framework */, + 82E02B3922DFBB550026C3B1 /* HTTPParserC.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; D9899DC01DF4A091008766B5 = { isa = PBXGroup; children = ( 825A71C41ECD2E890043AC8D /* Sources */, 825A717F1ECD22F60043AC8D /* Tests */, D9899DCB1DF4A092008766B5 /* Products */, - 822E95F6218CCA3F00567C72 /* Frameworks */, + 82E02B3022DFBB2B0026C3B1 /* Frameworks */, ); sourceTree = ""; }; @@ -692,7 +693,7 @@ 8253CA101E498EBA0078D520 /* Sources */, 8253CA111E498EBA0078D520 /* Frameworks */, 8253CA121E498EBA0078D520 /* Resources */, - 820F1FED218CE0AF00C0F374 /* [Carthage] Copy Frameworks */, + 82E02B4822DFBC5D0026C3B1 /* CopyFiles */, ); buildRules = ( ); @@ -767,6 +768,7 @@ D9899DCF1DF4A092008766B5 /* Sources */, D9899DD01DF4A092008766B5 /* Frameworks */, D9899DD11DF4A092008766B5 /* Resources */, + 82E02B4522DFBC310026C3B1 /* CopyFiles */, ); buildRules = ( ); @@ -887,28 +889,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 820F1FED218CE0AF00C0F374 /* [Carthage] Copy Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/iOS/CocoaAsyncSocket.framework", - "$(SRCROOT)/Carthage/Build/iOS/HTTPParserC.framework", - ); - name = "[Carthage] Copy Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/CocoaAsyncSocket.framework", - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/HTTPParserC.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "carthage copy-frameworks\n"; - }; 8246E0601FB26D8C0006A6C5 /* [SwiftLint] Analyze Source */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1219,8 +1199,7 @@ CODE_SIGN_ENTITLEMENTS = Tests/Host/TelegraphTestsHost.entitlements; DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", + "$(inherited)" ); INFOPLIST_FILE = "$(SRCROOT)/Tests/Host/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -1236,8 +1215,7 @@ CODE_SIGN_ENTITLEMENTS = Tests/Host/TelegraphTestsHost.entitlements; DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", + "$(inherited)" ); INFOPLIST_FILE = "$(SRCROOT)/Tests/Host/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -1251,14 +1229,9 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -1266,7 +1239,9 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.Building42.Telegraph-iOS"; PRODUCT_NAME = Telegraph; SKIP_INSTALL = YES; + SUPPORTS_UIKITFORMAC = NO; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -1274,14 +1249,9 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -1289,7 +1259,9 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.Building42.Telegraph-iOS"; PRODUCT_NAME = Telegraph; SKIP_INSTALL = YES; + SUPPORTS_UIKITFORMAC = NO; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; @@ -1297,14 +1269,9 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/tvOS", - ); INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1322,14 +1289,9 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/tvOS", - ); INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1347,15 +1309,10 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); FRAMEWORK_VERSION = A; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1373,15 +1330,10 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); FRAMEWORK_VERSION = A; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1427,7 +1379,6 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 0.26; DEBUG_INFORMATION_FORMAT = dwarf; @@ -1495,7 +1446,6 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 0.26; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; diff --git a/Telegraph.xcodeproj/xcshareddata/xcschemes/Telegraph iOS.xcscheme b/Telegraph.xcodeproj/xcshareddata/xcschemes/Telegraph iOS.xcscheme index 5ef8a4d..14d8eaf 100644 --- a/Telegraph.xcodeproj/xcshareddata/xcschemes/Telegraph iOS.xcscheme +++ b/Telegraph.xcodeproj/xcshareddata/xcschemes/Telegraph iOS.xcscheme @@ -27,15 +27,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - - - - @@ -48,6 +39,17 @@ + + + + + + + + + + + + + + + + + + + + + +