Changed project version to 1.0.3 ( pbxproj + podspec ).

All source files moved to the root of "Sources" directory.
Fixed Carthage build ( Xcode 7.2 + wift-2.2-SNAPSHOT-2015-12-18-a.xctoolchain ).

Sources/Swifter/Const.swift → Sources/Const.swift

@@ -14,7 +14,7 @@ import Foundation
 
 struct Constants {
     
-    static let VERSION      = "1.0.2"
+    static let VERSION      = "1.0.3"
     static let DEFAULT_PORT = in_port_t(8080)
     
     static let CR           = UInt8(13)

Swifter.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
 
   s.name                  = "Swifter"
-  s.version               = "1.0.2"
+  s.version               = "1.0.3"
   s.summary               = "Tiny http server engine written in Swift programming language."
   s.homepage              = "https://github.com/glock45/swifter"
   s.license               = { :type => 'Copyright', :file => 'LICENSE' }
   s.author                = { "Damian Kołakowski" => "kolakowski.damian@gmail.com" }
   s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.9"
-  s.source                = { :git => "https://github.com/glock45/swifter.git", :tag => "1.0.2" }
-  s.source_files          = 'Common/*.{h,m,swift}'
+  s.source                = { :git => "https://github.com/glock45/swifter.git", :tag => "1.0.3" }
+  s.source_files          = 'Sources/*.{h,m,swift}'
 
 end

Swifter.xcodeproj/project.pbxproj

@@ -10,58 +10,58 @@
 		7AE893EA1C05127900A29F63 /* SwifteriOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AE893E91C05127900A29F63 /* SwifteriOS.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7AE893FE1C0512C400A29F63 /* SwifterMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AE893FD1C0512C400A29F63 /* SwifterMac.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7AE8940D1C05151100A29F63 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7AE8940C1C05151100A29F63 /* Launch Screen.storyboard */; };
-		7C47894E1C222C7F00586CD0 /* Const.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C47894B1C222C7F00586CD0 /* Const.swift */; };
-		7C47894F1C222C7F00586CD0 /* Const.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C47894B1C222C7F00586CD0 /* Const.swift */; };
-		7C4789581C234B3800586CD0 /* HttpServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4789551C234B3800586CD0 /* HttpServer.swift */; };
-		7C4789591C234B3800586CD0 /* HttpServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4789551C234B3800586CD0 /* HttpServer.swift */; };
-		7C67C3491C17542E007B98E8 /* HttpRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C67C3461C17542E007B98E8 /* HttpRouter.swift */; };
-		7C67C34A1C17542E007B98E8 /* HttpRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C67C3461C17542E007B98E8 /* HttpRouter.swift */; };
 		7C71C5B01A1D52F800682BF0 /* login.html in CopyFiles */ = {isa = PBXBuildFile; fileRef = 98630C061A1C9A9D00478D08 /* login.html */; };
 		7C71C5B11A1EC49B00682BF0 /* logo.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7CB102DF1A17381D00CBA3B4 /* logo.png */; };
 		7C73C6911C2615FE00AEF6CA /* SwiftyJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18E610A51BD6397D00B7D17A /* SwiftyJSON.swift */; };
 		7C73C6921C26179C00AEF6CA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CDAB80C1BE2A1D400C8A977 /* AppDelegate.swift */; };
