Merge pull request #93 from longbai/release7.0.15

release7.0.15

Author: longbai

CHANGELOG.md

@@ -1,6 +1,11 @@
 #Changelog
 
-## 7.0.13 (2015-11-08)
+## 7.0.15 (2015-11-10)
+
+### 修正
+* 更改Reachbility的名字，避免和用户自定义的冲突
+
+## 7.0.14 (2015-11-08)
 
 ### 增加
 * 上传性能统计

Qiniu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '7.0.14'
+  s.version      = '7.0.15'
   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'

QiniuSDK/Common/QNVersion.h

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

QiniuSDK/Http/QNStats.h

@@ -9,14 +9,14 @@
 
 
 #import <Foundation/Foundation.h>
-#import "AFNetworking.h"
-#import "HappyDns.h"
+
 
 #if TARGET_OS_IPHONE
 #import "QNReachability.h"
 #import <CoreTelephony/CTTelephonyNetworkInfo.h>
 #endif
 
+@class QNDnsManager;
 @interface QNStats : NSObject
 
 #if TARGET_OS_IPHONE

QiniuSDK/Http/QNStats.m

@@ -13,6 +13,8 @@
 
 //#import "GZIP.h"
 #import "QNStats.h"
+#import "AFNetworking.h"
+#import "HappyDns.h"
 
 void setStat(NSMutableDictionary *dic, id key, id value) {
 	if (value == nil || dic == nil) {