Skip to content

Commit 6828e9e

Browse files
longbailongbai
committed
Merge pull request #178 from Kivenhaoyu/AFNetworking-3.0.0
Af networking 3.0.0 ipv6
2 parents aafddf1 + e1c178e commit 6828e9e

File tree

19 files changed

+318
-375
lines changed

19 files changed

+318
-375
lines changed

‎.travis.yml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
language: objective-c
22
osx_image: xcode7
3-
before_install: true
4-
#- brew update
5-
#- brew upgrade xctool
6-
#- gem install cocoapods
3+
before_install:
4+
- rvm install 2.3.1
5+
- rvm use 2.3.1
6+
- brew update
7+
- brew outdated xctool || brew upgrade xctool
8+
- gem install cocoapods --pre
9+
- pod --version
10+
- pod repo remove master
11+
- pod setup
12+
- pod install --verbose --no-repo-update
713
before_script:
814
- export QINIU_TEST_ENV="travis"
915
script:
10-
- xctool -workspace QiniuSDK.xcworkspace -scheme "QiniuSDK iOS" -sdk iphonesimulator -configuration Release test -test-sdk iphonesimulator9.0 -freshInstall -freshSimulator
11-
- xctool -workspace QiniuSDK.xcworkspace -scheme "QiniuSDK Mac" -sdk macosx -configuration Release test -test-sdk macosx
16+
- xctool -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_iOS -sdk iphonesimulator -configuration Release test -test-sdk iphonesimulator9.0 -freshInstall -freshSimulator
17+
- xctool -workspace QiniuSDK.xcworkspace -scheme QiniuSDK_Mac -sdk macosx -configuration Release test -test-sdk macosx

‎CHANGELOG.md‎

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

3+
## 7.0.20 (2016-05-30)
4+
5+
### 修正
6+
* iOS8 ipv6 问题
7+
* 为ipv6兼容，happydns 指定为 0.3以上
8+
9+
## 7.0.19 (2016-05-23)
10+
11+
### 修正
12+
* iOS8 ipv6 支持
13+
314
## 7.0.18 (2016-05-10)
415

516
### 修正

‎Podfile‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,32 @@
11
source 'https://github.com/CocoaPods/Specs.git'
22

3-
target "QiniuSDK iOS" do
3+
def shared_dependencies
4+
pod "AFNetworking", "~> 3"
5+
pod "HappyDNS", ">= 0.3"
6+
end
7+
8+
def test_dependencies
9+
pod "AGAsyncTestHelper/Shorthand"
10+
end
11+
12+
target "QiniuSDK_iOS" do
413
platform :ios, "7.0"
5-
pod 'AFNetworking', '~> 3'
6-
pod 'HappyDNS', '>= 0.2'
14+
shared_dependencies
715
end
816

9-
target "QiniuSDK iOSTests" do
17+
target "QiniuSDK_iOSTests" do
1018
platform :ios, "7.0"
11-
pod 'AGAsyncTestHelper/Shorthand'
19+
shared_dependencies
20+
test_dependencies
1221
end
1322

14-
target "QiniuSDK Mac" do
23+
target "QiniuSDK_Mac" do
1524
platform :osx, "10.9"
16-
pod 'AFNetworking', '~> 3'
17-
pod 'HappyDNS', '>= 0.2'
25+
shared_dependencies
1826
end
1927

20-
target "QiniuSDK MacTests" do
28+
target "QiniuSDK_MacTests" do
2129
platform :osx, "10.9"
22-
pod 'AGAsyncTestHelper/Shorthand'
30+
shared_dependencies
31+
test_dependencies
2332
end

‎Qiniu.podspec‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
Pod::Spec.new do |s|
22
s.name = 'Qiniu'
3-
s.version = '7.0.19.1'
4-
s.summary = 'Qiniu Resource Storage SDK for iOS and Mac'
5-
s.homepage = 'https://github.com/qiniu/objc-sdk'
6-
s.social_media_url = 'http://weibo.com/qiniutek'
7-
s.author = 'Qiniu => [email protected]'
3+
s.version = "7.0.20"
4+
s.summary = "Qiniu Resource Storage SDK for iOS and Mac"
5+
s.homepage = "https://github.com/qiniu/objc-sdk"
6+
s.social_media_url = "http://weibo.com/qiniutek"
7+
s.author = "Qiniu => [email protected]"
88
s.source = {:git => 'https://github.com/qiniu/objc-sdk.git', :branch => 'AFNetworking-3.x'}
99