+		7C73C6A91C261A2100AEF6CA /* Const.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C6931C2619E100AEF6CA /* Const.swift */; };
+		7C73C6AA1C261A2100AEF6CA /* DemoServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C6941C2619E100AEF6CA /* DemoServer.swift */; };
+		7C73C6AB1C261A2100AEF6CA /* HttpHandlers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C6951C2619E100AEF6CA /* HttpHandlers.swift */; };
+		7C73C6AC1C261A2100AEF6CA /* HttpParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C6961C2619E100AEF6CA /* HttpParser.swift */; };
+		7C73C6AD1C261A2100AEF6CA /* HttpRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C6971C2619E100AEF6CA /* HttpRequest.swift */; };
+		7C73C6AE1C261A2100AEF6CA /* HttpResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C6981C2619E100AEF6CA /* HttpResponse.swift */; };
+		7C73C6AF1C261A2100AEF6CA /* HttpRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C6991C2619E100AEF6CA /* HttpRouter.swift */; };
+		7C73C6B01C261A2100AEF6CA /* HttpServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C69A1C2619E100AEF6CA /* HttpServer.swift */; };
+		7C73C6B11C261A2100AEF6CA /* HttpServerIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C69B1C2619E100AEF6CA /* HttpServerIO.swift */; };
+		7C73C6B21C261A2100AEF6CA /* Socket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C69C1C2619E100AEF6CA /* Socket.swift */; };
+		7C73C6B31C261A2100AEF6CA /* String+Misc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C69D1C2619E100AEF6CA /* String+Misc.swift */; };
+		7C73C6B41C261A2600AEF6CA /* Const.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C6931C2619E100AEF6CA /* Const.swift */; };
+		7C73C6B51C261A2600AEF6CA /* DemoServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C6941C2619E100AEF6CA /* DemoServer.swift */; };
+		7C73C6B61C261A2600AEF6CA /* HttpHandlers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C6951C2619E100AEF6CA /* HttpHandlers.swift */; };
+		7C73C6B71C261A2600AEF6CA /* HttpParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C6961C2619E100AEF6CA /* HttpParser.swift */; };
+		7C73C6B81C261A2600AEF6CA /* HttpRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C6971C2619E100AEF6CA /* HttpRequest.swift */; };
+		7C73C6B91C261A2600AEF6CA /* HttpResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C6981C2619E100AEF6CA /* HttpResponse.swift */; };
+		7C73C6BA1C261A2600AEF6CA /* HttpRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C6991C2619E100AEF6CA /* HttpRouter.swift */; };
+		7C73C6BB1C261A2600AEF6CA /* HttpServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C69A1C2619E100AEF6CA /* HttpServer.swift */; };
+		7C73C6BC1C261A2600AEF6CA /* HttpServerIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C69B1C2619E100AEF6CA /* HttpServerIO.swift */; };
+		7C73C6BD1C261A2600AEF6CA /* Socket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C69C1C2619E100AEF6CA /* Socket.swift */; };
+		7C73C6BE1C261A2600AEF6CA /* String+Misc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C73C69D1C2619E100AEF6CA /* String+Misc.swift */; };
 		7C7488781C1DA07300CBCD77 /* file.html in Resources */ = {isa = PBXBuildFile; fileRef = 7C7488771C1DA07300CBCD77 /* file.html */; };
 		7C74887B1C1DA08200CBCD77 /* file.html in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7C7488771C1DA07300CBCD77 /* file.html */; };
 		7CA4813E19A2EA8D0030B30D /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CA4813D19A2EA8D0030B30D /* main.swift */; };
 		7CA4815819A2EF2B0030B30D /* test.json in Resources */ = {isa = PBXBuildFile; fileRef = 7CA4815719A2EF2B0030B30D /* test.json */; };
 		7CA4815919A2EF560030B30D /* test.json in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7CA4815719A2EF2B0030B30D /* test.json */; };
 		7CB102E01A17381D00CBA3B4 /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 7CB102DF1A17381D00CBA3B4 /* logo.png */; };
-		7CD6DABB1C15C48500A04931 /* String+Misc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD6DAB81C15C48500A04931 /* String+Misc.swift */; };
-		7CD6DABC1C15C48500A04931 /* String+Misc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD6DAB81C15C48500A04931 /* String+Misc.swift */; };
 		7CDAB8131BE2A1D400C8A977 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7CDAB80D1BE2A1D400C8A977 /* Main.storyboard */; };
 		7CDAB8141BE2A1D400C8A977 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7CDAB80F1BE2A1D400C8A977 /* Images.xcassets */; };
 		7CDAB8161BE2A1D400C8A977 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CDAB8111BE2A1D400C8A977 /* ViewController.swift */; };
