Commit 95bfe7b1 authored by Marius Rackwitz's avatar Marius Rackwitz

[Installer] Fix sharing schemes with deduplication

parent 46a17cce
...@@ -628,12 +628,8 @@ module Pod ...@@ -628,12 +628,8 @@ module Pod
# @return [void] # @return [void]
# #
def share_development_pod_schemes def share_development_pod_schemes
development_pod_targets = sandbox.development_pods.keys.map do |pod| development_pod_targets.select(&:should_build?).each do |pod_target|
pods_project.targets.select { |target| target.name =~ /^Pods-.*-#{pod}$/ } Xcodeproj::XCScheme.share_scheme(pods_project.path, pod_target.label)
end.flatten
development_pod_targets.each do |pod_target|
Xcodeproj::XCScheme.share_scheme(pods_project.path, pod_target.name)
end end
end end
...@@ -740,6 +736,19 @@ module Pod ...@@ -740,6 +736,19 @@ module Pod
#-------------------------------------------------------------------------# #-------------------------------------------------------------------------#
public
# @return [Array<Library>] The targets of the development pods generated by
# the installation process.
#
def development_pod_targets
pod_targets.select do |pod_target|
sandbox.development_pods.keys.include?(pod_target.pod_name)
end
end
#-------------------------------------------------------------------------#
private private
# @!group Private helpers # @!group Private helpers
......
...@@ -619,15 +619,14 @@ module Pod ...@@ -619,15 +619,14 @@ module Pod
it 'shares schemes of development pods' do it 'shares schemes of development pods' do
spec = fixture_spec('banana-lib/BananaLib.podspec') spec = fixture_spec('banana-lib/BananaLib.podspec')
target_definition = Podfile::TargetDefinition.new(:default, @installer.podfile) pod_target = fixture_pod_target(spec)
pod_target = PodTarget.new([spec], [target_definition], config.sandbox)
@installer.pods_project.stubs(:targets).returns([pod_target]) @installer.stubs(:pod_targets).returns([pod_target])
@installer.sandbox.stubs(:development_pods).returns('BananaLib' => nil) @installer.sandbox.stubs(:development_pods).returns('BananaLib' => nil)
Xcodeproj::XCScheme.expects(:share_scheme).with( Xcodeproj::XCScheme.expects(:share_scheme).with(
@installer.pods_project.path, @installer.pods_project.path,
'Pods-default-BananaLib') 'BananaLib')
@installer.send(:share_development_pod_schemes) @installer.send(:share_development_pod_schemes)
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