robbiehanson · chbeer · Apr 3, 2014 · Oct 14, 2015 · Oct 15, 2015 · Oct 15, 2015
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1,2 @@
+github "CocoaLumberjack/CocoaLumberjack" ~> 2.1.0
+github "robbiehanson/CocoaAsyncSocket" "master"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,2 @@
+github "robbiehanson/CocoaAsyncSocket" "fe716222f72811e66de02809eae8db77dacb6a83"
+github "CocoaLumberjack/CocoaLumberjack" "7707947dd98a9cb235881643aaf71fab99c4b972"
diff --git a/CocoaHTTPServer.podspec.json b/CocoaHTTPServer.podspec.json
@@ -0,0 +1,44 @@
+{
+  "name": "CocoaHTTPServer",
+  "version": "2.3",
+  "license": "BSD",
+  "summary": "A small, lightweight, embeddable HTTP server for Mac OS X or iOS applications.",
+  "homepage": "https://github.com/robbiehanson/CocoaHTTPServer",
+  "authors": {
+    "Robbie Hanson": "[email protected]"
+  },
+  "source": {
+    "git": "https://github.com/robbiehanson/CocoaHTTPServer.git",
+    "tag": "2.3"
+  },
+  "source_files": "Sources/CocoaHTTPServer/{Core,Extensions}/**/*.{h,m}",
+  "requires_arc": true,
+  "platforms": {
+    "ios": "5.0",
+    "osx": "10.7"
+  },
+  "ios": {
+    "frameworks": [
+      "CFNetwork",
+      "Security"
+    ]
+  },
+  "osx": {
+    "frameworks": [
+      "CoreServices",
+      "Security"
+    ]
+  },
+  "libraries": "xml2",
+  "xcconfig": {
+    "HEADER_SEARCH_PATHS": "\"$(SDKROOT)/usr/include/libxml2\""
+  },
+  "dependencies": {
+    "CocoaAsyncSocket": [
+
+    ],
+    "CocoaLumberjack": [
+
+    ]
+  }
+}
diff --git a/CocoaHTTPServer.xcodeproj/project.pbxproj b/CocoaHTTPServer.xcodeproj/project.pbxproj
diff --git a/CocoaHTTPServer.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/CocoaHTTPServer.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/CocoaHTTPServer.xcodeproj/xcshareddata/xcschemes/OS X Framework.xcscheme b/CocoaHTTPServer.xcodeproj/xcshareddata/xcschemes/OS X Framework.xcscheme
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0700"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AAEF3A461BD0012D0000509E"
+               BuildableName = "CocoaHTTPServer.framework"
+               BlueprintName = "OS X Framework"
+               ReferencedContainer = "container:CocoaHTTPServer.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "AAEF3A461BD0012D0000509E"
+            BuildableName = "CocoaHTTPServer.framework"
+            BlueprintName = "OS X Framework"
+            ReferencedContainer = "container:CocoaHTTPServer.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "AAEF3A461BD0012D0000509E"
+            BuildableName = "CocoaHTTPServer.framework"
+            BlueprintName = "OS X Framework"
+            ReferencedContainer = "container:CocoaHTTPServer.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/CocoaHTTPServer.xcodeproj/xcshareddata/xcschemes/iOS Framework.xcscheme b/CocoaHTTPServer.xcodeproj/xcshareddata/xcschemes/iOS Framework.xcscheme
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0700"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AAEF39101BCF02870000509E"
+               BuildableName = "CocoaHTTPServer.framework"
+               BlueprintName = "iOS Framework"
+               ReferencedContainer = "container:CocoaHTTPServer.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "AAEF39101BCF02870000509E"
+            BuildableName = "CocoaHTTPServer.framework"
+            BlueprintName = "iOS Framework"
+            ReferencedContainer = "container:CocoaHTTPServer.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "AAEF39101BCF02870000509E"
+            BuildableName = "CocoaHTTPServer.framework"
+            BlueprintName = "iOS Framework"
+            ReferencedContainer = "container:CocoaHTTPServer.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Info.plist b/Info.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/Package.resolved b/Package.resolved
@@ -0,0 +1,14 @@
+{
+  "pins" : [
+    {
+      "identity" : "cocoaasyncsocket",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/robbiehanson/CocoaAsyncSocket.git",
+      "state" : {
+        "revision" : "dbdc00669c1ced63b27c3c5f052ee4d28f10150c",
+        "version" : "7.6.5"
+      }
+    }
+  ],
+  "version" : 2
+}
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,31 @@
+// swift-tools-version: 5.6
+
+import PackageDescription
+
+let package = Package(
+    name: "CocoaHTTPServer",
+    defaultLocalization: "en",
+    platforms: [
+        .iOS(.v14),
+        .macOS(.v10_15)
+    ],
+    products: [
+        .library(
+            name: "CocoaHTTPServer",
+            targets: ["CocoaHTTPServer"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        .package(url: "https://github.com/robbiehanson/CocoaAsyncSocket.git", from: "7.0.0"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        .target(
+            name: "CocoaHTTPServer",
+            dependencies: ["CocoaAsyncSocket"]),
+        .testTarget(
+            name: "CocoaHTTPServerTests",
+            dependencies: ["CocoaHTTPServer"]),
+    ]
+)
diff --git a/README.markdown b/README.markdown
@@ -1,3 +1,5 @@
+[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
+
 CocoaHTTPServer is a small, lightweight, embeddable HTTP server for Mac OS X or iOS applications.
 
 Sometimes developers need an embedded HTTP server in their app. Perhaps it's a server application with remote monitoring. Or perhaps it's a desktop application using HTTP for the communication backend. Or perhaps it's an iOS app providing over-the-air access to documents. Whatever your reason, CocoaHTTPServer can get the job done. It provides:

diff --git a/README.md b/README.md
@@ -0,0 +1,3 @@
+# CocoaHTTPServer
+
+A description of this package.
diff --git a/Samples/DynamicServer/DynamicServerAppDelegate.m b/Samples/DynamicServer/DynamicServerAppDelegate.m
@@ -1,23 +1,13 @@
 #import "DynamicServerAppDelegate.h"
 #import "HTTPServer.h"
 #import "MyHTTPConnection.h"
-#import "DDLog.h"
-#import "DDTTYLogger.h"
-
-// Log levels: off, error, warn, info, verbose
-static const int ddLogLevel = LOG_LEVEL_VERBOSE;
-
 
 @implementation DynamicServerAppDelegate
 
 @synthesize window;
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
-	// Configure our logging framework.
-	// To keep things simple and fast, we're just going to log to the Xcode console.
-	[DDLog addLogger:[DDTTYLogger sharedInstance]];
-
 	// Initalize our http server
 	httpServer = [[HTTPServer alloc] init];
 
@@ -35,7 +25,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 
 	// Serve files from our embedded Web folder
 	NSString *webPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"Web"];
-	DDLogVerbose(@"Setting document root: %@", webPath);
+	os_log(@"Setting document root: %@", webPath);
 
 	[httpServer setDocumentRoot:webPath];
 

diff --git a/Samples/DynamicServer/HTTPResponseTest.m b/Samples/DynamicServer/HTTPResponseTest.m
@@ -95,7 +95,7 @@ - (void)asyncStuffFinished
 
 - (BOOL)delayResponseHeaders
 {
-	HTTPLogTrace2(@"%@[%p] %@ -> %@", THIS_FILE, self, THIS_METHOD, (readyToSendResponseHeaders ? @"NO" : @"YES"));
+	HTTPLogTrace2("delayResponseHeaders -> %@", (readyToSendResponseHeaders ? @"NO" : @"YES"));
 
 	__block BOOL delayResponseHeaders = NO;
 

diff --git a/Samples/DynamicServer/MyHTTPConnection.m b/Samples/DynamicServer/MyHTTPConnection.m
@@ -36,7 +36,7 @@ @implementation MyHTTPConnection
 
 	if ([relativePath isEqualToString:@"/index.html"])
 	{
-		HTTPLogVerbose(@"%@[%p]: Serving up dynamic content", THIS_FILE, self);
+		HTTPLogVerbose("Serving up dynamic content", self);
 
 		// The index.html file contains several dynamic fields that need to be completed.
 		// For example:
@@ -67,7 +67,7 @@ @implementation MyHTTPConnection
 		[replacementDict setObject:@"A"         forKey:@"ALPHABET"];
 		[replacementDict setObject:@"  QUACK  " forKey:@"QUACK"];
 
-		HTTPLogVerbose(@"%@[%p]: replacementDict = \n%@", THIS_FILE, self, replacementDict);
+		HTTPLogVerbose("replacementDict = \n%@", self, replacementDict);
 
 		return [[HTTPDynamicFileResponse alloc] initWithFilePath:[self filePathForURI:path]
 		                                            forConnection:self
@@ -76,7 +76,7 @@ @implementation MyHTTPConnection
 	}
 	else if ([relativePath isEqualToString:@"/unittest.html"])
 	{
-		HTTPLogVerbose(@"%@[%p]: Serving up HTTPResponseTest (unit testing)", THIS_FILE, self);
+		HTTPLogVerbose("Serving up HTTPResponseTest (unit testing)", self);
 
 		return [[HTTPResponseTest alloc] initWithConnection:self];
 	}

diff --git a/Samples/PasswdHTTPServer/MyHTTPConnection.m b/Samples/PasswdHTTPServer/MyHTTPConnection.m
@@ -14,7 +14,7 @@ - (BOOL)isPasswordProtected:(NSString *)path
 
 	BOOL result = [path hasPrefix:@"/secret"];
 
-	HTTPLogTrace2(@"%@[%p]: isPasswordProtected(%@) - %@", THIS_FILE, self, path, (result ? @"YES" : @"NO"));
+	HTTPLogTrace2("isPasswordProtected(%@) - %@", self, path, (result ? @"YES" : @"NO"));
 
 	return result;
 }