-		7CEAF8551C14B29B003252DE /* DemoServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAF84C1C14B29B003252DE /* DemoServer.swift */; };
-		7CEAF8561C14B29B003252DE /* DemoServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAF84C1C14B29B003252DE /* DemoServer.swift */; };
-		7CEAF8591C14B29B003252DE /* HttpHandlers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAF84D1C14B29B003252DE /* HttpHandlers.swift */; };
-		7CEAF85A1C14B29B003252DE /* HttpHandlers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAF84D1C14B29B003252DE /* HttpHandlers.swift */; };
-		7CEAF85D1C14B29B003252DE /* HttpParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAF84E1C14B29B003252DE /* HttpParser.swift */; };
-		7CEAF85E1C14B29B003252DE /* HttpParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAF84E1C14B29B003252DE /* HttpParser.swift */; };
-		7CEAF8611C14B29B003252DE /* HttpRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAF84F1C14B29B003252DE /* HttpRequest.swift */; };
-		7CEAF8621C14B29B003252DE /* HttpRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAF84F1C14B29B003252DE /* HttpRequest.swift */; };
-		7CEAF8651C14B29B003252DE /* HttpResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAF8501C14B29B003252DE /* HttpResponse.swift */; };
-		7CEAF8661C14B29B003252DE /* HttpResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAF8501C14B29B003252DE /* HttpResponse.swift */; };
-		7CEAF8691C14B29B003252DE /* HttpServerIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAF8511C14B29B003252DE /* HttpServerIO.swift */; };
-		7CEAF86A1C14B29B003252DE /* HttpServerIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAF8511C14B29B003252DE /* HttpServerIO.swift */; };
-		7CEAF86D1C14B29B003252DE /* Socket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAF8521C14B29B003252DE /* Socket.swift */; };
-		7CEAF86E1C14B29B003252DE /* Socket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CEAF8521C14B29B003252DE /* Socket.swift */; };
 		98630C071A1C9A9D00478D08 /* login.html in Resources */ = {isa = PBXBuildFile; fileRef = 98630C061A1C9A9D00478D08 /* login.html */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		7AE8940A1C0513C500A29F63 /* PBXContainerItemProxy */ = {
+		7AE8940E1C0515A200A29F63 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7C839B6619422CFF003A6950 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 7AE893E61C05127900A29F63;
-			remoteInfo = SwifteriOS;
+			remoteGlobalIDString = 7AE893FA1C0512C400A29F63;
+			remoteInfo = SwifterMac;
 		};
-		7AE8940E1C0515A200A29F63 /* PBXContainerItemProxy */ = {
+		7C73C6BF1C261AA700AEF6CA /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7C839B6619422CFF003A6950 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 7AE893FA1C0512C400A29F63;
-			remoteInfo = SwifterMac;
+			remoteGlobalIDString = 7AE893E61C05127900A29F63;
+			remoteInfo = SwifteriOS;
 		};
 /* End PBXContainerItemProxy section */
 
@@ -90,28 +90,28 @@
 		7AE893FD1C0512C400A29F63 /* SwifterMac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwifterMac.h; sourceTree = "<group>"; };
 		7AE893FF1C0512C400A29F63 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		7AE8940C1C05151100A29F63 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
-		7C47894B1C222C7F00586CD0 /* Const.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Const.swift; sourceTree = "<group>"; };
-		7C4789551C234B3800586CD0 /* HttpServer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpServer.swift; sourceTree = "<group>"; };
-		7C67C3461C17542E007B98E8 /* HttpRouter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpRouter.swift; sourceTree = "<group>"; };
+		7C73C6931C2619E100AEF6CA /* Const.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Const.swift; sourceTree = "<group>"; };
+		7C73C6941C2619E100AEF6CA /* DemoServer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoServer.swift; sourceTree = "<group>"; };
+		7C73C6951C2619E100AEF6CA /* HttpHandlers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpHandlers.swift; sourceTree = "<group>"; };
+		7C73C6961C2619E100AEF6CA /* HttpParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpParser.swift; sourceTree = "<group>"; };
+		7C73C6971C2619E100AEF6CA /* HttpRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpRequest.swift; sourceTree = "<group>"; };
+		7C73C6981C2619E100AEF6CA /* HttpResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpResponse.swift; sourceTree = "<group>"; };
+		7C73C6991C2619E100AEF6CA /* HttpRouter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpRouter.swift; sourceTree = "<group>"; };
+		7C73C69A1C2619E100AEF6CA /* HttpServer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpServer.swift; sourceTree = "<group>"; };
+		7C73C69B1C2619E100AEF6CA /* HttpServerIO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpServerIO.swift; sourceTree = "<group>"; };
+		7C73C69C1C2619E100AEF6CA /* Socket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Socket.swift; sourceTree = "<group>"; };
+		7C73C69D1C2619E100AEF6CA /* String+Misc.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Misc.swift"; sourceTree = "<group>"; };
 		7C7488771C1DA07300CBCD77 /* file.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = file.html; sourceTree = "<group>"; };
 		7C839B6E19422CFF003A6950 /* SwifterSampleiOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwifterSampleiOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		7CA4813B19A2EA8D0030B30D /* SwifterSampleOSX */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SwifterSampleOSX; sourceTree = BUILT_PRODUCTS_DIR; };
 		7CA4813D19A2EA8D0030B30D /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
 		7CA4815719A2EF2B0030B30D /* test.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = test.json; sourceTree = "<group>"; };
 		7CB102DF1A17381D00CBA3B4 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; };
-		7CD6DAB81C15C48500A04931 /* String+Misc.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Misc.swift"; sourceTree = "<group>"; };
 		7CDAB80C1BE2A1D400C8A977 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7CDAB80E1BE2A1D400C8A977 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		7CDAB80F1BE2A1D400C8A977 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		7CDAB8101BE2A1D400C8A977 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		7CDAB8111BE2A1D400C8A977 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
-		7CEAF84C1C14B29B003252DE /* DemoServer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoServer.swift; sourceTree = "<group>"; };
-		7CEAF84D1C14B29B003252DE /* HttpHandlers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpHandlers.swift; sourceTree = "<group>"; };
-		7CEAF84E1C14B29B003252DE /* HttpParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpParser.swift; sourceTree = "<group>"; };
-		7CEAF84F1C14B29B003252DE /* HttpRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpRequest.swift; sourceTree = "<group>"; };
-		7CEAF8501C14B29B003252DE /* HttpResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpResponse.swift; sourceTree = "<group>"; };
-		7CEAF8511C14B29B003252DE /* HttpServerIO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpServerIO.swift; sourceTree = "<group>"; };
-		7CEAF8521C14B29B003252DE /* Socket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Socket.swift; sourceTree = "<group>"; };
 		7CEAF86F1C14B2B5003252DE /* Package.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
 		98630C061A1C9A9D00478D08 /* login.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = login.html; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -227,29 +227,21 @@
 		7CEAF84A1C14B29B003252DE /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				7CEAF84B1C14B29B003252DE /* Swifter */,
