Merge pull request #139 from readium/develop

GCDWebServer update

Cartfile

@@ -2,4 +2,4 @@ github "readium/r2-shared-swift" == 1.4.2
 github "dexman/Minizip" == 1.4.0
 github "cezheng/Fuzi" == 3.1.1
 github "krzyzanowskim/CryptoSwift" == 1.2.0
-github "swisspol/GCDWebServer" == 3.5.3
+github "edrlab/GCDWebServer" == 3.6.2

Cartfile.resolved

@@ -1,5 +1,5 @@
 github "cezheng/Fuzi" "3.1.1"
 github "dexman/Minizip" "1.4.0"
+github "edrlab/GCDWebServer" "3.6.2"
 github "krzyzanowskim/CryptoSwift" "1.2.0"
 github "readium/r2-shared-swift" "1.4.2"
-github "swisspol/GCDWebServer" "3.5.3"

R2Streamer.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
 
   s.name         = "R2Streamer"
-  s.version      = "1.2.3"
+  s.version      = "1.2.4"
   s.license      = "BSD 3-Clause License"
   s.summary      = "R2 Streamer"
   s.homepage     = "http://readium.github.io"
   s.author       = { "Aferdita Muriqi" => "[email protected]" }
-  s.source       = { :git => "https://github.com/readium/r2-streamer-swift.git", :tag => "1.2.3" }
+  s.source       = { :git => "https://github.com/readium/r2-streamer-swift.git", :tag => "1.2.4" }
   s.exclude_files = ["**/Info*.plist"]
   s.requires_arc = true
   s.resources    = ['r2-streamer-swift/Resources/**']

r2-streamer-swift/Server/PublicationServer.swift

@@ -11,11 +11,7 @@
 
 import Foundation
 import R2Shared
-#if COCOAPODS
 import GCDWebServer
-#else
-import GCDWebServers
-#endif
 
 extension PublicationServer: Loggable {}
 

r2-streamer-swift/Server/WebServerResourceResponse.swift

@@ -9,14 +9,9 @@
 //  in the LICENSE file present in the project repository where this source code is maintained.
 //
 
-#if COCOAPODS
-import GCDWebServer
-#else
-import GCDWebServers
-#endif
-
 import Foundation
 import R2Shared
+import GCDWebServer
 
 extension GCDWebServerResponse: Loggable {}