Merge branch 'release/1.0'

.gitignore

@@ -0,0 +1,70 @@
+#####
+# OS X temporary files that should never be committed
+.DS_Store
+*.swp
+*.lock
+profile
+
+####
+# Xcode temporary files that should never be committed
+*~.nib
+
+####
+# Objective-C/Swift specific
+*.hmap
+*.ipa
+
+####
+# Xcode build files
+DerivedData/
+build/
+Builds/
+
+#####
+# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups)
+*.pbxuser
+*.mode1v3
+*.mode2v3
+*.perspectivev3
+!default.pbxuser
+!default.mode1v3
+!default.mode2v3
+!default.perspectivev3
+
+####
+# Xcode 4
+xcuserdata
+!xcschemes
+# Xcode 4
+*.moved-aside
+
+####
+# XCode 4 workspaces - more detailed
+!xcshareddata
+!default.xcworkspace
+*.xcworkspacedata
+
+
+####
+# Xcode 5
+*.xccheckout
+*.xcuserstate
+
+####
+# Xcode 7
+*.xcscmblueprint
+
+####
+# AppCode
+.idea/
+
+####
+# Other Xcode files
+profile
+*.hmap
+*.ipa
+
+####
+# Carthage
+Carthage/Build
+

.travis.yml

@@ -2,4 +2,4 @@ language: objective-c
 osx_image: xcode7.3
 xcode_workspace: ShadowsocksX-NG.xcworkspace
 xcode_scheme: ShadowsocksX-NG
-
+script: set -o pipefail && xcodebuild test -workspace ShadowsocksX-NG.xcworkspace -scheme ShadowsocksX-NG|xcpretty

Podfile

@@ -13,13 +13,8 @@ target 'ShadowsocksX-NG' do
     # Pods for testing
   end
 
-  target 'ShadowsocksX-NGUITests' do
-    inherit! :search_paths
-    # Pods for testing
-  end
-
 end
 
 target 'proxy_conf_helper' do
   pod 'BRLOptionParser', '~> 0.3.1'
-end
+end

Podfile.lock

@@ -10,6 +10,6 @@ SPEC CHECKSUMS:
   Alamofire: c19a627cefd6a95f840401c49ab1f124e07f54ee
   BRLOptionParser: a03256a8ff003ca1f5376c55f55f210e085a3958
 
-PODFILE CHECKSUM: f532fd25b5e9173775d8deaa63ba5cf93104b844
+PODFILE CHECKSUM: a76490e9ab2548c7b811762e2479c111c5c263b7
 
 COCOAPODS: 1.0.1