Fixing the project to be Carthage compatible and work with CocoaAsync…

…Socket (#3) * Fixing the project to be Carthage compatible and work with CocoaAsyncSocket * Fix static target * Fixing build warning with Carthage * Removing CocoaAsyncSocket form public header * Updating README for the pull request
livio · Jun 11, 2016 · cbb5e02 · cbb5e02
1 parent 0f8f09e
commit cbb5e02
Show file tree

Hide file tree

Showing 16 changed files with 106 additions and 15,921 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,8 +36,4 @@ xcuserdata
 #Pods/
 
 # Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build
+Carthage/Build/
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Carthage/Checkouts/CocoaAsyncSocket"]
+	path = Carthage/Checkouts/CocoaAsyncSocket
+	url = https://github.com/robbiehanson/CocoaAsyncSocket.git
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1 @@
+github "robbiehanson/CocoaAsyncSocket" ~> 7.4.3
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1 @@
+github "robbiehanson/CocoaAsyncSocket" "7.4.3"
diff --git a/Carthage/Checkouts/CocoaAsyncSocket b/Carthage/Checkouts/CocoaAsyncSocket
diff --git a/LivioHTTPServer/CocoaAsyncSocketGCD/GCDAsyncSocket.h b/LivioHTTPServer/CocoaAsyncSocketGCD/GCDAsyncSocket.h
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		github "robbiehanson/CocoaAsyncSocket" ~> 7.4.3