From 8cfaa972fdf5a27736867ae3c16db98b60b685d3 Mon Sep 17 00:00:00 2001 From: Aferdita Muriqi Date: Tue, 26 Nov 2019 12:12:11 +0100 Subject: [PATCH] fixing conflicts --- Frameworks/Info.plist | 6 +- Frameworks/module.modulemap | 2 +- .../project.pbxproj | 491 +++--------------- .../xcschemes/GCDWebServers (iOS).xcscheme | 34 +- .../xcschemes/GCDWebServers (Mac).xcscheme | 91 ---- .../xcschemes/GCDWebServers (tvOS).xcscheme | 89 ---- iOS/Info.plist | 2 +- 7 files changed, 94 insertions(+), 621 deletions(-) rename {GCDWebServer.xcodeproj => GCDWebServer Sample.xcodeproj}/project.pbxproj (59%) rename {GCDWebServer.xcodeproj => GCDWebServer Sample.xcodeproj}/xcshareddata/xcschemes/GCDWebServers (iOS).xcscheme (74%) delete mode 100644 GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (Mac).xcscheme delete mode 100644 GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (tvOS).xcscheme diff --git a/Frameworks/Info.plist b/Frameworks/Info.plist index 537b5cb5..c0650cb4 100644 --- a/Frameworks/Info.plist +++ b/Frameworks/Info.plist @@ -7,16 +7,16 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - ${PRODUCT_BUNDLE_IDENTIFIER} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName $(PRODUCT_NAME) CFBundlePackageType FMWK - CFBundleVersion - ${BUNDLE_VERSION_STRING} CFBundleShortVersionString ${BUNDLE_VERSION_STRING} + CFBundleVersion + ${BUNDLE_VERSION_STRING} diff --git a/Frameworks/module.modulemap b/Frameworks/module.modulemap index a7e2a5fb..d82035f9 100644 --- a/Frameworks/module.modulemap +++ b/Frameworks/module.modulemap @@ -1,3 +1,3 @@ framework module GCDWebServer { - umbrella header "GCDWebServer.h" + umbrella header "GCDWebServers.h" } diff --git a/GCDWebServer.xcodeproj/project.pbxproj b/GCDWebServer Sample.xcodeproj/project.pbxproj similarity index 59% rename from GCDWebServer.xcodeproj/project.pbxproj rename to GCDWebServer Sample.xcodeproj/project.pbxproj index c5c20578..fabea3a9 100644 --- a/GCDWebServer.xcodeproj/project.pbxproj +++ b/GCDWebServer Sample.xcodeproj/project.pbxproj @@ -14,9 +14,7 @@ ); dependencies = ( CE54F3961AE84FCA003C110E /* PBXTargetDependency */, - E2DDD1941BE6941C002CE867 /* PBXTargetDependency */, E2DDD20E1BE69EEE002CE867 /* PBXTargetDependency */, - E2DDD1DC1BE69911002CE867 /* PBXTargetDependency */, ); name = "Build All"; productName = "Build All"; @@ -61,51 +59,7 @@ CEE28D591AE00AFE00F4023C /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E22112981690B7AA0048D2B2 /* CFNetwork.framework */; }; CEE28D6A1AE1ABAA00F4023C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEE28D691AE1ABAA00F4023C /* UIKit.framework */; }; E24A3C0721E2879F00C58878 /* GCDWebServer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEE28CEF1AE0051F00F4023C /* GCDWebServer.framework */; }; - E24A3C0821E287A300C58878 /* GCDWebServer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2DDD18B1BE69404002CE867 /* GCDWebServer.framework */; }; E24A3C0E21E28D3C00C58878 /* GCDWebServer.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CEE28CEF1AE0051F00F4023C /* GCDWebServer.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - E24A3C0F21E28EFB00C58878 /* GCDWebServer.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = E2DDD18B1BE69404002CE867 /* GCDWebServer.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - E2DDD1951BE69427002CE867 /* GCDWebUploader.bundle in Resources */ = {isa = PBXBuildFile; fileRef = E2BE850718E77ECA0061360B /* GCDWebUploader.bundle */; }; - E2DDD1961BE6945F002CE867 /* GCDWebServer.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE1718F99C810095C089 /* GCDWebServer.m */; }; - E2DDD1971BE6945F002CE867 /* GCDWebServerConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE1918F99C810095C089 /* GCDWebServerConnection.m */; }; - E2DDD1981BE6945F002CE867 /* GCDWebServerFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE1B18F99C810095C089 /* GCDWebServerFunctions.m */; }; - E2DDD1991BE6945F002CE867 /* GCDWebServerRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE1F18F99C810095C089 /* GCDWebServerRequest.m */; }; - E2DDD19A1BE6945F002CE867 /* GCDWebServerResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE2118F99C810095C089 /* GCDWebServerResponse.m */; }; - E2DDD19B1BE6945F002CE867 /* GCDWebServerDataRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE2418F99C810095C089 /* GCDWebServerDataRequest.m */; }; - E2DDD19C1BE6945F002CE867 /* GCDWebServerFileRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE2618F99C810095C089 /* GCDWebServerFileRequest.m */; }; - E2DDD19D1BE6945F002CE867 /* GCDWebServerMultiPartFormRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE2818F99C810095C089 /* GCDWebServerMultiPartFormRequest.m */; }; - E2DDD19E1BE6945F002CE867 /* GCDWebServerURLEncodedFormRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE2A18F99C810095C089 /* GCDWebServerURLEncodedFormRequest.m */; }; - E2DDD19F1BE6945F002CE867 /* GCDWebServerDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE2D18F99C810095C089 /* GCDWebServerDataResponse.m */; }; - E2DDD1A01BE6945F002CE867 /* GCDWebServerErrorResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE2F18F99C810095C089 /* GCDWebServerErrorResponse.m */; }; - E2DDD1A11BE6945F002CE867 /* GCDWebServerFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE3118F99C810095C089 /* GCDWebServerFileResponse.m */; }; - E2DDD1A21BE6945F002CE867 /* GCDWebServerStreamedResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E28BAE3318F99C810095C089 /* GCDWebServerStreamedResponse.m */; }; - E2DDD1A31BE6945F002CE867 /* GCDWebDAVServer.m in Sources */ = {isa = PBXBuildFile; fileRef = E2A0E80918F3432600C580B1 /* GCDWebDAVServer.m */; }; - E2DDD1A41BE6945F002CE867 /* GCDWebUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = E2BE850918E77ECA0061360B /* GCDWebUploader.m */; }; - E2DDD1A51BE6947F002CE867 /* GCDWebServer.h in Headers */ = {isa = PBXBuildFile; fileRef = E28BAE1618F99C810095C089 /* GCDWebServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1A61BE6947F002CE867 /* GCDWebServerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = E28BAE1818F99C810095C089 /* GCDWebServerConnection.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1A71BE6947F002CE867 /* GCDWebServerFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = E28BAE1A18F99C810095C089 /* GCDWebServerFunctions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1A81BE6947F002CE867 /* GCDWebServerHTTPStatusCodes.h in Headers */ = {isa = PBXBuildFile; fileRef = E28BAE1C18F99C810095C089 /* GCDWebServerHTTPStatusCodes.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1A91BE6947F002CE867 /* GCDWebServerRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = E28BAE1E18F99C810095C089 /* GCDWebServerRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1AA1BE6947F002CE867 /* GCDWebServerResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = E28BAE2018F99C810095C089 /* GCDWebServerResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1AB1BE6947F002CE867 /* GCDWebServerDataRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = E28BAE2318F99C810095C089 /* GCDWebServerDataRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1AC1BE6947F002CE867 /* GCDWebServerFileRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = E28BAE2518F99C810095C089 /* GCDWebServerFileRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1AD1BE6947F002CE867 /* GCDWebServerMultiPartFormRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = E28BAE2718F99C810095C089 /* GCDWebServerMultiPartFormRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1AE1BE6947F002CE867 /* GCDWebServerURLEncodedFormRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = E28BAE2918F99C810095C089 /* GCDWebServerURLEncodedFormRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1AF1BE6947F002CE867 /* GCDWebServerDataResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = E28BAE2C18F99C810095C089 /* GCDWebServerDataResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1B01BE6947F002CE867 /* GCDWebServerErrorResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = E28BAE2E18F99C810095C089 /* GCDWebServerErrorResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1B11BE6947F002CE867 /* GCDWebServerFileResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = E28BAE3018F99C810095C089 /* GCDWebServerFileResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1B21BE6947F002CE867 /* GCDWebServerStreamedResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = E28BAE3218F99C810095C089 /* GCDWebServerStreamedResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1B31BE6947F002CE867 /* GCDWebDAVServer.h in Headers */ = {isa = PBXBuildFile; fileRef = E2A0E80818F3432600C580B1 /* GCDWebDAVServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1B41BE6947F002CE867 /* GCDWebUploader.h in Headers */ = {isa = PBXBuildFile; fileRef = E2BE850818E77ECA0061360B /* GCDWebUploader.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1B51BE6947F002CE867 /* GCDWebServers.h in Headers */ = {isa = PBXBuildFile; fileRef = CEE28CF31AE0051F00F4023C /* GCDWebServers.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E2DDD1B71BE6951A002CE867 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2DDD1B61BE6951A002CE867 /* CFNetwork.framework */; }; - E2DDD1BA1BE69545002CE867 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E2DDD1B91BE69545002CE867 /* libz.tbd */; }; - E2DDD1BC1BE69551002CE867 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E2DDD1BB1BE69551002CE867 /* libxml2.tbd */; }; - E2DDD1BE1BE6956F002CE867 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2DDD1BD1BE6956F002CE867 /* MobileCoreServices.framework */; }; - E2DDD1C01BE69576002CE867 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2DDD1BF1BE69576002CE867 /* UIKit.framework */; }; - E2DDD1CE1BE698A8002CE867 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2DDD1CD1BE698A8002CE867 /* AppDelegate.swift */; }; - E2DDD1D11BE698A8002CE867 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2DDD1D01BE698A8002CE867 /* ViewController.swift */; }; - E2DDD1D41BE698A8002CE867 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E2DDD1D21BE698A8002CE867 /* Main.storyboard */; }; - E2DDD1D61BE698A8002CE867 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2DDD1D51BE698A8002CE867 /* Assets.xcassets */; }; E2DDD1FD1BE69EE5002CE867 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2DDD1FC1BE69EE5002CE867 /* AppDelegate.swift */; }; E2DDD2001BE69EE5002CE867 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2DDD1FF1BE69EE5002CE867 /* ViewController.swift */; }; E2DDD2031BE69EE5002CE867 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E2DDD2011BE69EE5002CE867 /* Main.storyboard */; }; @@ -130,27 +84,6 @@ remoteGlobalIDString = CEE28CEE1AE0051F00F4023C; remoteInfo = "GCDWebServers (iOS)"; }; - E24A3C0521E2879700C58878 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = E2DDD18A1BE69404002CE867; - remoteInfo = "GCDWebServers (tvOS)"; - }; - E2DDD1931BE6941C002CE867 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = E2DDD18A1BE69404002CE867; - remoteInfo = "GCDWebServer (tvOS)"; - }; - E2DDD1DB1BE69911002CE867 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = E2DDD1C61BE698A8002CE867; - remoteInfo = "GCDWebServer (tvOS)"; - }; E2DDD20D1BE69EEE002CE867 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; @@ -172,28 +105,13 @@ name = "Copy Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; - E24A3C0D21E28D2300C58878 /* Copy Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - E24A3C0F21E28EFB00C58878 /* GCDWebServer.framework in Copy Frameworks */, - ); - name = "Copy Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ CEE28CEF1AE0051F00F4023C /* GCDWebServer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GCDWebServer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CEE28CF21AE0051F00F4023C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; CEE28CF31AE0051F00F4023C /* GCDWebServers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GCDWebServers.h; sourceTree = ""; }; - CEE28D4B1AE0095600F4023C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; CEE28D691AE1ABAA00F4023C /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; - E208D148167B76B700500836 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; - E208D1B2167BB17E00500836 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; }; - E221128E1690B6470048D2B2 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; E22112981690B7AA0048D2B2 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.0.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; }; E221129C1690B7BA0048D2B2 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.0.sdk/System/Library/Frameworks/MobileCoreServices.framework; sourceTree = DEVELOPER_DIR; }; E24039311BA092B7000B7089 /* Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = ""; }; @@ -231,20 +149,7 @@ E2BE850718E77ECA0061360B /* GCDWebUploader.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = GCDWebUploader.bundle; sourceTree = ""; }; E2BE850818E77ECA0061360B /* GCDWebUploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebUploader.h; sourceTree = ""; }; E2BE850918E77ECA0061360B /* GCDWebUploader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebUploader.m; sourceTree = ""; }; - E2BE851018E79DAF0061360B /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; - E2DDD18B1BE69404002CE867 /* GCDWebServer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GCDWebServer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - E2DDD1B61BE6951A002CE867 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.0.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; }; - E2DDD1B91BE69545002CE867 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.0.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; }; - E2DDD1BB1BE69551002CE867 /* libxml2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.tbd; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.0.sdk/usr/lib/libxml2.tbd; sourceTree = DEVELOPER_DIR; }; - E2DDD1BD1BE6956F002CE867 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.0.sdk/System/Library/Frameworks/MobileCoreServices.framework; sourceTree = DEVELOPER_DIR; }; - E2DDD1BF1BE69576002CE867 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; - E2DDD1C71BE698A8002CE867 /* GCDWebServer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GCDWebServer.app; sourceTree = BUILT_PRODUCTS_DIR; }; - E2DDD1CD1BE698A8002CE867 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - E2DDD1D01BE698A8002CE867 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - E2DDD1D31BE698A8002CE867 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - E2DDD1D51BE698A8002CE867 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - E2DDD1D71BE698A8002CE867 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - E2DDD1F61BE69EE4002CE867 /* GCDWebServer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GCDWebServer.app; sourceTree = BUILT_PRODUCTS_DIR; }; + E2DDD1F61BE69EE4002CE867 /* GCDWebServer Sample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "GCDWebServer Sample.app"; sourceTree = BUILT_PRODUCTS_DIR; }; E2DDD1FC1BE69EE5002CE867 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; E2DDD1FF1BE69EE5002CE867 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; E2DDD2021BE69EE5002CE867 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; @@ -253,8 +158,6 @@ E2DDD2091BE69EE5002CE867 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E2DDD2241BE6A0AE002CE867 /* libxml2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.1.sdk/usr/lib/libxml2.tbd; sourceTree = DEVELOPER_DIR; }; E2DDD2261BE6A0B4002CE867 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.1.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; }; - E2DDD22A1BE6A0EB002CE867 /* libxml2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.tbd; path = usr/lib/libxml2.tbd; sourceTree = SDKROOT; }; - E2DDD22C1BE6A0EF002CE867 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -270,26 +173,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - E2DDD1871BE69404002CE867 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - E2DDD1C01BE69576002CE867 /* UIKit.framework in Frameworks */, - E2DDD1BE1BE6956F002CE867 /* MobileCoreServices.framework in Frameworks */, - E2DDD1B71BE6951A002CE867 /* CFNetwork.framework in Frameworks */, - E2DDD1BC1BE69551002CE867 /* libxml2.tbd in Frameworks */, - E2DDD1BA1BE69545002CE867 /* libz.tbd in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - E2DDD1C41BE698A8002CE867 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - E24A3C0821E287A300C58878 /* GCDWebServer.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; E2DDD1F31BE69EE4002CE867 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -308,12 +191,8 @@ E2A0E80718F3432600C580B1 /* GCDWebDAVServer */, E2BE850618E77ECA0061360B /* GCDWebUploader */, CEE28D081AE0053E00F4023C /* Frameworks */, - E221128D1690B6470048D2B2 /* Mac */, E2DDD1F71BE69EE5002CE867 /* iOS */, - E2DDD1C81BE698A8002CE867 /* tvOS */, - E282F1A7150FF0630004D7C0 /* Mac Frameworks and Libraries */, E221129E1690B7CB0048D2B2 /* iOS Frameworks and Libraries */, - E2DDD1B81BE6952F002CE867 /* tvOS Frameworks and Libraries */, 1AB674ADFE9D54B511CA2CBB /* Products */, ); indentWidth = 2; @@ -325,9 +204,7 @@ isa = PBXGroup; children = ( CEE28CEF1AE0051F00F4023C /* GCDWebServer.framework */, - E2DDD18B1BE69404002CE867 /* GCDWebServer.framework */, - E2DDD1C71BE698A8002CE867 /* GCDWebServer.app */, - E2DDD1F61BE69EE4002CE867 /* GCDWebServer.app */, + E2DDD1F61BE69EE4002CE867 /* GCDWebServer Sample.app */, ); name = Products; sourceTree = ""; @@ -343,14 +220,6 @@ path = Frameworks; sourceTree = ""; }; - E221128D1690B6470048D2B2 /* Mac */ = { - isa = PBXGroup; - children = ( - E221128E1690B6470048D2B2 /* main.m */, - ); - path = Mac; - sourceTree = ""; - }; E221129E1690B7CB0048D2B2 /* iOS Frameworks and Libraries */ = { isa = PBXGroup; children = ( @@ -363,19 +232,6 @@ name = "iOS Frameworks and Libraries"; sourceTree = ""; }; - E282F1A7150FF0630004D7C0 /* Mac Frameworks and Libraries */ = { - isa = PBXGroup; - children = ( - CEE28D4B1AE0095600F4023C /* Foundation.framework */, - E2BE851018E79DAF0061360B /* SystemConfiguration.framework */, - E208D1B2167BB17E00500836 /* CoreServices.framework */, - E208D148167B76B700500836 /* CFNetwork.framework */, - E2DDD22A1BE6A0EB002CE867 /* libxml2.tbd */, - E2DDD22C1BE6A0EF002CE867 /* libz.tbd */, - ); - name = "Mac Frameworks and Libraries"; - sourceTree = ""; - }; E28BAE1418F99C810095C089 /* GCDWebServer */ = { isa = PBXGroup; children = ( @@ -454,30 +310,6 @@ path = GCDWebUploader; sourceTree = ""; }; - E2DDD1B81BE6952F002CE867 /* tvOS Frameworks and Libraries */ = { - isa = PBXGroup; - children = ( - E2DDD1BF1BE69576002CE867 /* UIKit.framework */, - E2DDD1BD1BE6956F002CE867 /* MobileCoreServices.framework */, - E2DDD1B61BE6951A002CE867 /* CFNetwork.framework */, - E2DDD1BB1BE69551002CE867 /* libxml2.tbd */, - E2DDD1B91BE69545002CE867 /* libz.tbd */, - ); - name = "tvOS Frameworks and Libraries"; - sourceTree = ""; - }; - E2DDD1C81BE698A8002CE867 /* tvOS */ = { - isa = PBXGroup; - children = ( - E2DDD1CD1BE698A8002CE867 /* AppDelegate.swift */, - E2DDD1D01BE698A8002CE867 /* ViewController.swift */, - E2DDD1D21BE698A8002CE867 /* Main.storyboard */, - E2DDD1D51BE698A8002CE867 /* Assets.xcassets */, - E2DDD1D71BE698A8002CE867 /* Info.plist */, - ); - path = tvOS; - sourceTree = ""; - }; E2DDD1F71BE69EE5002CE867 /* iOS */ = { isa = PBXGroup; children = ( @@ -518,36 +350,12 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - E2DDD1881BE69404002CE867 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - E2DDD1A51BE6947F002CE867 /* GCDWebServer.h in Headers */, - E2DDD1A61BE6947F002CE867 /* GCDWebServerConnection.h in Headers */, - E2DDD1A71BE6947F002CE867 /* GCDWebServerFunctions.h in Headers */, - E2DDD1A81BE6947F002CE867 /* GCDWebServerHTTPStatusCodes.h in Headers */, - E2DDD1A91BE6947F002CE867 /* GCDWebServerRequest.h in Headers */, - E2DDD1AA1BE6947F002CE867 /* GCDWebServerResponse.h in Headers */, - E2DDD1AB1BE6947F002CE867 /* GCDWebServerDataRequest.h in Headers */, - E2DDD1AC1BE6947F002CE867 /* GCDWebServerFileRequest.h in Headers */, - E2DDD1AD1BE6947F002CE867 /* GCDWebServerMultiPartFormRequest.h in Headers */, - E2DDD1AE1BE6947F002CE867 /* GCDWebServerURLEncodedFormRequest.h in Headers */, - E2DDD1AF1BE6947F002CE867 /* GCDWebServerDataResponse.h in Headers */, - E2DDD1B01BE6947F002CE867 /* GCDWebServerErrorResponse.h in Headers */, - E2DDD1B11BE6947F002CE867 /* GCDWebServerFileResponse.h in Headers */, - E2DDD1B21BE6947F002CE867 /* GCDWebServerStreamedResponse.h in Headers */, - E2DDD1B31BE6947F002CE867 /* GCDWebDAVServer.h in Headers */, - E2DDD1B41BE6947F002CE867 /* GCDWebUploader.h in Headers */, - E2DDD1B51BE6947F002CE867 /* GCDWebServers.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - CEE28CEE1AE0051F00F4023C /* GCDWebServers (iOS) */ = { + CEE28CEE1AE0051F00F4023C /* GCDWebServer (iOS) */ = { isa = PBXNativeTarget; - buildConfigurationList = CEE28D021AE0052000F4023C /* Build configuration list for PBXNativeTarget "GCDWebServers (iOS)" */; + buildConfigurationList = CEE28D021AE0052000F4023C /* Build configuration list for PBXNativeTarget "GCDWebServer (iOS)" */; buildPhases = ( CEE28CEA1AE0051F00F4023C /* Sources */, CEE28CEB1AE0051F00F4023C /* Frameworks */, @@ -558,51 +366,14 @@ ); dependencies = ( ); - name = "GCDWebServers (iOS)"; + name = "GCDWebServer (iOS)"; productName = GCDWebServers; productReference = CEE28CEF1AE0051F00F4023C /* GCDWebServer.framework */; productType = "com.apple.product-type.framework"; }; - E2DDD18A1BE69404002CE867 /* GCDWebServers (tvOS) */ = { - isa = PBXNativeTarget; - buildConfigurationList = E2DDD1921BE69404002CE867 /* Build configuration list for PBXNativeTarget "GCDWebServers (tvOS)" */; - buildPhases = ( - E2DDD1861BE69404002CE867 /* Sources */, - E2DDD1871BE69404002CE867 /* Frameworks */, - E2DDD1881BE69404002CE867 /* Headers */, - E2DDD1891BE69404002CE867 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "GCDWebServers (tvOS)"; - productName = "GCDWebServer (tvOS)"; - productReference = E2DDD18B1BE69404002CE867 /* GCDWebServer.framework */; - productType = "com.apple.product-type.framework"; - }; - E2DDD1C61BE698A8002CE867 /* GCDWebServer (tvOS) */ = { - isa = PBXNativeTarget; - buildConfigurationList = E2DDD1D81BE698A8002CE867 /* Build configuration list for PBXNativeTarget "GCDWebServer (tvOS)" */; - buildPhases = ( - E2DDD1C51BE698A8002CE867 /* Resources */, - E24A3C0D21E28D2300C58878 /* Copy Frameworks */, - E2DDD1C31BE698A8002CE867 /* Sources */, - E2DDD1C41BE698A8002CE867 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - E24A3C0621E2879700C58878 /* PBXTargetDependency */, - ); - name = "GCDWebServer (tvOS)"; - productName = tvOS; - productReference = E2DDD1C71BE698A8002CE867 /* GCDWebServer.app */; - productType = "com.apple.product-type.application"; - }; - E2DDD1F51BE69EE4002CE867 /* GCDWebServer (iOS) */ = { + E2DDD1F51BE69EE4002CE867 /* GCDWebServer Sample (iOS) */ = { isa = PBXNativeTarget; - buildConfigurationList = E2DDD20A1BE69EE5002CE867 /* Build configuration list for PBXNativeTarget "GCDWebServer (iOS)" */; + buildConfigurationList = E2DDD20A1BE69EE5002CE867 /* Build configuration list for PBXNativeTarget "GCDWebServer Sample (iOS)" */; buildPhases = ( E2DDD1F41BE69EE4002CE867 /* Resources */, E24A3C0C21E28D1E00C58878 /* Copy Frameworks */, @@ -614,9 +385,9 @@ dependencies = ( E24A3C0421E2879000C58878 /* PBXTargetDependency */, ); - name = "GCDWebServer (iOS)"; + name = "GCDWebServer Sample (iOS)"; productName = "GCDWebServer (iOS)"; - productReference = E2DDD1F61BE69EE4002CE867 /* GCDWebServer.app */; + productReference = E2DDD1F61BE69EE4002CE867 /* GCDWebServer Sample.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -625,25 +396,17 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1030; + LastUpgradeCheck = 1120; TargetAttributes = { CEE28CEE1AE0051F00F4023C = { CreatedOnToolsVersion = 6.3; }; - E2DDD18A1BE69404002CE867 = { - CreatedOnToolsVersion = 7.1; - ProvisioningStyle = Manual; - }; - E2DDD1C61BE698A8002CE867 = { - CreatedOnToolsVersion = 7.1; - ProvisioningStyle = Manual; - }; E2DDD1F51BE69EE4002CE867 = { CreatedOnToolsVersion = 7.1; }; }; }; - buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "GCDWebServer" */; + buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "GCDWebServer Sample" */; compatibilityVersion = "Xcode 8.0"; developmentRegion = en; hasScannedForEncodings = 1; @@ -656,10 +419,8 @@ projectRoot = ""; targets = ( E274F876187E77D8009E0582 /* Build All */, - E2DDD1F51BE69EE4002CE867 /* GCDWebServer (iOS) */, - E2DDD1C61BE698A8002CE867 /* GCDWebServer (tvOS) */, - CEE28CEE1AE0051F00F4023C /* GCDWebServers (iOS) */, - E2DDD18A1BE69404002CE867 /* GCDWebServers (tvOS) */, + E2DDD1F51BE69EE4002CE867 /* GCDWebServer Sample (iOS) */, + CEE28CEE1AE0051F00F4023C /* GCDWebServer (iOS) */, ); }; /* End PBXProject section */ @@ -673,23 +434,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - E2DDD1891BE69404002CE867 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E2DDD1951BE69427002CE867 /* GCDWebUploader.bundle in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - E2DDD1C51BE698A8002CE867 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E2DDD1D61BE698A8002CE867 /* Assets.xcassets in Resources */, - E2DDD1D41BE698A8002CE867 /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; E2DDD1F41BE69EE4002CE867 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -725,37 +469,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - E2DDD1861BE69404002CE867 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E2DDD1961BE6945F002CE867 /* GCDWebServer.m in Sources */, - E2DDD1971BE6945F002CE867 /* GCDWebServerConnection.m in Sources */, - E2DDD1981BE6945F002CE867 /* GCDWebServerFunctions.m in Sources */, - E2DDD1991BE6945F002CE867 /* GCDWebServerRequest.m in Sources */, - E2DDD19A1BE6945F002CE867 /* GCDWebServerResponse.m in Sources */, - E2DDD19B1BE6945F002CE867 /* GCDWebServerDataRequest.m in Sources */, - E2DDD19C1BE6945F002CE867 /* GCDWebServerFileRequest.m in Sources */, - E2DDD19D1BE6945F002CE867 /* GCDWebServerMultiPartFormRequest.m in Sources */, - E2DDD19E1BE6945F002CE867 /* GCDWebServerURLEncodedFormRequest.m in Sources */, - E2DDD19F1BE6945F002CE867 /* GCDWebServerDataResponse.m in Sources */, - E2DDD1A01BE6945F002CE867 /* GCDWebServerErrorResponse.m in Sources */, - E2DDD1A11BE6945F002CE867 /* GCDWebServerFileResponse.m in Sources */, - E2DDD1A21BE6945F002CE867 /* GCDWebServerStreamedResponse.m in Sources */, - E2DDD1A31BE6945F002CE867 /* GCDWebDAVServer.m in Sources */, - E2DDD1A41BE6945F002CE867 /* GCDWebUploader.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - E2DDD1C31BE698A8002CE867 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E2DDD1D11BE698A8002CE867 /* ViewController.swift in Sources */, - E2DDD1CE1BE698A8002CE867 /* AppDelegate.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; E2DDD1F21BE69EE4002CE867 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -770,45 +483,22 @@ /* Begin PBXTargetDependency section */ CE54F3961AE84FCA003C110E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = CEE28CEE1AE0051F00F4023C /* GCDWebServers (iOS) */; + target = CEE28CEE1AE0051F00F4023C /* GCDWebServer (iOS) */; targetProxy = CE54F3951AE84FCA003C110E /* PBXContainerItemProxy */; }; E24A3C0421E2879000C58878 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = CEE28CEE1AE0051F00F4023C /* GCDWebServers (iOS) */; + target = CEE28CEE1AE0051F00F4023C /* GCDWebServer (iOS) */; targetProxy = E24A3C0321E2879000C58878 /* PBXContainerItemProxy */; }; - E24A3C0621E2879700C58878 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = E2DDD18A1BE69404002CE867 /* GCDWebServers (tvOS) */; - targetProxy = E24A3C0521E2879700C58878 /* PBXContainerItemProxy */; - }; - E2DDD1941BE6941C002CE867 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = E2DDD18A1BE69404002CE867 /* GCDWebServers (tvOS) */; - targetProxy = E2DDD1931BE6941C002CE867 /* PBXContainerItemProxy */; - }; - E2DDD1DC1BE69911002CE867 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = E2DDD1C61BE698A8002CE867 /* GCDWebServer (tvOS) */; - targetProxy = E2DDD1DB1BE69911002CE867 /* PBXContainerItemProxy */; - }; E2DDD20E1BE69EEE002CE867 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = E2DDD1F51BE69EE4002CE867 /* GCDWebServer (iOS) */; + target = E2DDD1F51BE69EE4002CE867 /* GCDWebServer Sample (iOS) */; targetProxy = E2DDD20D1BE69EEE002CE867 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - E2DDD1D21BE698A8002CE867 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - E2DDD1D31BE698A8002CE867 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; E2DDD2011BE69EE5002CE867 /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( @@ -834,10 +524,35 @@ ALWAYS_SEARCH_USER_PATHS = NO; BUNDLE_VERSION_STRING = 3.5.2; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = __GCDWEBSERVER_ENABLE_TESTING__; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2"; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "net.pol-online.GCDWebServer"; @@ -875,9 +590,33 @@ ALWAYS_SEARCH_USER_PATHS = NO; BUNDLE_VERSION_STRING = 3.5.2; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = __GCDWEBSERVER_ENABLE_TESTING__; GCC_TREAT_WARNINGS_AS_ERRORS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2"; PRODUCT_BUNDLE_IDENTIFIER = "net.pol-online.GCDWebServer"; SWIFT_COMPILATION_MODE = wholemodule; @@ -898,6 +637,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = Frameworks/module.modulemap; + PRODUCT_BUNDLE_IDENTIFIER = "${PRODUCT_BUNDLE_IDENTIFIER}"; PRODUCT_NAME = GCDWebServer; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -916,6 +656,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = Frameworks/module.modulemap; + PRODUCT_BUNDLE_IDENTIFIER = "${PRODUCT_BUNDLE_IDENTIFIER}"; PRODUCT_NAME = GCDWebServer; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -937,74 +678,6 @@ }; name = Release; }; - E2DDD1901BE69404002CE867 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Manual; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Frameworks/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = GCDWebServer; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = appletvos; - SKIP_INSTALL = YES; - TVOS_DEPLOYMENT_TARGET = 9.0; - }; - name = Debug; - }; - E2DDD1911BE69404002CE867 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Manual; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Frameworks/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = GCDWebServer; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = appletvos; - SKIP_INSTALL = YES; - TVOS_DEPLOYMENT_TARGET = 9.0; - }; - name = Release; - }; - E2DDD1D91BE698A8002CE867 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = tvOS/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_NAME = GCDWebServer; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = appletvos; - TVOS_DEPLOYMENT_TARGET = 9.0; - }; - name = Debug; - }; - E2DDD1DA1BE698A8002CE867 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = tvOS/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_NAME = GCDWebServer; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = appletvos; - TVOS_DEPLOYMENT_TARGET = 9.0; - }; - name = Release; - }; E2DDD20B1BE69EE5002CE867 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1013,7 +686,8 @@ INFOPLIST_FILE = iOS/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_NAME = GCDWebServer; + PRODUCT_BUNDLE_IDENTIFIER = "net.pol-online.GCDWebServer.Sample"; + PRODUCT_NAME = "GCDWebServer Sample"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -1027,7 +701,8 @@ INFOPLIST_FILE = iOS/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_NAME = GCDWebServer; + PRODUCT_BUNDLE_IDENTIFIER = "net.pol-online.GCDWebServer.Sample"; + PRODUCT_NAME = "GCDWebServer Sample"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -1036,7 +711,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "GCDWebServer" */ = { + 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "GCDWebServer Sample" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB928A08733DD80010E9CD /* Debug */, @@ -1045,7 +720,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - CEE28D021AE0052000F4023C /* Build configuration list for PBXNativeTarget "GCDWebServers (iOS)" */ = { + CEE28D021AE0052000F4023C /* Build configuration list for PBXNativeTarget "GCDWebServer (iOS)" */ = { isa = XCConfigurationList; buildConfigurations = ( CEE28D031AE0052000F4023C /* Debug */, @@ -1063,25 +738,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E2DDD1921BE69404002CE867 /* Build configuration list for PBXNativeTarget "GCDWebServers (tvOS)" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E2DDD1901BE69404002CE867 /* Debug */, - E2DDD1911BE69404002CE867 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - E2DDD1D81BE698A8002CE867 /* Build configuration list for PBXNativeTarget "GCDWebServer (tvOS)" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E2DDD1D91BE698A8002CE867 /* Debug */, - E2DDD1DA1BE698A8002CE867 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - E2DDD20A1BE69EE5002CE867 /* Build configuration list for PBXNativeTarget "GCDWebServer (iOS)" */ = { + E2DDD20A1BE69EE5002CE867 /* Build configuration list for PBXNativeTarget "GCDWebServer Sample (iOS)" */ = { isa = XCConfigurationList; buildConfigurations = ( E2DDD20B1BE69EE5002CE867 /* Debug */, diff --git a/GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (iOS).xcscheme b/GCDWebServer Sample.xcodeproj/xcshareddata/xcschemes/GCDWebServers (iOS).xcscheme similarity index 74% rename from GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (iOS).xcscheme rename to GCDWebServer Sample.xcodeproj/xcshareddata/xcschemes/GCDWebServers (iOS).xcscheme index 3c0c35b1..7d059fd2 100644 --- a/GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (iOS).xcscheme +++ b/GCDWebServer Sample.xcodeproj/xcshareddata/xcschemes/GCDWebServers (iOS).xcscheme @@ -1,6 +1,6 @@ + BuildableName = "GCDWebServer.framework" + BlueprintName = "GCDWebServer (iOS)" + ReferencedContainer = "container:GCDWebServer Sample.xcodeproj"> @@ -27,19 +27,17 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - - + BuildableName = "GCDWebServer.framework" + BlueprintName = "GCDWebServer (iOS)" + ReferencedContainer = "container:GCDWebServer Sample.xcodeproj"> - - + + + BuildableName = "GCDWebServer.framework" + BlueprintName = "GCDWebServer (iOS)" + ReferencedContainer = "container:GCDWebServer Sample.xcodeproj"> - - + BuildableName = "GCDWebServer.framework" + BlueprintName = "GCDWebServer (iOS)" + ReferencedContainer = "container:GCDWebServer Sample.xcodeproj"> diff --git a/GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (Mac).xcscheme b/GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (Mac).xcscheme deleted file mode 100644 index aae0b64f..00000000 --- a/GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (Mac).xcscheme +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (tvOS).xcscheme b/GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (tvOS).xcscheme deleted file mode 100644 index a79d50c5..00000000 --- a/GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (tvOS).xcscheme +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iOS/Info.plist b/iOS/Info.plist index 1f083fb2..d0524738 100644 --- a/iOS/Info.plist +++ b/iOS/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - net.pol-online.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName