Support Swift Package Manager (#7)

Author: stevenzeck

.gitignore

@@ -3,3 +3,4 @@ xcuserdata
 project.xcworkspace
 /build
 /Carthage/Build
+.build

GCDWebServer/Core/GCDWebServer.m

@@ -40,7 +40,11 @@
 #import <netinet/in.h>
 #import <dns_sd.h>
 
+#ifdef SWIFT_PACKAGE
+#import "../Core/GCDWebServerPrivate.h"
+#else
 #import "GCDWebServerPrivate.h"
+#endif
 
 #if TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
 #define kDefaultPort 80

GCDWebServer/Core/GCDWebServerConnection.m

@@ -35,7 +35,11 @@
 #import <libkern/OSAtomic.h>
 #endif
 
+#ifdef SWIFT_PACKAGE
+#import "../Core/GCDWebServerPrivate.h"
+#else
 #import "GCDWebServerPrivate.h"
+#endif
 
 #define kHeadersReadCapacity (1 * 1024)
 #define kBodyReadCapacity (256 * 1024)

GCDWebServer/Core/GCDWebServerFunctions.m

@@ -41,7 +41,11 @@
 #import <net/if.h>
 #import <netdb.h>
 
+#ifdef SWIFT_PACKAGE
+#import "../Core/GCDWebServerPrivate.h"
+#else
 #import "GCDWebServerPrivate.h"
+#endif
 
 static NSDateFormatter* _dateFormatterRFC822 = nil;
 static NSDateFormatter* _dateFormatterISO8601 = nil;

GCDWebServer/Core/GCDWebServerPrivate.h

@@ -38,6 +38,17 @@
 #import "GCDWebServer.h"
 #import "GCDWebServerConnection.h"
 
+#ifdef SWIFT_PACKAGE
+#import "../Requests/GCDWebServerDataRequest.h"
+#import "../Requests/GCDWebServerFileRequest.h"
+#import "../Requests/GCDWebServerMultiPartFormRequest.h"
+#import "../Requests/GCDWebServerURLEncodedFormRequest.h"
+
+#import "../Responses/GCDWebServerDataResponse.h"
+#import "../Responses/GCDWebServerErrorResponse.h"
+#import "../Responses/GCDWebServerFileResponse.h"
+#import "../Responses/GCDWebServerStreamedResponse.h"
+#else
 #import "GCDWebServerDataRequest.h"
 #import "GCDWebServerFileRequest.h"
 #import "GCDWebServerMultiPartFormRequest.h"
@@ -47,6 +58,7 @@
 #import "GCDWebServerErrorResponse.h"
 #import "GCDWebServerFileResponse.h"
 #import "GCDWebServerStreamedResponse.h"
+#endif
 
 /**
  *  Check if a custom logging facility should be used instead.

GCDWebServer/Core/GCDWebServerRequest.m

@@ -31,7 +31,11 @@
 
 #import <zlib.h>
 
+#ifdef SWIFT_PACKAGE
+#import "../Core/GCDWebServerPrivate.h"
+#else
 #import "GCDWebServerPrivate.h"
+#endif
 
 NSString* const GCDWebServerRequestAttribute_RegexCaptures = @"GCDWebServerRequestAttribute_RegexCaptures";
 

GCDWebServer/Core/GCDWebServerResponse.m

@@ -31,7 +31,11 @@
 
 #import <zlib.h>
 
+#ifdef SWIFT_PACKAGE
+#import "../Core/GCDWebServerPrivate.h"
+#else
 #import "GCDWebServerPrivate.h"
+#endif
 
 #define kZlibErrorDomain @"ZlibErrorDomain"
 #define kGZipInitialBufferSize (256 * 1024)

GCDWebServer/Requests/GCDWebServerDataRequest.m

@@ -29,7 +29,11 @@
 #error GCDWebServer requires ARC
 #endif
 
+#ifdef SWIFT_PACKAGE
+#import "../Core/GCDWebServerPrivate.h"
+#else
 #import "GCDWebServerPrivate.h"
+#endif
 
 @interface GCDWebServerDataRequest ()
 @property(nonatomic) NSMutableData* data;

GCDWebServer/Requests/GCDWebServerFileRequest.m

@@ -29,7 +29,11 @@
 #error GCDWebServer requires ARC
 #endif
 
+#ifdef SWIFT_PACKAGE
+#import "../Core/GCDWebServerPrivate.h"
+#else
 #import "GCDWebServerPrivate.h"
+#endif
 
 @implementation GCDWebServerFileRequest {
   int _file;

GCDWebServer/Requests/GCDWebServerMultiPartFormRequest.m

@@ -29,7 +29,11 @@
 #error GCDWebServer requires ARC
 #endif
 
+#ifdef SWIFT_PACKAGE
+#import "../Core/GCDWebServerPrivate.h"
+#else
 #import "GCDWebServerPrivate.h"
+#endif
 
 #define kMultiPartBufferSize (256 * 1024)
 

GCDWebServer/Requests/GCDWebServerURLEncodedFormRequest.m

@@ -29,7 +29,11 @@
 #error GCDWebServer requires ARC
 #endif
 
+#ifdef SWIFT_PACKAGE
+#import "../Core/GCDWebServerPrivate.h"
+#else
 #import "GCDWebServerPrivate.h"
+#endif
 
 @implementation GCDWebServerURLEncodedFormRequest
 

GCDWebServer/Responses/GCDWebServerDataResponse.m

@@ -29,7 +29,11 @@
 #error GCDWebServer requires ARC
 #endif
 
+#ifdef SWIFT_PACKAGE
+#import "../Core/GCDWebServerPrivate.h"
+#else
 #import "GCDWebServerPrivate.h"
+#endif
 
 @implementation GCDWebServerDataResponse {
   NSData* _data;

GCDWebServer/Responses/GCDWebServerErrorResponse.m

@@ -29,7 +29,11 @@
 #error GCDWebServer requires ARC
 #endif
 
+#ifdef SWIFT_PACKAGE
+#import "../Core/GCDWebServerPrivate.h"
+#else
 #import "GCDWebServerPrivate.h"
+#endif
 
 @implementation GCDWebServerErrorResponse
 

GCDWebServer/Responses/GCDWebServerFileResponse.m

@@ -31,7 +31,11 @@
 
 #import <sys/stat.h>
 
+#ifdef SWIFT_PACKAGE
+#import "../Core/GCDWebServerPrivate.h"
+#else
 #import "GCDWebServerPrivate.h"
+#endif
 
 #define kFileReadBufferSize (32 * 1024)
 

GCDWebServer/Responses/GCDWebServerStreamedResponse.m

@@ -29,7 +29,11 @@
 #error GCDWebServer requires ARC
 #endif
 
+#ifdef SWIFT_PACKAGE
+#import "../Core/GCDWebServerPrivate.h"
+#else
 #import "GCDWebServerPrivate.h"
+#endif
 
 @implementation GCDWebServerStreamedResponse {
   GCDWebServerAsyncStreamBlock _block;

GCDWebServer/include/GCDWebServer.h

@@ -0,0 +1,14 @@
+#import "GCDWebServerCore.h"
+#import "GCDWebServerConnection.h"
+#import "GCDWebServerDataRequest.h"
+#import "GCDWebServerDataResponse.h"
+#import "GCDWebServerErrorResponse.h"
+#import "GCDWebServerFileRequest.h"
+#import "GCDWebServerFileResponse.h"
+#import "GCDWebServerFunctions.h"
+#import "GCDWebServerHTTPStatusCodes.h"
+#import "GCDWebServerMultiPartFormRequest.h"
+#import "GCDWebServerRequest.h"
+#import "GCDWebServerResponse.h"
+#import "GCDWebServerStreamedResponse.h"
+#import "GCDWebServerURLEncodedFormRequest.h"

GCDWebServer/include/GCDWebServerConnection.h

@@ -0,0 +1 @@
+../Core/GCDWebServerConnection.h

GCDWebServer/include/GCDWebServerCore.h

@@ -0,0 +1 @@
+../Core/GCDWebServer.h

GCDWebServer/include/GCDWebServerDataRequest.h

@@ -0,0 +1 @@
+../Requests/GCDWebServerDataRequest.h

GCDWebServer/include/GCDWebServerDataResponse.h

@@ -0,0 +1 @@
+../Responses/GCDWebServerDataResponse.h

GCDWebServer/include/GCDWebServerErrorResponse.h

@@ -0,0 +1 @@
+../Responses/GCDWebServerErrorResponse.h

GCDWebServer/include/GCDWebServerFileRequest.h

@@ -0,0 +1 @@
+../Requests/GCDWebServerFileRequest.h

GCDWebServer/include/GCDWebServerFileResponse.h

@@ -0,0 +1 @@
+../Responses/GCDWebServerFileResponse.h

GCDWebServer/include/GCDWebServerFunctions.h

@@ -0,0 +1 @@
+../Core/GCDWebServerFunctions.h

GCDWebServer/include/GCDWebServerHTTPStatusCodes.h

@@ -0,0 +1 @@
+../Core/GCDWebServerHTTPStatusCodes.h

GCDWebServer/include/GCDWebServerMultiPartFormRequest.h

@@ -0,0 +1 @@
+../Requests/GCDWebServerMultiPartFormRequest.h

GCDWebServer/include/GCDWebServerRequest.h

@@ -0,0 +1 @@
+../Core/GCDWebServerRequest.h

GCDWebServer/include/GCDWebServerResponse.h

@@ -0,0 +1 @@
+../Core/GCDWebServerResponse.h

GCDWebServer/include/GCDWebServerStreamedResponse.h

@@ -0,0 +1 @@
+../Responses/GCDWebServerStreamedResponse.h

GCDWebServer/include/GCDWebServerURLEncodedFormRequest.h

@@ -0,0 +1 @@
+../Requests/GCDWebServerURLEncodedFormRequest.h

Package.swift

@@ -0,0 +1,18 @@
+// swift-tools-version:5.1
+import PackageDescription
+
+let package = Package(
+    name: "GCDWebServer",
+    products: [
+        .library(name: "GCDWebServer", targets: ["GCDWebServer"]),
+    ],
+    targets: [
+        .target(
+            name: "GCDWebServer",
+            path: "GCDWebServer",
+            cSettings: [
+                .define("SWIFT_PACKAGE")
+            ]
+        )
+    ]
+)