Skip to content

Commit 2b45b8f

Browse files
committed
ios test fixed
1 parent 2e214ef commit 2b45b8f

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#Changelog
22

3+
## 7.0.12 (2015-07-22)
4+
5+
### 增加
6+
* 使用 happydns 进行解析
7+
38
## 7.0.11.1 (2015-06-23)
49

510
### 增加

Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git'
33
target "QiniuSDK iOS" do
44
platform :ios, "6.0"
55
pod 'AFNetworking', '>= 2.4'
6-
pod 'HappyDNS', '>= 0.0.1'
6+
pod 'HappyDNS', '>= 0.1.1'
77
end
88

99
target "QiniuSDK iOSTests" do
@@ -14,7 +14,7 @@ end
1414
target "QiniuSDK Mac" do
1515
platform :osx, "10.8"
1616
pod 'AFNetworking', '>= 2.4'
17-
pod 'HappyDNS', '>= 0.0.1'
17+
pod 'HappyDNS', '>= 0.1.1'
1818
end
1919

2020
target "QiniuSDK MacTests" do

Qiniu.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
1414
s.requires_arc = true
1515
s.libraries = 'z'
1616
s.dependency 'AFNetworking', '~> 2.0'
17-
s.dependency 'HappyDNS'
17+
s.dependency 'HappyDNS', '~> 0.1'
1818
s.license = { :type => 'MIT', :text => <<-LICENSE
1919
The MIT License (MIT)
2020

QiniuSDK.xcodeproj/project.pbxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
DF482FD81B0DA8A2000DAD98 /* QNConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = DF482FD61B0DA8A2000DAD98 /* QNConfiguration.h */; };
6565
DF482FD91B0DA8A2000DAD98 /* QNConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = DF482FD71B0DA8A2000DAD98 /* QNConfiguration.m */; };
6666
DF482FDA1B0DA8A2000DAD98 /* QNConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = DF482FD71B0DA8A2000DAD98 /* QNConfiguration.m */; };
67+
DF5AC8E81B5F509200728D30 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DF5AC8E71B5F509200728D30 /* libresolv.dylib */; };
6768
DF6099FA1A5676AA00AC7297 /* QNDns.h in Headers */ = {isa = PBXBuildFile; fileRef = DF6099F91A5676AA00AC7297 /* QNDns.h */; };
6869
DF6099FC1A5676CA00AC7297 /* QNDns.m in Sources */ = {isa = PBXBuildFile; fileRef = DF6099FB1A5676CA00AC7297 /* QNDns.m */; };
6970
DF6099FE1A5676CA00AC7297 /* QNDns.m in Sources */ = {isa = PBXBuildFile; fileRef = DF6099FB1A5676CA00AC7297 /* QNDns.m */; };
@@ -154,6 +155,7 @@
154155
DF437CDE1B243A2C0099587B /* QNUpTokenTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNUpTokenTest.m; sourceTree = "<group>"; };
155156
DF482FD61B0DA8A2000DAD98 /* QNConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QNConfiguration.h; sourceTree = "<group>"; };
156157
DF482FD71B0DA8A2000DAD98 /* QNConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNConfiguration.m; sourceTree = "<group>"; };
158+
DF5AC8E71B5F509200728D30 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk/usr/lib/libresolv.dylib; sourceTree = DEVELOPER_DIR; };
157159
DF6099F91A5676AA00AC7297 /* QNDns.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QNDns.h; sourceTree = "<group>"; };
158160
DF6099FB1A5676CA00AC7297 /* QNDns.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNDns.m; sourceTree = "<group>"; };
159161
DF609A001A5839B400AC7297 /* QNDnsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QNDnsTest.m; sourceTree = "<group>"; };
@@ -213,6 +215,7 @@
213215
isa = PBXFrameworksBuildPhase;
214216
buildActionMask = 2147483647;
215217
files = (
218+
DF5AC8E81B5F509200728D30 /* libresolv.dylib in Frameworks */,
216219
DF0A03251B3BAC5700E3778C /* libQiniuSDK iOS.a in Frameworks */,
217220
DF293C9A19DBC09400799011 /* libz.dylib in Frameworks */,
218221
7277FD17389341BDCAD29727 /* libPods-QiniuSDK iOSTests.a in Frameworks */,
@@ -240,6 +243,7 @@
240243
A955AABD20BF51BFE5032419 /* Frameworks */ = {
241244
isa = PBXGroup;
242245
children = (
246+
DF5AC8E71B5F509200728D30 /* libresolv.dylib */,
243247
DF293C9319DB860200799011 /* libz.dylib */,
244248
DF293C9019DB85CB00799011 /* libz.dylib */,
245249
8924D07F6E137C6379C173D4 /* libPods-QiniuSDK Mac.a */,
@@ -962,9 +966,11 @@
962966
"\"CFNetwork\"",
963967
"-framework",
964968
"\"Foundation\"",
969+
"-l\"Pods-QiniuSDK iOS-HappyDNS\"",
965970
);
966971
PRODUCT_NAME = "$(TARGET_NAME)";
967972
SDKROOT = iphoneos;
973+
VALID_ARCHS = "arm64 armv7 armv7s";
968974
};
969975
name = Debug;
970976
};
@@ -989,10 +995,12 @@
989995
"\"CFNetwork\"",
990996
"-framework",
991997
"\"Foundation\"",
998+
"-l\"Pods-QiniuSDK iOS-HappyDNS\"",
992999
);
9931000
PRODUCT_NAME = "$(TARGET_NAME)";
9941001
SDKROOT = iphoneos;
9951002
VALIDATE_PRODUCT = YES;
1003+
VALID_ARCHS = "arm64 armv7 armv7s";
9961004
};
9971005
name = Release;
9981006
};

0 commit comments

Comments
 (0)