From 95231b1a66fa2ac3677ae0d87a2235f1da561c1a Mon Sep 17 00:00:00 2001 From: Anton Matosov Date: Fri, 15 Jan 2016 07:54:14 -0800 Subject: [PATCH] Fixed CocoaLumberjack deps --- GCDWebServer.podspec | 48 ++++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/GCDWebServer.podspec b/GCDWebServer.podspec index 3fd4b9e..14771d8 100644 --- a/GCDWebServer.podspec +++ b/GCDWebServer.podspec @@ -33,21 +33,43 @@ Pod::Spec.new do |s| cs.osx.framework = 'SystemConfiguration' end - s.subspec 'WebDAV' do |cs| + s.subspec "CocoaLumberjack" do |cs| cs.dependency 'GCDWebServer/Core' - cs.source_files = 'GCDWebDAVServer/*.{h,m}' - cs.requires_arc = true - cs.ios.library = 'xml2' - cs.tvos.library = 'xml2' - cs.osx.library = 'xml2' - cs.compiler_flags = '-I$(SDKROOT)/usr/include/libxml2' + cs.dependency 'CocoaLumberjack', '~> 2' + end + + s.subspec 'WebDAV' do |cs| + cs.default_subspec = 'Core' + + cs.subspec "Core" do |ccs| + ccs.dependency 'GCDWebServer/Core' + ccs.source_files = 'GCDWebDAVServer/*.{h,m}' + ccs.requires_arc = true + ccs.ios.library = 'xml2' + ccs.tvos.library = 'xml2' + ccs.osx.library = 'xml2' + ccs.compiler_flags = '-I$(SDKROOT)/usr/include/libxml2' + end + + cs.subspec "CocoaLumberjack" do |cscl| + cscl.dependency 'GCDWebServer/WebDAV/Core' + cscl.dependency 'GCDWebServer/CocoaLumberjack' + end end s.subspec 'WebUploader' do |cs| - cs.dependency 'GCDWebServer/Core' - cs.source_files = 'GCDWebUploader/*.{h,m}' - cs.requires_arc = true - cs.resource = "GCDWebUploader/GCDWebUploader.bundle" - end - + cs.default_subspec = 'Core' + + cs.subspec "Core" do |ccs| + ccs.dependency 'GCDWebServer/Core' + ccs.source_files = 'GCDWebUploader/*.{h,m}' + ccs.requires_arc = true + ccs.resource = "GCDWebUploader/GCDWebUploader.bundle" + end + + cs.subspec "CocoaLumberjack" do |cscl| + cscl.dependency 'GCDWebServer/WebUploader/Core' + cscl.dependency 'GCDWebServer/CocoaLumberjack' + end + end end