Merge pull request #194 from longbai/test_update

proj update

.travis.yml

@@ -1,5 +1,6 @@
 language: objective-c
 osx_image: xcode7
+
 before_install:
   - rvm install 2.3.1
   - rvm use 2.3.1
@@ -8,10 +9,13 @@ before_install:
   - gem install cocoapods --pre
   - pod --version
   - pod repo remove master
+  - rm -rf ~/.cocoapods
   - pod setup
   - pod install --verbose --no-repo-update
+
 before_script:
   - export QINIU_TEST_ENV="travis"
+
 script:
   - xctool -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_iOS -sdk iphonesimulator -configuration Release test -test-sdk iphonesimulator9.0 -freshInstall -freshSimulator
   - xctool -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_Mac -sdk macosx -configuration Release test -test-sdk macosx

CHANGELOG.md

@@ -1,5 +1,9 @@
 #Changelog
 
+## 7.1.1 (2016-09-08)
+## 改变
+* 修正 happydns 调用函数
+
 ## 7.1.0 (2016-07-04)
 ## 改变
 * 依赖升级到AFNetworking 到 3.x

Podfile

@@ -1,32 +1,32 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
 def shared_dependencies
-  pod "AFNetworking", "~> 3"
-  pod "HappyDNS", ">= 0.3"
+  pod 'AFNetworking', '~> 3'
+  pod 'HappyDNS', '>= 0.3'
 end
 
 def test_dependencies
-  pod "AGAsyncTestHelper/Shorthand"
+  pod 'AGAsyncTestHelper/Shorthand'
 end
 
-target "QiniuSDK_iOS" do
-  platform :ios, "7.0"
+target 'QiniuSDK_iOS' do
+  platform :ios, '7.0'
   shared_dependencies
 end
 
-target "QiniuSDK_iOSTests" do
-  platform :ios, "7.0"
+target 'QiniuSDK_iOSTests' do
+  platform :ios, '7.0'
   shared_dependencies
   test_dependencies
 end
 
-target "QiniuSDK_Mac" do
-  platform :osx, "10.9"
+target 'QiniuSDK_Mac' do
+  platform :osx, '10.9'
   shared_dependencies
 end
 
-target "QiniuSDK_MacTests" do
-  platform :osx, "10.9"
+target 'QiniuSDK_MacTests' do
+  platform :osx, '10.9'
   shared_dependencies
   test_dependencies
 end

Qiniu.podspec

@@ -1,20 +1,20 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = "7.1.0.1"
-  s.summary      = "Qiniu Resource Storage SDK for iOS and Mac"
-  s.homepage     = "https://github.com/qiniu/objc-sdk"
-  s.social_media_url = "http://weibo.com/qiniutek"
+  s.version      = '7.1.1'
+  s.summary      = 'Qiniu Resource Storage SDK for iOS and Mac'
+  s.homepage     = 'https://github.com/qiniu/objc-sdk'
+  s.social_media_url = 'http://weibo.com/qiniutek'
   s.author       = "Qiniu => [email protected]"
-  s.source       = {:git => "https://github.com/qiniu/objc-sdk.git", :tag => "v#{s.version}"}
+  s.source       = {:git => 'https://github.com/qiniu/objc-sdk.git', :tag => "v#{s.version}"}
 
-  s.ios.deployment_target = "7.0"
-  s.osx.deployment_target = "10.9"
+  s.ios.deployment_target = '7.0'
+  s.osx.deployment_target = '10.9'
 
   s.source_files = "QiniuSDK/**/*.{h,m}"
   s.requires_arc = true
-  s.libraries = "z"
-  s.dependency "AFNetworking", "~> 3"
-  s.dependency "HappyDNS", "~> 0.3"
+  s.libraries = 'z'
+  s.dependency 'AFNetworking', '~> 3'
+  s.dependency 'HappyDNS', '~> 0.3'
   s.license = { :type => "MIT", :text => <<-LICENSE
 The MIT License (MIT)
 

QiniuSDK/Common/QNVersion.h

@@ -11,4 +11,4 @@
 /**
  *    sdk 版本
  */
-static const NSString *kQiniuVersion = @"7.1.0";
+static const NSString *kQiniuVersion = @"7.1.1";

QiniuSDK/Storage/QNConfiguration.m

@@ -39,8 +39,8 @@ static void addZoneToDns(QNZone *zone, QNDnsManager *dns) {
     QNDnsManager *d = builder.dns;
     if (d == nil) {
         id<QNResolverDelegate> r1 = [QNResolver systemResolver];
-        id<QNResolverDelegate> r2 = [[QNResolver alloc] initWithAddres:@"119.29.29.29"];
-        id<QNResolverDelegate> r3 = [[QNResolver alloc] initWithAddres:@"114.114.115.115"];
+        id<QNResolverDelegate> r2 = [[QNResolver alloc] initWithAddress:@"119.29.29.29"];
+        id<QNResolverDelegate> r3 = [[QNResolver alloc] initWithAddress:@"114.114.115.115"];
         d = [[QNDnsManager alloc] init:[NSArray arrayWithObjects:r1, r2, r3, nil] networkInfo:[QNNetworkInfo normal]];
     }
     return d;

QiniuSDKTests/QNFormUploadTest.m

@@ -270,7 +270,7 @@ - (void)testDnsHosts {
     __block QNResponseInfo *testInfo = nil;
     __block NSDictionary *testResp = nil;
     __block NSString *key = nil;
-    QNResolver *resolver = [[QNResolver alloc] initWithAddres:@"114.114.115.115"];
+    QNResolver *resolver = [[QNResolver alloc] initWithAddress:@"114.114.115.115"];
     QNDnsManager *dns = [[QNDnsManager alloc] init:[NSArray arrayWithObject:resolver] networkInfo:[QNNetworkInfo normal]];
     QNConfiguration *config = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
         NSArray *ips = [QNZone zone0].up.ips;

QiniuSDKTests/QNSessionTest.m

@@ -139,7 +139,7 @@ - (void)testUrlConvert {
 - (void)testPostIp {
     __block QNResponseInfo *testInfo = nil;
     NSData *data = [@"Hello, World!" dataUsingEncoding:NSUTF8StringEncoding];
-    QNResolver *resolver = [[QNResolver alloc] initWithAddres:@"114.114.115.115"];
+    QNResolver *resolver = [[QNResolver alloc] initWithAddress:@"114.114.115.115"];
     QNDnsManager *dns = [[QNDnsManager alloc] init:[NSArray arrayWithObject:resolver] networkInfo:[QNNetworkInfo normal]];
     [dns putHosts:@"upnonono.qiniu.com" ip:[QNZone zone0].up.ips[0]];
     QNSessionManager *httpManager = [[QNSessionManager alloc] initWithProxy:nil timeout:60 urlConverter:nil dns:dns];