+				7C73C6931C2619E100AEF6CA /* Const.swift */,
+				7C73C6941C2619E100AEF6CA /* DemoServer.swift */,
+				7C73C6951C2619E100AEF6CA /* HttpHandlers.swift */,
+				7C73C6961C2619E100AEF6CA /* HttpParser.swift */,
+				7C73C6971C2619E100AEF6CA /* HttpRequest.swift */,
+				7C73C6981C2619E100AEF6CA /* HttpResponse.swift */,
+				7C73C6991C2619E100AEF6CA /* HttpRouter.swift */,
+				7C73C69A1C2619E100AEF6CA /* HttpServer.swift */,
+				7C73C69B1C2619E100AEF6CA /* HttpServerIO.swift */,
+				7C73C69C1C2619E100AEF6CA /* Socket.swift */,
+				7C73C69D1C2619E100AEF6CA /* String+Misc.swift */,
 			);
 			path = Sources;
 			sourceTree = "<group>";
 		};
-		7CEAF84B1C14B29B003252DE /* Swifter */ = {
-			isa = PBXGroup;
-			children = (
-				7CEAF84C1C14B29B003252DE /* DemoServer.swift */,
-				7C67C3461C17542E007B98E8 /* HttpRouter.swift */,
-				7CEAF84D1C14B29B003252DE /* HttpHandlers.swift */,
-				7CEAF84F1C14B29B003252DE /* HttpRequest.swift */,
-				7C47894B1C222C7F00586CD0 /* Const.swift */,
-				7CEAF84E1C14B29B003252DE /* HttpParser.swift */,
-				7CEAF8501C14B29B003252DE /* HttpResponse.swift */,
-				7CEAF8511C14B29B003252DE /* HttpServerIO.swift */,
-				7CEAF8521C14B29B003252DE /* Socket.swift */,
-				7CD6DAB81C15C48500A04931 /* String+Misc.swift */,
-				7C4789551C234B3800586CD0 /* HttpServer.swift */,
-			);
-			path = Swifter;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -319,7 +311,7 @@
 			buildRules = (
 			);
 			dependencies = (
-				7AE8940B1C0513C500A29F63 /* PBXTargetDependency */,
+				7C73C6C01C261AA700AEF6CA /* PBXTargetDependency */,
 			);
 			name = SwifterSampleiOS;
 			productName = Swifter;
@@ -425,17 +417,17 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7CEAF8651C14B29B003252DE /* HttpResponse.swift in Sources */,
-				7C4789581C234B3800586CD0 /* HttpServer.swift in Sources */,
-				7CEAF86D1C14B29B003252DE /* Socket.swift in Sources */,
-				7CEAF8591C14B29B003252DE /* HttpHandlers.swift in Sources */,
-				7CEAF8691C14B29B003252DE /* HttpServerIO.swift in Sources */,
-				7CEAF8611C14B29B003252DE /* HttpRequest.swift in Sources */,
-				7CEAF85D1C14B29B003252DE /* HttpParser.swift in Sources */,
-				7CEAF8551C14B29B003252DE /* DemoServer.swift in Sources */,
-				7CD6DABB1C15C48500A04931 /* String+Misc.swift in Sources */,
-				7C67C3491C17542E007B98E8 /* HttpRouter.swift in Sources */,
-				7C47894E1C222C7F00586CD0 /* Const.swift in Sources */,
+				7C73C6A91C261A2100AEF6CA /* Const.swift in Sources */,
+				7C73C6AA1C261A2100AEF6CA /* DemoServer.swift in Sources */,
+				7C73C6AB1C261A2100AEF6CA /* HttpHandlers.swift in Sources */,
+				7C73C6AC1C261A2100AEF6CA /* HttpParser.swift in Sources */,
+				7C73C6AD1C261A2100AEF6CA /* HttpRequest.swift in Sources */,
+				7C73C6AE1C261A2100AEF6CA /* HttpResponse.swift in Sources */,
+				7C73C6AF1C261A2100AEF6CA /* HttpRouter.swift in Sources */,
+				7C73C6B01C261A2100AEF6CA /* HttpServer.swift in Sources */,
+				7C73C6B11C261A2100AEF6CA /* HttpServerIO.swift in Sources */,
+				7C73C6B21C261A2100AEF6CA /* Socket.swift in Sources */,
+				7C73C6B31C261A2100AEF6CA /* String+Misc.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -443,17 +435,17 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7CEAF8661C14B29B003252DE /* HttpResponse.swift in Sources */,
-				7C4789591C234B3800586CD0 /* HttpServer.swift in Sources */,
-				7CEAF86E1C14B29B003252DE /* Socket.swift in Sources */,
-				7CEAF85A1C14B29B003252DE /* HttpHandlers.swift in Sources */,
-				7CEAF86A1C14B29B003252DE /* HttpServerIO.swift in Sources */,
-				7CEAF8621C14B29B003252DE /* HttpRequest.swift in Sources */,
-				7CEAF85E1C14B29B003252DE /* HttpParser.swift in Sources */,
-				7CEAF8561C14B29B003252DE /* DemoServer.swift in Sources */,
-				7CD6DABC1C15C48500A04931 /* String+Misc.swift in Sources */,
-				7C67C34A1C17542E007B98E8 /* HttpRouter.swift in Sources */,
-				7C47894F1C222C7F00586CD0 /* Const.swift in Sources */,
+				7C73C6B41C261A2600AEF6CA /* Const.swift in Sources */,
+				7C73C6B51C261A2600AEF6CA /* DemoServer.swift in Sources */,
+				7C73C6B61C261A2600AEF6CA /* HttpHandlers.swift in Sources */,
+				7C73C6B71C261A2600AEF6CA /* HttpParser.swift in Sources */,
+				7C73C6B81C261A2600AEF6CA /* HttpRequest.swift in Sources */,
+				7C73C6B91C261A2600AEF6CA /* HttpResponse.swift in Sources */,
+				7C73C6BA1C261A2600AEF6CA /* HttpRouter.swift in Sources */,
+				7C73C6BB1C261A2600AEF6CA /* HttpServer.swift in Sources */,
+				7C73C6BC1C261A2600AEF6CA /* HttpServerIO.swift in Sources */,
+				7C73C6BD1C261A2600AEF6CA /* Socket.swift in Sources */,
+				7C73C6BE1C261A2600AEF6CA /* String+Misc.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -478,16 +470,16 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		7AE8940B1C0513C500A29F63 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 7AE893E61C05127900A29F63 /* SwifteriOS */;
-			targetProxy = 7AE8940A1C0513C500A29F63 /* PBXContainerItemProxy */;
-		};
 		7AE8940F1C0515A200A29F63 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 7AE893FA1C0512C400A29F63 /* SwifterMac */;
 			targetProxy = 7AE8940E1C0515A200A29F63 /* PBXContainerItemProxy */;
 		};
