You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2016/07/25 07:57:33 UTC
[47/57] [abbrv] cordova-plugins git commit: Squashed
'local-webserver/src/ios/GCDWebServer/' changes from 15caa9c..55104e5
Squashed 'local-webserver/src/ios/GCDWebServer/' changes from 15caa9c..55104e5
55104e5 Update README.md
fcc95fd Merge pull request #260 from jjrscott/master
10a94e3 Removed guards around __kindof usage as the project is Xcode 7 only.
010ef9b Added __kindof keyword where appropriate to avoid errors of the form "incompatible block pointer types sending 'GCDWebServerResponse *(^)(GCDWebServerDataRequest *__strong)' to parameter of type 'GCDWebServerProcessBlock' (aka 'GCDWebServerResponse *(^)(GCDWebServerRequest *__strong)')"
5ca7c27 Bumped version
c663263 Disabled address sanitizer
5b6eebb Fixed build warning
a4c61bd Bumped version
2543279 Merge pull request #256 from anton-matosov/master
95231b1 Fixed CocoaLumberjack deps
5f2877b Merge pull request #255 from iosphere/check-range-location
47a51c3 Fix NSRangeException by checking range of NSTextCheckingResult
3873dd1 Merge pull request #248 from dcrawshay/master
2ff1025 Fixed WebDAV test response files to correctly represent the requested byte-range response instead of the entire file.
4360c4f Support WebDAV GET request byte ranges
8a6a139 Merge pull request #236 from maeldur/master
4eba86f Merge pull request #238 from bendytree/master
ea97373 Also set CFBundleVersion in Info.plist
5707076 Updated to Xcode 7.2
e1fb807 Bumped version
7157572 Added libz and header instructions to readme
94e30f6 Added libz and header instructions to readme
c989411 Use Xcode 7.1 in Travis CI
4ee9c30 Fixed build script
48cf20b Updated iOS app to latest best practices
ac9b8a5 Added support for tvOS
cad428c Removed deprecation warnings on tvOS
bb5c1a5 No need to link explicitly to Foundation
bef9523 Updated for Xcode 7.1
0192c36 Fix
062a0dc allow serverURL to be assigned on tvOS with wifi connection
21d9fc2 Merge pull request #228 from CrossWaterBridge/tvos
614ff58 Enable support for tvOS.
7b0477b Merge pull request #219 from macdrevx/pods-use-frameworks
a674614 Enable support for Podfiles with use_frameworks!
b549f11 Merge pull request #218 from tifroz/master
9d38bb4 Workaround for Swift2 which apparently fails to retain the completion blocks passed as parameters
44c6a8a Update README.md
aaf8679 Increased Bonjour resolution timeout to 5 seconds
81d74b4 Fix
f7de5ca Fix
a1c6835 Bumped version to 3.3
e70a333 Added support for NAT port mapping
3c33e9f Bumped version to 3.2.7
d160e5f Merge pull request #213 from 0xpablo/master
2d2343a Turn 'buildForRunning' on for 'GCDWebServers' iOS and Mac Schemes
f6783da Updated test script to run built-in tests
99cae36 Added minimal tests for Mac framework
b292710 Fix
b8b4a35 Add version to framework Info.plist
ecc572a Bumped version to 3.2.6
3a02341 Disable testing and running in shared schemes for frameworks
e792fe8 Fixes
4c8ec1d Removed unnecessary files from Xcode project
f7bb5ba Bumped copyright year
ae88198 Update README.md
d71c0d4 Update README.md
d611ae0 Merge pull request #187 from lfaoro/patch-2
93287ed Update README.md
dc28790 Merge pull request #186 from lfaoro/patch-1
ab9459a Update README.md
aa8fc97 Fixed buffer overflow when retrieving socket addresses
863febe Updated for Xcode 7
2ff117d Merge pull request #183 from guidomb/patch-1
4838d0d Fixes error in Carthage documentation
c394ae8 Update README.md
bdfe672 Bumped version
b1ab747 Update README.md
03a0ac3 Added Carthage support
bd2c292 Generating Frameworks
e8b6726 Bumped version
3d5fd0b Update README.md
9524d31 Allow harmless 'Content-Type' headers on requests
a3606d6 Don't start a background task while the app is already in background
00b2c38 Bumped version
0a9d310 Fixed -serverURL not taking into account GCDWebServerOption_BindToLocalhost
0f0a984 Fixed Xcode 6.3 warnings
047fddd Merge pull request #155 from sergiou87/master
79d6075 Add remote and local addresses to GCDWebServerRequest
594497d Updated for CocoaLumberJack 2.0
1f7c036 Removed Bot scheme
fe472cd Update README.md
9c33c83 Handle starting the server with nil options
9719406 Made _CompareResources() easier to read
0b8f7ff Merge remote-tracking branch 'origin/master'
71c08cf Update README.md
1a67864 Bumped version
472c785 Only wipe GCDWebUploader.bundle on Debug to avoid issues on Xcode bot
2fdeb95 Added Xcode bot scheme
c4310fc Addressed static analyzer warnings
33645d3 Fixed incorrect documentation for GCDWebServerAsyncStreamBlock
3618dca Added asyncResponse2 mode
432e382 Update README.md
4e31508 Removed invalid check
628f667 Bumped version
1944cd8 Fixed tests
d2001e3 Fixes
1888979 Fixed behavior of GCDWebServerOption_BonjourName option
14d538b Added GCDWebServerOption_BindToLocalhost option
3b7198b Merge pull request #105 from nickgravelyn/fix-crash-in-ios-unit-test
abb8913 Adding check to _endBackgroundTask to verify the application exists before calling GWS_DNOT_REACHED.
059f5c8 Update README.md
9d9546b Bumped version
2ff05b1 Bumped version
bf2c9a1 Workaround Firefox and IE not showing file selection dialog
git-subtree-dir: local-webserver/src/ios/GCDWebServer
git-subtree-split: 55104e5b1ea7ac84e8a42263750b6f7973f5da20
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugins/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugins/commit/394cfb12
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugins/tree/394cfb12
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugins/diff/394cfb12
Branch: refs/heads/master
Commit: 394cfb12f80de35255a506c0dcbf4a21910e849a
Parents: 1547b6b
Author: Andreas Kohn <an...@gmail.com>
Authored: Thu Mar 24 12:42:43 2016 +0100
Committer: Andreas Kohn <an...@gmail.com>
Committed: Thu Mar 24 12:42:43 2016 +0100
----------------------------------------------------------------------
.gitignore | 1 +
.travis.yml | 1 +
Frameworks/GCDWebServers.h | 52 +
Frameworks/Info.plist | 22 +
Frameworks/Tests.m | 24 +
GCDWebDAVServer/GCDWebDAVServer.h | 2 +-
GCDWebDAVServer/GCDWebDAVServer.m | 15 +-
GCDWebServer.podspec | 52 +-
GCDWebServer.xcodeproj/project.pbxproj | 1135 ++++++++++++++++--
.../xcschemes/GCDWebServers (Mac).xcscheme | 90 ++
.../xcschemes/GCDWebServers (iOS).xcscheme | 89 ++
.../xcschemes/GCDWebServers (tvOS).xcscheme | 89 ++
GCDWebServer/Core/GCDWebServer.h | 59 +-
GCDWebServer/Core/GCDWebServer.m | 161 ++-
GCDWebServer/Core/GCDWebServerConnection.h | 2 +-
GCDWebServer/Core/GCDWebServerConnection.m | 20 +-
GCDWebServer/Core/GCDWebServerFunctions.h | 2 +-
GCDWebServer/Core/GCDWebServerFunctions.m | 16 +-
GCDWebServer/Core/GCDWebServerHTTPStatusCodes.h | 2 +-
GCDWebServer/Core/GCDWebServerPrivate.h | 34 +-
GCDWebServer/Core/GCDWebServerRequest.h | 26 +-
GCDWebServer/Core/GCDWebServerRequest.m | 27 +-
GCDWebServer/Core/GCDWebServerResponse.h | 2 +-
GCDWebServer/Core/GCDWebServerResponse.m | 12 +-
GCDWebServer/Requests/GCDWebServerDataRequest.h | 2 +-
GCDWebServer/Requests/GCDWebServerDataRequest.m | 6 +-
GCDWebServer/Requests/GCDWebServerFileRequest.h | 2 +-
GCDWebServer/Requests/GCDWebServerFileRequest.m | 14 +-
.../Requests/GCDWebServerMultiPartFormRequest.h | 2 +-
.../Requests/GCDWebServerMultiPartFormRequest.m | 14 +-
.../GCDWebServerURLEncodedFormRequest.h | 2 +-
.../GCDWebServerURLEncodedFormRequest.m | 2 +-
.../Responses/GCDWebServerDataResponse.h | 2 +-
.../Responses/GCDWebServerDataResponse.m | 2 +-
.../Responses/GCDWebServerErrorResponse.h | 2 +-
.../Responses/GCDWebServerErrorResponse.m | 2 +-
.../Responses/GCDWebServerFileResponse.h | 2 +-
.../Responses/GCDWebServerFileResponse.m | 14 +-
.../Responses/GCDWebServerStreamedResponse.h | 15 +-
.../Responses/GCDWebServerStreamedResponse.m | 2 +-
.../GCDWebUploader.bundle/css/index.css | 2 +-
GCDWebUploader/GCDWebUploader.bundle/index.html | 4 +-
.../GCDWebUploader.bundle/js/index.js | 13 +-
GCDWebUploader/GCDWebUploader.h | 2 +-
GCDWebUploader/GCDWebUploader.m | 6 +-
Mac/main.m | 41 +-
README.md | 166 +--
Run-Tests.sh | 48 +-
Tests/WebDAV-Finder/059-200.response | Bin 107049 -> 0 bytes
Tests/WebDAV-Finder/059-206.response | Bin 0 -> 8774 bytes
Tests/WebDAV-Finder/062-200.response | Bin 116315 -> 0 bytes
Tests/WebDAV-Finder/062-206.response | Bin 0 -> 18041 bytes
Tests/WebServer-Sample-Movie/001-200.response | Bin 1278221 -> 1278221 bytes
Tests/WebServer-Sample-Movie/002-206.response | Bin 1278274 -> 1278274 bytes
Tests/WebServer-Sample-Movie/003-206.response | Bin 9265 -> 9265 bytes
Tests/WebServer-Sample-Movie/004-206.response | Bin 3391644 -> 3391644 bytes
Tests/WebServer-Sample-Movie/005-206.response | Bin 1173 -> 1173 bytes
iOS/AppDelegate.h | 4 +-
iOS/AppDelegate.m | 36 +-
.../AppIcon.appiconset/Contents.json | 68 ++
iOS/Base.lproj/LaunchScreen.storyboard | 28 +
iOS/Base.lproj/Main.storyboard | 41 +
iOS/Info.plist | 12 +-
iOS/ViewController.h | 31 +
iOS/ViewController.m | 77 ++
iOS/main.m | 2 +-
tvOS/AppDelegate.h | 32 +
tvOS/AppDelegate.m | 36 +
.../Content.imageset/Contents.json | 12 +
.../Back.imagestacklayer/Contents.json | 6 +
.../App Icon - Large.imagestack/Contents.json | 17 +
.../Content.imageset/Contents.json | 12 +
.../Front.imagestacklayer/Contents.json | 6 +
.../Content.imageset/Contents.json | 12 +
.../Middle.imagestacklayer/Contents.json | 6 +
.../Content.imageset/Contents.json | 12 +
.../Back.imagestacklayer/Contents.json | 6 +
.../App Icon - Small.imagestack/Contents.json | 17 +
.../Content.imageset/Contents.json | 12 +
.../Front.imagestacklayer/Contents.json | 6 +
.../Content.imageset/Contents.json | 12 +
.../Middle.imagestacklayer/Contents.json | 6 +
.../Contents.json | 26 +
.../Top Shelf Image.imageset/Contents.json | 12 +
tvOS/Assets.xcassets/Contents.json | 6 +
.../LaunchImage.launchimage/Contents.json | 15 +
tvOS/Base.lproj/Main.storyboard | 40 +
tvOS/Info.plist | 30 +
tvOS/ViewController.h | 31 +
tvOS/ViewController.m | 77 ++
tvOS/main.m | 34 +
91 files changed, 2708 insertions(+), 374 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/394cfb12/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f8bf09a..d7d4abb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ xcuserdata
project.xcworkspace
Tests/Payload
+Carthage/Build
http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/394cfb12/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 0bad31e..05cfcb6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,2 +1,3 @@
language: objective-c
script: ./Run-Tests.sh
+osx_image: xcode7.1
http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/394cfb12/Frameworks/GCDWebServers.h
----------------------------------------------------------------------
diff --git a/Frameworks/GCDWebServers.h b/Frameworks/GCDWebServers.h
new file mode 100644
index 0000000..60f42da
--- /dev/null
+++ b/Frameworks/GCDWebServers.h
@@ -0,0 +1,52 @@
+/*
+ Copyright (c) 2012-2015, Pierre-Olivier Latour
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * The name of Pierre-Olivier Latour may not be used to endorse
+ or promote products derived from this software without specific
+ prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL PIERRE-OLIVIER LATOUR BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// GCDWebServer Core
+#import <GCDWebServers/GCDWebServer.h>
+#import <GCDWebServers/GCDWebServerConnection.h>
+#import <GCDWebServers/GCDWebServerFunctions.h>
+#import <GCDWebServers/GCDWebServerHTTPStatusCodes.h>
+#import <GCDWebServers/GCDWebServerResponse.h>
+#import <GCDWebServers/GCDWebServerRequest.h>
+
+// GCDWebServer Requests
+#import <GCDWebServers/GCDWebServerDataRequest.h>
+#import <GCDWebServers/GCDWebServerFileRequest.h>
+#import <GCDWebServers/GCDWebServerMultiPartFormRequest.h>
+#import <GCDWebServers/GCDWebServerURLEncodedFormRequest.h>
+
+// GCDWebServer Responses
+#import <GCDWebServers/GCDWebServerDataResponse.h>
+#import <GCDWebServers/GCDWebServerErrorResponse.h>
+#import <GCDWebServers/GCDWebServerFileResponse.h>
+#import <GCDWebServers/GCDWebServerStreamedResponse.h>
+
+// GCDWebUploader
+#import <GCDWebServers/GCDWebUploader.h>
+
+// GCDWebDAVServer
+#import <GCDWebServers/GCDWebDAVServer.h>
http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/394cfb12/Frameworks/Info.plist
----------------------------------------------------------------------
diff --git a/Frameworks/Info.plist b/Frameworks/Info.plist
new file mode 100644
index 0000000..537b5cb
--- /dev/null
+++ b/Frameworks/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>en</string>
+ <key>CFBundleExecutable</key>
+ <string>$(EXECUTABLE_NAME)</string>
+ <key>CFBundleIdentifier</key>
+ <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>$(PRODUCT_NAME)</string>
+ <key>CFBundlePackageType</key>
+ <string>FMWK</string>
+ <key>CFBundleVersion</key>
+ <string>${BUNDLE_VERSION_STRING}</string>
+ <key>CFBundleShortVersionString</key>
+ <string>${BUNDLE_VERSION_STRING}</string>
+</dict>
+</plist>
http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/394cfb12/Frameworks/Tests.m
----------------------------------------------------------------------
diff --git a/Frameworks/Tests.m b/Frameworks/Tests.m
new file mode 100644
index 0000000..b1d69e7
--- /dev/null
+++ b/Frameworks/Tests.m
@@ -0,0 +1,24 @@
+#import <GCDWebServers/GCDWebServers.h>
+#import <XCTest/XCTest.h>
+
+@interface Tests : XCTestCase
+@end
+
+@implementation Tests
+
+- (void)testWebServer {
+ GCDWebServer* server = [[GCDWebServer alloc] init];
+ XCTAssertNotNil(server);
+}
+
+- (void)testDAVServer {
+ GCDWebDAVServer* server = [[GCDWebDAVServer alloc] init];
+ XCTAssertNotNil(server);
+}
+
+- (void)testWebUploader {
+ GCDWebUploader* server = [[GCDWebUploader alloc] init];
+ XCTAssertNotNil(server);
+}
+
+@end
http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/394cfb12/GCDWebDAVServer/GCDWebDAVServer.h
----------------------------------------------------------------------
diff --git a/GCDWebDAVServer/GCDWebDAVServer.h b/GCDWebDAVServer/GCDWebDAVServer.h
index de3b538..84914db 100644
--- a/GCDWebDAVServer/GCDWebDAVServer.h
+++ b/GCDWebDAVServer/GCDWebDAVServer.h
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2012-2014, Pierre-Olivier Latour
+ Copyright (c) 2012-2015, Pierre-Olivier Latour
All rights reserved.
Redistribution and use in source and binary forms, with or without
http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/394cfb12/GCDWebDAVServer/GCDWebDAVServer.m
----------------------------------------------------------------------
diff --git a/GCDWebDAVServer/GCDWebDAVServer.m b/GCDWebDAVServer/GCDWebDAVServer.m
index c7341fa..33025d4 100644
--- a/GCDWebDAVServer/GCDWebDAVServer.m
+++ b/GCDWebDAVServer/GCDWebDAVServer.m
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2012-2014, Pierre-Olivier Latour
+ Copyright (c) 2012-2015, Pierre-Olivier Latour
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -115,6 +115,11 @@ static inline BOOL _IsMacFinder(GCDWebServerRequest* request) {
[self.delegate davServer:self didDownloadFileAtPath:absolutePath];
});
}
+
+ if ([request hasByteRange]) {
+ return [GCDWebServerFileResponse responseWithFile:absolutePath byteRange:request.byteRange];
+ }
+
return [GCDWebServerFileResponse responseWithFile:absolutePath];
}
@@ -261,7 +266,10 @@ static inline BOOL _IsMacFinder(GCDWebServerRequest* request) {
if ((dstRelativePath == nil) || (range.location == NSNotFound)) {
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_BadRequest message:@"Malformed 'Destination' header: %@", dstRelativePath];
}
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
dstRelativePath = [[dstRelativePath substringFromIndex:(range.location + range.length)] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+#pragma clang diagnostic pop
NSString* dstAbsolutePath = [_uploadDirectory stringByAppendingPathComponent:dstRelativePath];
if (![self _checkSandboxedPath:dstAbsolutePath]) {
return [GCDWebServerErrorResponse responseWithClientError:kGCDWebServerHTTPStatusCode_NotFound message:@"\"%@\" does not exist", srcRelativePath];
@@ -333,7 +341,10 @@ static inline xmlNodePtr _XMLChildWithName(xmlNodePtr child, const xmlChar* name
}
- (void)_addPropertyResponseForItem:(NSString*)itemPath resource:(NSString*)resourcePath properties:(DAVProperties)properties xmlString:(NSMutableString*)xmlString {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CFStringRef escapedPath = CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (__bridge CFStringRef)resourcePath, NULL, CFSTR("<&>?+"), kCFStringEncodingUTF8);
+#pragma clang diagnostic pop
if (escapedPath) {
NSDictionary* attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:itemPath error:NULL];
NSString* type = [attributes objectForKey:NSFileType];
@@ -602,6 +613,8 @@ static inline xmlNodePtr _XMLChildWithName(xmlNodePtr child, const xmlChar* name
@synthesize uploadDirectory=_uploadDirectory, allowedFileExtensions=_allowedExtensions, allowHiddenItems=_allowHidden;
+@dynamic delegate;
+
- (instancetype)initWithUploadDirectory:(NSString*)path {
if ((self = [super init])) {
_uploadDirectory = [[path stringByStandardizingPath] copy];
http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/394cfb12/GCDWebServer.podspec
----------------------------------------------------------------------
diff --git a/GCDWebServer.podspec b/GCDWebServer.podspec
index d713b26..901de93 100644
--- a/GCDWebServer.podspec
+++ b/GCDWebServer.podspec
@@ -2,12 +2,12 @@
# http://guides.cocoapods.org/making/getting-setup-with-trunk.html
# $ sudo gem update cocoapods
# (optional) $ pod trunk register {email} {name} --description={computer}
-# $ pod trunk push
+# $ pod trunk --verbose push
# DELETE THIS SECTION BEFORE PROCEEDING!
Pod::Spec.new do |s|
s.name = 'GCDWebServer'
- s.version = '3.1'
+ s.version = '3.3.3'
s.author = { 'Pierre-Olivier Latour' => 'info@pol-online.net' }
s.license = { :type => 'BSD', :file => 'LICENSE' }
s.homepage = 'https://github.com/swisspol/GCDWebServer'
@@ -15,6 +15,7 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/swisspol/GCDWebServer.git', :tag => s.version.to_s }
s.ios.deployment_target = '5.0'
+ s.tvos.deployment_target = '9.0'
s.osx.deployment_target = '10.7'
s.requires_arc = true
@@ -26,24 +27,49 @@ Pod::Spec.new do |s|
cs.requires_arc = true
cs.ios.library = 'z'
cs.ios.frameworks = 'MobileCoreServices', 'CFNetwork'
+ cs.tvos.library = 'z'
+ cs.tvos.frameworks = 'MobileCoreServices', 'CFNetwork'
cs.osx.library = 'z'
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.osx.library = 'xml2'
- cs.compiler_flags = '-I$(SDKROOT)/usr/include/libxml2'
+ cs.dependency 'CocoaLumberjack', '~> 2'
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"
+ 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.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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org