Skip to content

Commit 4ee9576

Browse files
author
YangSen-qn
committed
IPHONEOS_DEPLOYMENT_TARGET to 9.0 & fix some warning
1 parent 631a376 commit 4ee9576

File tree

5 files changed

+27
-15
lines changed

5 files changed

+27
-15
lines changed

HappyDNS.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Pod::Spec.new do |s|
77
s.author = 'Qiniu => sdk@qiniu.com'
88
s.source = {:git => 'https://github.com/qiniu/happy-dns-objc.git', :tag => "v#{s.version}"}
99

10-
s.ios.deployment_target = '6.0'
11-
s.osx.deployment_target = '10.8'
10+
s.ios.deployment_target = '9.0'
11+
s.osx.deployment_target = '10.10'
1212
s.libraries = 'resolv'
1313
s.source_files = 'HappyDNS/Common/*.{h,m}','HappyDNS/Dns/*.{h,m}','HappyDNS/Http/*.{h,m}','HappyDNS/Local/*.{h,m}','HappyDNS/Util/*.{h,m}','HappyDNS/HappyDNS.h'
1414
s.requires_arc = true

HappyDNS.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,7 @@
10281028
GCC_C_LANGUAGE_STANDARD = gnu11;
10291029
INFOPLIST_FILE = "$(SRCROOT)/HappyDNS-dynamic/Info.plist";
10301030
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1031-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1031+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
10321032
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10331033
PRODUCT_BUNDLE_IDENTIFIER = com.qiniu.HappyDNS;
10341034
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -1072,7 +1072,7 @@
10721072
GCC_C_LANGUAGE_STANDARD = gnu11;
10731073
INFOPLIST_FILE = "$(SRCROOT)/HappyDNS-dynamic/Info.plist";
10741074
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1075-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1075+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
10761076
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10771077
PRODUCT_BUNDLE_IDENTIFIER = com.qiniu.HappyDNS;
10781078
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -1142,8 +1142,8 @@
11421142
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
11431143
GCC_WARN_UNUSED_FUNCTION = YES;
11441144
GCC_WARN_UNUSED_VARIABLE = YES;
1145-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1146-
MACOSX_DEPLOYMENT_TARGET = 10.8;
1145+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1146+
MACOSX_DEPLOYMENT_TARGET = 10.10;
11471147
MTL_ENABLE_DEBUG_INFO = YES;
11481148
ONLY_ACTIVE_ARCH = YES;
11491149
PRODUCT_NAME = HappyDNS;
@@ -1180,8 +1180,8 @@
11801180
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
11811181
GCC_WARN_UNUSED_FUNCTION = YES;
11821182
GCC_WARN_UNUSED_VARIABLE = YES;
1183-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1184-
MACOSX_DEPLOYMENT_TARGET = 10.8;
1183+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1184+
MACOSX_DEPLOYMENT_TARGET = 10.10;
11851185
MTL_ENABLE_DEBUG_INFO = NO;
11861186
PRODUCT_NAME = HappyDNS;
11871187
SDKROOT = macosx;

HappyDNS/Http/QNDnspodEnterprise.m

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,25 @@ - (NSArray *)query:(QNDomain *)domain networkInfo:(QNNetworkInfo *)netInfo error
8282
}
8383
return nil;
8484
}
85+
86+
dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
87+
88+
__block NSData *data = nil;
89+
__block NSError *httpError = nil;
90+
__block NSHTTPURLResponse *response = nil;
8591
NSString *url = [NSString stringWithFormat:@"http://%@/d?ttl=1&dn=%@&id=%@", [QNIP ipHost:_server], encrypt, _userId];
8692
NSURLRequest *urlRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:url] cachePolicy:NSURLRequestUseProtocolCachePolicy timeoutInterval:_timeout];
87-
NSHTTPURLResponse *response = nil;
88-
NSError *httpError = nil;
89-
NSData *data = [NSURLConnection sendSynchronousRequest:urlRequest
90-
returningResponse:&response
91-
error:&httpError];
93+
NSURLSession *session = [NSURLSession sharedSession];
94+
NSURLSessionTask *task = [session dataTaskWithRequest:urlRequest completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable resp, NSError * _Nullable error) {
95+
96+
data = data;
97+
httpError = error;
98+
response = (NSHTTPURLResponse *)resp;
99+
dispatch_semaphore_signal(semaphore);
100+
}];
101+
[task resume];
102+
103+
dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
92104

93105
if (httpError != nil) {
94106
if (error != nil) {

HappyDNS/Local/QNResolvUtil.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ int setup_dns_server(void *_res_state, NSString *dns_server, NSUInteger timeout)
6464
if ([QNIP isV6]) {
6565
freeaddrinfo(ai);
6666
ai = NULL;
67-
bzero(&hints, 0);
67+
bzero(&hints, (size_t)0);
6868
hints.ai_family = AF_UNSPEC;
6969
hints.ai_socktype = SOCK_STREAM;
7070
char buf[64] = {0};

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let package = Package(
77
name: "HappyDNS",
88
platforms: [
99
.macOS(.v10_10),
10-
.iOS(.v8)
10+
.iOS(.v9)
1111
],
1212
products: [
1313
.library(

0 commit comments

Comments
 (0)