+		7C73C6C01C261AA700AEF6CA /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 7AE893E61C05127900A29F63 /* SwifteriOS */;
+			targetProxy = 7C73C6BF1C261AA700AEF6CA /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -506,7 +498,7 @@
 		7AE893ED1C05127900A29F63 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.0.3;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -530,7 +522,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.0.3;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -555,7 +547,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.0.3;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -583,7 +575,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.0.3;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -624,6 +616,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 1.0.3;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -670,6 +663,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
+				CURRENT_PROJECT_VERSION = 1.0.3;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

Swifter.xcodeproj/xcuserdata/damiankolakowski.xcuserdatad/xcschemes/SwifterOSX.xcscheme

@@ -1,91 +0,0 @@
-<?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 = "7CA4813A19A2EA8D0030B30D"
-               BuildableName = "SwifterSampleOSX"
-               BlueprintName = "SwifterSampleOSX"
-               ReferencedContainer = "container:Swifter.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7CA4813A19A2EA8D0030B30D"
-            BuildableName = "SwifterSampleOSX"
-            BlueprintName = "SwifterSampleOSX"
-            ReferencedContainer = "container:Swifter.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <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">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7CA4813A19A2EA8D0030B30D"
-            BuildableName = "SwifterSampleOSX"
-            BlueprintName = "SwifterSampleOSX"
-            ReferencedContainer = "container:Swifter.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7CA4813A19A2EA8D0030B30D"
-            BuildableName = "SwifterSampleOSX"
-            BlueprintName = "SwifterSampleOSX"
-            ReferencedContainer = "container:Swifter.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

Swifter.xcodeproj/xcuserdata/damiankolakowski.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -4,16 +4,26 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>SwifterOSX.xcscheme</key>
+		<key>SwifterMac.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>1</integer>
 		</dict>
-		<key>SwifteriOS.xcscheme</key>
+		<key>SwifterSampleOSX.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>3</integer>
 		</dict>
+		<key>SwifterSampleiOS.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+		<key>SwifteriOS.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>

SwifterMac/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

SwifterSampleiOS/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>