Commit 806463e2 authored by Jeremy Slater's avatar Jeremy Slater

Add xcconfig back to PodTarget for UserProjectIntegrator

parent 01fc9441
...@@ -19,6 +19,10 @@ module Pod ...@@ -19,6 +19,10 @@ module Pod
@sandbox = library.sandbox @sandbox = library.sandbox
end end
# @return [Xcodeproj::Config] The generated xcconfig.
#
attr_reader :xcconfig
# Generates and saves the xcconfig to the given path. # Generates and saves the xcconfig to the given path.
# #
# @param [Pathname] path # @param [Pathname] path
...@@ -142,9 +146,9 @@ module Pod ...@@ -142,9 +146,9 @@ module Pod
end end
end end
xcconfig = Xcodeproj::Config.new(config) @xcconfig = Xcodeproj::Config.new(config)
xcconfig.includes = library.libraries.map(&:name) @xcconfig.includes = library.libraries.map(&:name)
xcconfig @xcconfig
end end
end end
...@@ -177,7 +181,8 @@ module Pod ...@@ -177,7 +181,8 @@ module Pod
# @return [Xcodeproj::Config] # @return [Xcodeproj::Config]
# #
def generate def generate
consumer_xcconfig(library.consumer) @xcconfig = consumer_xcconfig(library.consumer)
@xcconfig
end end
end end
...@@ -214,9 +219,9 @@ module Pod ...@@ -214,9 +219,9 @@ module Pod
config[k] = "#{config[k]} ${#{prefixed_key}}" config[k] = "#{config[k]} ${#{prefixed_key}}"
end end
xcconfig = Xcodeproj::Config.new(config) @xcconfig = Xcodeproj::Config.new(config)
xcconfig.includes = [library.name] @xcconfig.includes = [library.name]
xcconfig @xcconfig
end end
end end
......
...@@ -174,6 +174,7 @@ module Pod ...@@ -174,6 +174,7 @@ module Pod
UI.message "- Generating xcconfig file at #{UI.path(path)}" do UI.message "- Generating xcconfig file at #{UI.path(path)}" do
gen = Generator::PodXCConfig.new(library) gen = Generator::PodXCConfig.new(library)
gen.save_as(path) gen.save_as(path)
library.xcconfig = gen.xcconfig
xcconfig_file_ref = add_file_to_support_group(path) xcconfig_file_ref = add_file_to_support_group(path)
target.build_configurations.each do |c| target.build_configurations.each do |c|
......
...@@ -150,6 +150,14 @@ module Pod ...@@ -150,6 +150,14 @@ module Pod
# #
attr_accessor :user_target_uuids attr_accessor :user_target_uuids
# @return [Xcodeproj::Config] the configuration file of the library
#
# @note The configuration is generated by the {TargetInstaller} and
# used by {UserProjectIntegrator} to check for any overridden
# values.
#
attr_accessor :xcconfig
# @return [Array<SpecTarget>] the dependencies for this target (or library). # @return [Array<SpecTarget>] the dependencies for this target (or library).
# #
attr_accessor :libraries attr_accessor :libraries
......
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