Commit 283d3554 authored by Jose Blaya's avatar Jose Blaya
Browse files

Merge branch 'release/1.1.8' into release/2.0.0

# Conflicts:
#	Podfile
parents 93ea26a7 cfd3671b
...@@ -6,11 +6,8 @@ abstract_target 'PIALibrary' do ...@@ -6,11 +6,8 @@ abstract_target 'PIALibrary' do
pod 'Gloss', '~> 2' pod 'Gloss', '~> 2'
pod 'Alamofire', '~> 4' pod 'Alamofire', '~> 4'
pod 'ReachabilitySwift' pod 'ReachabilitySwift'
pod 'SwiftEntryKit', '0.7.2' # pod 'PIATunnel', :path => '/Users/ueshiba/Desktop/PIA/tunnel-apple'
pod 'lottie-ios' pod 'PIATunnel', '~> 1.1.7'
pod 'PopupDialog'
# pod 'PIATunnel', :path => ''
pod 'PIATunnel', '~> 1.1.8'
target 'PIALibrary-iOS' do target 'PIALibrary-iOS' do
platform :ios, '9.0' platform :ios, '9.0'
...@@ -29,13 +26,3 @@ abstract_target 'PIALibrary' do ...@@ -29,13 +26,3 @@ abstract_target 'PIALibrary' do
# platform :osx, '10.11' # platform :osx, '10.11'
#end #end
end end
post_install do |installer|
installer.pods_project.targets.each do |target|
if ['PopupDialog'].include? target.name
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = '4.2'
end
end
end
end
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment