Merge branch 'release/1.3'

zhaozidong86 · Oct 14, 2016 · 8ba8163 · 8ba8163
2 parents f03287e + 54ad13e
commit 8ba8163
Show file tree

Hide file tree

Showing 112 changed files with 21,143 additions and 4,827 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode8
 xcode_workspace: ShadowsocksX-NG.xcworkspace
 xcode_scheme: ShadowsocksX-NG
 script: set -o pipefail && xcodebuild test -workspace ShadowsocksX-NG.xcworkspace -scheme ShadowsocksX-NG|xcpretty
diff --git a/Podfile b/Podfile
@@ -6,8 +6,9 @@ target 'ShadowsocksX-NG' do
   use_frameworks!
 
   # Pods for ShadowsocksX-NG
-  pod 'Alamofire', '~> 3.4'
-
+  pod 'Alamofire', '~> 4.0.1'
+  pod "GCDWebServer", "~> 3.0"
+
   target 'ShadowsocksX-NGTests' do
     inherit! :search_paths
     # Pods for testing

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,15 +1,20 @@
 PODS:
-  - Alamofire (3.4.0)
+  - Alamofire (4.0.1)
   - BRLOptionParser (0.3.1)
+  - GCDWebServer (3.3.3):
+    - GCDWebServer/Core (= 3.3.3)
+  - GCDWebServer/Core (3.3.3)
 
 DEPENDENCIES:
-  - Alamofire (~> 3.4)
+  - Alamofire (~> 4.0.1)
   - BRLOptionParser (~> 0.3.1)
+  - GCDWebServer (~> 3.0)
 
 SPEC CHECKSUMS:
-  Alamofire: c19a627cefd6a95f840401c49ab1f124e07f54ee
+  Alamofire: 7682d43245de14874acd142ec137b144aa1dd335
   BRLOptionParser: a03256a8ff003ca1f5376c55f55f210e085a3958
+  GCDWebServer: 1c39a1f0763e4eb492bee021e4270fce097d3555
 
-PODFILE CHECKSUM: a76490e9ab2548c7b811762e2479c111c5c263b7
+PODFILE CHECKSUM: e675030dbd86de38216dc6c44e64ca1458be94bc
 
 COCOAPODS: 1.0.1
diff --git a/Pods/Alamofire/README.md b/Pods/Alamofire/README.md