Commit 8326ec07 authored by Samuel Giddins's avatar Samuel Giddins

[BuildSettings] Rename subclasses to include the word "Settings"

parent 47be0099
......@@ -426,7 +426,7 @@ module Pod
def create_test_xcconfig_files(test_native_targets, test_resource_bundle_targets)
target.supported_test_types.each do |test_type|
path = target.xcconfig_path(test_type.to_s)
update_changed_file(Target::BuildSettings::Pod.new(target, true), path)
update_changed_file(Target::BuildSettings::PodTargetSettings.new(target, true), path)
xcconfig_file_ref = add_file_to_support_group(path)
test_native_targets.each do |test_target|
......
......@@ -320,7 +320,7 @@ module Pod
settings = {}
user_build_configurations.each_key do |configuration_name|
settings[configuration_name] = BuildSettings::Aggregate.new(self, configuration_name)
settings[configuration_name] = BuildSettings::AggregateTargetSettings.new(self, configuration_name)
end
settings
......
......@@ -412,7 +412,7 @@ module Pod
end
# A subclass that generates build settings for a {PodTarget}
class Pod < BuildSettings
class PodTargetSettings < BuildSettings
#-------------------------------------------------------------------------#
# @!group Public API
......@@ -785,7 +785,7 @@ module Pod
end
# A subclass that generates build settings for a `PodTarget`
class Aggregate < BuildSettings
class AggregateTargetSettings < BuildSettings
#-------------------------------------------------------------------------#
# @!group Public API
......
......@@ -612,7 +612,7 @@ module Pod
end
def create_build_settings
BuildSettings::Pod.new(self, false)
BuildSettings::PodTargetSettings.new(self, false)
end
end
end
......@@ -3,7 +3,7 @@ require File.expand_path('../../../../spec_helper', __FILE__)
module Pod
class Target
class BuildSettings
describe Aggregate do
describe AggregateTargetSettings do
def specs
[fixture_spec('banana-lib/BananaLib.podspec')]
end
......@@ -22,7 +22,7 @@ module Pod
unless @specs.empty?
@target.target_definition.whitelist_pod_for_configuration(@specs.first.name, 'Release')
end
@generator = Aggregate.new(@target, 'Release')
@generator = AggregateTargetSettings.new(@target, 'Release')
end
shared 'Aggregate' do
......@@ -175,7 +175,7 @@ module Pod
end
it 'does not links the pod targets with the aggregate target for non-whitelisted configuration' do
@generator = Aggregate.new(@target, 'Debug')
@generator = AggregateTargetSettings.new(@target, 'Debug')
@xcconfig = @generator.generate
@xcconfig.to_hash['OTHER_LDFLAGS'].should.not.include '-l"Pods-BananaLib"'
end
......@@ -215,9 +215,9 @@ module Pod
:product_basename => 'PodTarget',
:target_definitions => [target_definition],
)
pod_target.stubs(:build_settings => Pod.new(pod_target, false))
pod_target.stubs(:build_settings => PodTargetSettings.new(pod_target, false))
aggregate_target = fixture_aggregate_target([pod_target])
@generator = Aggregate.new(aggregate_target, 'Debug')
@generator = AggregateTargetSettings.new(aggregate_target, 'Debug')
@generator.other_ldflags.should == %w(-ObjC -l"StaticLibrary" -l"VendoredDyld" -l"xml2" -framework "PodTarget" -framework "StaticFramework" -framework "VendoredFramework" -framework "XCTest")
end
end
......@@ -526,7 +526,7 @@ module Pod
describe 'an empty pod target' do
before do
@blank_target = fixture_aggregate_target
@generator = Aggregate.new(@blank_target, 'Release')
@generator = AggregateTargetSettings.new(@blank_target, 'Release')
end
it 'it should not have any framework search paths' do
......
......@@ -4,11 +4,11 @@ module Pod
class Target
describe BuildSettings do
def pod(pod_target, test_xcconfig = false)
BuildSettings::Pod.new(pod_target, test_xcconfig)
BuildSettings::PodTargetSettings.new(pod_target, test_xcconfig)
end
def aggregate(aggregate_target, configuration_name = 'Release')
BuildSettings::Aggregate.new(aggregate_target, configuration_name)
BuildSettings::AggregateTargetSettings.new(aggregate_target, configuration_name)
end
describe 'memoization' do
......
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