Merge remote-tracking branch 'origin/master'

# Conflicts: # netfox.podspec # netfox/Core/NFXHelper.swift # netfox/iOS/NFXSettingsController_iOS.swift
T-Pham · Nov 11, 2016 · adb349a · adb349a
2 parents 40584e4 + 987fd99
commit adb349a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/netfox.podspec b/netfox.podspec
@@ -11,12 +11,12 @@ DESC
   s.screenshots      = "https://raw.githubusercontent.com/kasketis/netfox/master/assets/overview1_5_3.gif"
   s.license          = 'MIT'
   s.author           = "Christos Kasketis"
-  s.source           = { :git => "https://github.com/kasketis/netfox.git", :tag => '1.8' }
+  s.source           = { :git => "https://github.com/kasketis/netfox.git", :tag => "#{s.version}" }
 
   s.platform     = :ios, '8.0'
   s.platform     = :osx, '10.11'
   s.requires_arc = true
-
-  s.ios.source_files = "netfox/Core/*.swift" , "netfox/iOS/*.swift"
-  s.osx.source_files = "netfox/Core/*.swift" , "netfox/OSX/*.swift"
-end
+  s.source_files = "netfox/Core/*.swift"
+  s.ios.source_files = "netfox/iOS/*.swift"
+  s.osx.source_files = "netfox/OSX/*.{swift,xib}"  
+end