4 Commits
3.4.1 ... 3.4.2

Author SHA1 Message Date
Pierre-Olivier Latour
a554893844 Bumped version 2017-11-02 14:01:02 -07:00
Pierre-Olivier Latour
06569fe2cc Fixed NS_ASSUME_NONNULL_BEGIN not located at the right place in GCDWebServerPrivate.h 2017-11-02 14:00:10 -07:00
Pierre-Olivier Latour
e812d3f43c Updated to Xcode 9.1 2017-11-02 13:59:09 -07:00
Johnny Wu
d30c88729d Simplify podspec (#334) 2017-08-23 11:20:54 +02:00
6 changed files with 19 additions and 23 deletions

View File

@@ -7,7 +7,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'GCDWebServer' s.name = 'GCDWebServer'
s.version = '3.4.1' s.version = '3.4.2'
s.author = { 'Pierre-Olivier Latour' => 'info@pol-online.net' } s.author = { 'Pierre-Olivier Latour' => 'info@pol-online.net' }
s.license = { :type => 'BSD', :file => 'LICENSE' } s.license = { :type => 'BSD', :file => 'LICENSE' }
s.homepage = 'https://github.com/swisspol/GCDWebServer' s.homepage = 'https://github.com/swisspol/GCDWebServer'
@@ -34,23 +34,19 @@ Pod::Spec.new do |s|
end end
s.subspec 'WebDAV' do |cs| s.subspec 'WebDAV' do |cs|
cs.subspec "Core" do |ccs| cs.dependency 'GCDWebServer/Core'
ccs.dependency 'GCDWebServer/Core' cs.source_files = 'GCDWebDAVServer/*.{h,m}'
ccs.source_files = 'GCDWebDAVServer/*.{h,m}' cs.requires_arc = true
ccs.requires_arc = true cs.ios.library = 'xml2'
ccs.ios.library = 'xml2' cs.tvos.library = 'xml2'
ccs.tvos.library = 'xml2' cs.osx.library = 'xml2'
ccs.osx.library = 'xml2' cs.compiler_flags = '-I$(SDKROOT)/usr/include/libxml2'
ccs.compiler_flags = '-I$(SDKROOT)/usr/include/libxml2'
end
end end
s.subspec 'WebUploader' do |cs| s.subspec 'WebUploader' do |cs|
cs.subspec "Core" do |ccs| cs.dependency 'GCDWebServer/Core'
ccs.dependency 'GCDWebServer/Core' cs.source_files = 'GCDWebUploader/*.{h,m}'
ccs.source_files = 'GCDWebUploader/*.{h,m}' cs.requires_arc = true
ccs.requires_arc = true cs.resource = "GCDWebUploader/GCDWebUploader.bundle"
ccs.resource = "GCDWebUploader/GCDWebUploader.bundle"
end
end end
end end

View File

@@ -856,7 +856,7 @@
08FB7793FE84155DC02AAC07 /* Project object */ = { 08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0900; LastUpgradeCheck = 0910;
TargetAttributes = { TargetAttributes = {
CEE28CD01AE004D800F4023C = { CEE28CD01AE004D800F4023C = {
CreatedOnToolsVersion = 6.3; CreatedOnToolsVersion = 6.3;

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0900" LastUpgradeVersion = "0910"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0900" LastUpgradeVersion = "0910"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0900" LastUpgradeVersion = "0910"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

View File

@@ -48,8 +48,6 @@
#import "GCDWebServerFileResponse.h" #import "GCDWebServerFileResponse.h"
#import "GCDWebServerStreamedResponse.h" #import "GCDWebServerStreamedResponse.h"
NS_ASSUME_NONNULL_BEGIN
/** /**
* Check if a custom logging facility should be used instead. * Check if a custom logging facility should be used instead.
*/ */
@@ -101,7 +99,7 @@ typedef NS_ENUM(int, GCDWebServerLoggingLevel) {
}; };
extern GCDWebServerLoggingLevel GCDWebServerLogLevel; extern GCDWebServerLoggingLevel GCDWebServerLogLevel;
extern void GCDWebServerLogMessage(GCDWebServerLoggingLevel level, NSString* format, ...) NS_FORMAT_FUNCTION(2, 3); extern void GCDWebServerLogMessage(GCDWebServerLoggingLevel level, NSString* _Nonnull format, ...) NS_FORMAT_FUNCTION(2, 3);
#if DEBUG #if DEBUG
#define GWS_LOG_DEBUG(...) \ #define GWS_LOG_DEBUG(...) \
@@ -155,6 +153,8 @@ extern void GCDWebServerLogMessage(GCDWebServerLoggingLevel level, NSString* for
#endif #endif
NS_ASSUME_NONNULL_BEGIN
/** /**
* GCDWebServer internal constants and APIs. * GCDWebServer internal constants and APIs.
*/ */