10-
s.ios.deployment_target = '7.0'
11-
s.osx.deployment_target = '10.9'
10+
s.ios.deployment_target = "7.0"
11+
s.osx.deployment_target = "10.9"
1212

13-
s.source_files = 'QiniuSDK/**/*.{h,m}'
13+
s.source_files = "QiniuSDK/**/*.{h,m}"
1414
s.requires_arc = true
15-
s.libraries = 'z'
16-
s.dependency 'AFNetworking', '~> 3'
17-
s.dependency 'HappyDNS', '~> 0.2'
18-
s.license = { :type => 'MIT', :text => <<-LICENSE
15+
s.libraries = "z"
16+
s.dependency "AFNetworking", "~> 3"
17+
s.dependency "HappyDNS", "~> 0.3"
18+
s.license = { :type => "MIT", :text => <<-LICENSE
1919
The MIT License (MIT)
2020
2121
Copyright (c) 2011-2015 qiniu.com

‎QiniuDemo/QiniuDemo.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,12 @@
179179
isa = PBXNativeTarget;
180180
buildConfigurationList = 93D2304C1C86D7F800434F6D /* Build configuration list for PBXNativeTarget "QiniuDemo" */;
181181
buildPhases = (
182-
D0F6ADCA764EF90D58C53A3C /* Check Pods Manifest.lock */,
182+
D0F6ADCA764EF90D58C53A3C /* 📦 Check Pods Manifest.lock */,
183183
93D2301B1C86D7F700434F6D /* Sources */,
184184
93D2301C1C86D7F700434F6D /* Frameworks */,
185185
93D2301D1C86D7F700434F6D /* Resources */,
186-
E7747219847A629D5312382A /* Embed Pods Frameworks */,
187-
200D9CECB60715C9746F9444 /* Copy Pods Resources */,
186+
E7747219847A629D5312382A /* 📦 Embed Pods Frameworks */,
187+
200D9CECB60715C9746F9444 /* 📦 Copy Pods Resources */,
188188
);
189189
buildRules = (
190190
);
@@ -199,12 +199,12 @@
199199
isa = PBXNativeTarget;
200200
buildConfigurationList = 93D2304F1C86D7F800434F6D /* Build configuration list for PBXNativeTarget "QiniuDemoTests" */;
201201
buildPhases = (
202-
7BC7BFB54A15F4E854C3D84E /* Check Pods Manifest.lock */,
202+
7BC7BFB54A15F4E854C3D84E /* 📦 Check Pods Manifest.lock */,
203203
93D230341C86D7F700434F6D /* Sources */,
204204
93D230351C86D7F700434F6D /* Frameworks */,
205205
93D230361C86D7F700434F6D /* Resources */,
206-
29A428BC542135B14A72E77B /* Embed Pods Frameworks */,
207-
ABE36606520E0BC28F0FB079 /* Copy Pods Resources */,
206+
29A428BC542135B14A72E77B /* 📦 Embed Pods Frameworks */,
207+
ABE36606520E0BC28F0FB079 /* 📦 Copy Pods Resources */,
208208
);
209209
buildRules = (
210210
);
@@ -304,89 +304,89 @@
304304
/* End PBXResourcesBuildPhase section */
305305

306306
/* Begin PBXShellScriptBuildPhase section */
307-
200D9CECB60715C9746F9444 /* Copy Pods Resources */ = {
307+
200D9CECB60715C9746F9444 /* 📦 Copy Pods Resources */ = {
308308
isa = PBXShellScriptBuildPhase;
309309
buildActionMask = 2147483647;
310310
files = (
311311
);
312312
inputPaths = (
313313
);
314-
name = "Copy Pods Resources";
314+
name = "📦 Copy Pods Resources";
315315
outputPaths = (
316316
);
317317
runOnlyForDeploymentPostprocessing = 0;
318318
shellPath = /bin/sh;
319319
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-QiniuDemo/Pods-QiniuDemo-resources.sh\"\n";
320320
showEnvVarsInLog = 0;
321321
};
322-
29A428BC542135B14A72E77B /* Embed Pods Frameworks */ = {
322+
29A428BC542135B14A72E77B /* 📦 Embed Pods Frameworks */ = {
323323
isa = PBXShellScriptBuildPhase;
324324
buildActionMask = 2147483647;
325325
files = (
326326
);
327327
inputPaths = (
328328
);
329-
name = "Embed Pods Frameworks";
329+
name = "📦 Embed Pods Frameworks";
330330
outputPaths = (
331331
);
332332
runOnlyForDeploymentPostprocessing = 0;
333333
shellPath = /bin/sh;
334334
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-QiniuDemoTests/Pods-QiniuDemoTests-frameworks.sh\"\n";
335335
showEnvVarsInLog = 0;
336336
};
337-
7BC7BFB54A15F4E854C3D84E /* Check Pods Manifest.lock */ = {
337+
7BC7BFB54A15F4E854C3D84E /* 📦 Check Pods Manifest.lock */ = {
338338
isa = PBXShellScriptBuildPhase;
339339
buildActionMask = 2147483647;
340340
files = (
341341
);
342342
inputPaths = (
343343
);
344-
name = "Check Pods Manifest.lock";
344+
name = "📦 Check Pods Manifest.lock";
345345
outputPaths = (
346346
);
347347
runOnlyForDeploymentPostprocessing = 0;
348348
shellPath = /bin/sh;
349349
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
350350
showEnvVarsInLog = 0;
351351
};
352-
ABE36606520E0BC28F0FB079 /* Copy Pods Resources */ = {
352+
ABE36606520E0BC28F0FB079 /* 📦 Copy Pods Resources */ = {
353353
isa = PBXShellScriptBuildPhase;
354354
buildActionMask = 2147483647;
355355
files = (
356356
);
357357
inputPaths = (
358358
);
359-
name = "Copy Pods Resources";
359+
name = "📦 Copy Pods Resources";
360360
outputPaths = (
361361
);
362362
runOnlyForDeploymentPostprocessing = 0;
363363
shellPath = /bin/sh;
364364
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-QiniuDemoTests/Pods-QiniuDemoTests-resources.sh\"\n";
365365
showEnvVarsInLog = 0;
366366
};
367-
D0F6ADCA764EF90D58C53A3C /* Check Pods Manifest.lock */ = {
367+
D0F6ADCA764EF90D58C53A3C /* 📦 Check Pods Manifest.lock */ = {
368368
isa = PBXShellScriptBuildPhase;
369369
buildActionMask = 2147483647;
370370
files = (
371371
);
372372
inputPaths = (
373373
);
374-
name = "Check Pods Manifest.lock";
374+
name = "📦 Check Pods Manifest.lock";
375375
outputPaths = (
376376
);
377377
runOnlyForDeploymentPostprocessing = 0;
378378
shellPath = /bin/sh;
379379
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
380380
showEnvVarsInLog = 0;
381381
};
382-
E7747219847A629D5312382A /* Embed Pods Frameworks */ = {
382+
E7747219847A629D5312382A /* 📦 Embed Pods Frameworks */ = {
383383
isa = PBXShellScriptBuildPhase;
384384
buildActionMask = 2147483647;
385385
files = (
386386
);
387387
inputPaths = (
388388
);
389-
name = "Embed Pods Frameworks";
389+
name = "📦 Embed Pods Frameworks";
390390
outputPaths = (
391391
);
392392
runOnlyForDeploymentPostprocessing = 0;

‎QiniuDemo/QiniuDemo/Base.lproj/Main.storyboard‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="ICJ-el-kyi">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="ICJ-el-kyi">
33
<dependencies>
44
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
66
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
77
</dependencies>
88
<scenes>

0 commit comments

Comments
 (0)