Commit bf9402c2 authored by Fabio Pelosin's avatar Fabio Pelosin

Adapt for Spec::Consumer changes

parent 2a54cbe3
...@@ -17,6 +17,7 @@ module Pod ...@@ -17,6 +17,7 @@ module Pod
end end
require 'cocoapods-core' require 'cocoapods-core'
require 'xcodeproj'
require 'cocoapods/downloader' require 'cocoapods/downloader'
require 'cocoapods/file_list' require 'cocoapods/file_list'
require 'cocoapods/config' require 'cocoapods/config'
......
...@@ -355,7 +355,7 @@ module Pod ...@@ -355,7 +355,7 @@ module Pod
flags = consumer.compiler_flags.dup flags = consumer.compiler_flags.dup
if consumer.requires_arc if consumer.requires_arc
flags << '-fobjc-arc' flags << '-fobjc-arc'
platform_name = consumer.platform.symbolic_name unless consumer.platform.is_a?(Symbol) #TODO platform_name = consumer.platform_name
spec_deployment_target = consumer.spec.deployment_target(platform_name) spec_deployment_target = consumer.spec.deployment_target(platform_name)
if spec_deployment_target.nil? || Version.new(spec_deployment_target) < ENABLE_OBJECT_USE_OBJC_FROM[platform_name] if spec_deployment_target.nil? || Version.new(spec_deployment_target) < ENABLE_OBJECT_USE_OBJC_FROM[platform_name]
flags << '-DOS_OBJECT_USE_OBJC=0' flags << '-DOS_OBJECT_USE_OBJC=0'
......
...@@ -232,7 +232,7 @@ module Pod ...@@ -232,7 +232,7 @@ module Pod
# for all available platforms with xcodebuild. # for all available platforms with xcodebuild.
# #
def install_pod def install_pod
podfile = podfile_from_spec(consumer.platform, spec.deployment_target(consumer.platform)) podfile = podfile_from_spec(consumer.platform_name, spec.deployment_target(consumer.platform_name))
sandbox = Sandbox.new(config.sandbox_root) sandbox = Sandbox.new(config.sandbox_root)
installer = Installer.new(sandbox, podfile) installer = Installer.new(sandbox, podfile)
installer.install! installer.install!
...@@ -312,7 +312,7 @@ module Pod ...@@ -312,7 +312,7 @@ module Pod
result = Specification::Linter::Result.new(type, message) result = Specification::Linter::Result.new(type, message)
results << result results << result
end end
result.platforms << consumer.platform if consumer result.platforms << consumer.platform_name if consumer
end end
#-------------------------------------------------------------------------# #-------------------------------------------------------------------------#
......
Markdown is supported
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