xcode-archive-cache 0.0.10.pre.1 → 0.0.12

data/lib/config/config.rb

@@ -52,7 +52,7 @@ module XcodeArchiveCache
       def active_configuration
         configuration = configurations.select{|config| config.name == active_configuration_name }.first
         if configuration == nil
-          raise Informative, "Found no configuration with name \"#{active_configuration_name}\""
+          raise XcodeArchiveCache::Informative, "Found no configuration with name \"#{active_configuration_name}\""
         end
 
         configuration
@@ -172,7 +172,7 @@ module XcodeArchiveCache
         begin
           eval(contents, nil, path)
         rescue Exception => e
-          raise Informative, "Invalid #{File.basename(path)} file: #{e.message}"
+          raise XcodeArchiveCache::Informative, "Invalid #{File.basename(path)} file: #{e.message}"
         end
       end
 

data/lib/extensions/build_configuration.rb

@@ -0,0 +1,26 @@
+module XCConfigExtensions
+  # @return [Bool]
+  #
+  def has_xcconfig?
+    base_configuration_reference != nil
+  end
+
+  # @return [String]
+  #
+  def get_xcconfig_path
+    base_configuration_reference.real_path
+  end
+end
+
+module ProjectDir
+  # @return [String]
+  #
+  def get_project_dir
+    File.dirname(project.path)
+  end
+end
+
+class Xcodeproj::Project::Object::XCBuildConfiguration
+  include XCConfigExtensions
+  include ProjectDir
+end

data/lib/extensions/target.rb

@@ -0,0 +1,58 @@
+module TargetEqualityCheck
+  # @return [String]
+  #
+  def equatable_identifier
+    uuid + display_name
+  end
+end
+
+module BuildConfigurationSearch
+  # @param [String] configuration_name
+  #
+  # @return [Xcodeproj::Project::Object::XCBuildConfiguration]
+  #
+  def find_build_configuration(configuration_name, raise_if_not_found: true)
+    build_configuration = build_configurations
+                            .select { |configuration| configuration.name == configuration_name }
+                            .first
+    if raise_if_not_found && build_configuration == nil
+      raise XcodeArchiveCache::Informative, "#{configuration_name} build configuration not found on target #{display_name} #{project.path}"
+    end
+
+    build_configuration
+  end
+end
+
+module SchellScriptBuildPhaseSearch
+  # @param [XcodeArchiveCache::BuildSettings::StringInterpolator] build_settings_interpolator
+  # @param [XcodeArchiveCache::BuildSettings::Container] build_settings
+  # @param [String] script_name
+  #
+  # @return [String]
+  #
+  def find_script(build_settings_interpolator, build_settings, script_name)
+    shell_script_build_phases.each do |phase|
+      if phase.display_name == script_name
+        return build_settings_interpolator.interpolate(phase.shell_script, build_settings)
+                    .gsub(/^"|"$/, "")
+                    .strip
+      end
+    end
+
+    nil
+  end
+end
+
+class Xcodeproj::Project::Object::PBXAggregateTarget
+  include XcodeArchiveCache::Logs
+  include TargetEqualityCheck
+  include BuildConfigurationSearch
+  include SchellScriptBuildPhaseSearch
+end
+
+class Xcodeproj::Project::Object::PBXNativeTarget
+  include XcodeArchiveCache::Logs
+  include TargetEqualityCheck
+  include BuildConfigurationSearch
+  include SchellScriptBuildPhaseSearch
+end

data/lib/injection/build_flags_changer.rb

@@ -7,9 +7,9 @@ module XcodeArchiveCache
       # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
       # @param [String] path
       #
-      def add_framework_search_path(build_configuration, path)
+      def replace_or_add_framework_search_path(build_configuration, target_name, path)
         debug("using framework search path #{path}")
-        add_flag_to_configuration(build_configuration, FRAMEWORK_SEARCH_PATHS_KEY, path_to_search_path(path))
+        replace_or_add_flag(build_configuration, [FRAMEWORK_SEARCH_PATHS_KEY], nil, [target_name], path_to_search_path(path), true)
       end
 
       # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
@@ -26,6 +26,37 @@ module XcodeArchiveCache
       # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
       # @param [XcodeArchiveCache::BuildGraph::Node] node
       #
+      def add_static_lib_linker_flag(build_configuration, node)
+        flag = get_linker_flag(node)
+        if flag
+          debug("using ld flag #{flag}")
+          add_linker_flag(build_configuration, flag)
+        end
+      end
+
+      # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      #
+      def add_static_lib_libtool_flag(build_configuration, node)
+        flag = get_linker_flag(node)
+        if flag
+          debug("using libtool flag #{flag}")
+          add_libtool_flag(build_configuration, flag)
+        end
+      end
+      
+      # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
+      # @param [String] path
+      #
+      def add_swift_include_path(build_configuration, path)
+        debug("adding #{path} to SWIFT_INCLUDE_PATHS")
+        add_flag_to_configuration(build_configuration, SWIFT_INCLUDE_PATHS_KEY, path_to_search_path(path))
+      end
+
+      # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
+      # @param [String] artifact_location
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      #
       def add_framework_headers_iquote(build_configuration, artifact_location, node)
         headers_search_path = get_framework_headers_iquote(artifact_location, node)
         debug("using -iquote path #{headers_search_path}")
@@ -35,9 +66,9 @@ module XcodeArchiveCache
       # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
       # @param [String] path
       #
-      def add_library_search_path(build_configuration, path)
+      def replace_or_add_library_search_path(build_configuration, target_name, path)
         debug("using library search path #{path}")
-        add_flag_to_configuration(build_configuration, LIBRARY_SEARCH_PATHS_KEY, path_to_search_path(path))
+        replace_or_add_flag(build_configuration, [LIBRARY_SEARCH_PATHS_KEY], nil, [target_name], path_to_search_path(path), true)
       end
 
       # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
@@ -65,24 +96,14 @@ module XcodeArchiveCache
       end
 
       # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
+      # @param [Array<String>] old_modulemap_names
       # @param [String] path
       #
       def fix_module_map_path(build_configuration, old_modulemap_names, path)
-        replace_module_map_flag(build_configuration.build_settings, OTHER_CFLAGS_KEY, old_modulemap_names, path)
-        replace_module_map_flag(build_configuration.build_settings, OTHER_CPLUSPLUSFLAGS_KEY, old_modulemap_names, path)
-        replace_module_map_flag(build_configuration.build_settings, OTHER_SWIFT_FLAGS_KEY, old_modulemap_names, path)
+        debug("using #{path}")
 
-        if build_configuration.base_configuration_reference
-          xcconfig_path = build_configuration.base_configuration_reference.real_path
-          return unless File.exist?(xcconfig_path)
-          xcconfig = Xcodeproj::Config.new(xcconfig_path)
-
-          replace_module_map_flag(xcconfig.attributes, OTHER_CFLAGS_KEY, old_modulemap_names, path)
-          replace_module_map_flag(xcconfig.attributes, OTHER_CPLUSPLUSFLAGS_KEY, old_modulemap_names, path)
-          replace_module_map_flag(xcconfig.attributes, OTHER_SWIFT_FLAGS_KEY, old_modulemap_names, path)
-
-          xcconfig.save_as(Pathname.new(xcconfig_path))
-        end
+        settings_with_modulemaps = [OTHER_CFLAGS_KEY, OTHER_CPLUSPLUSFLAGS_KEY, OTHER_SWIFT_FLAGS_KEY]
+        replace_or_add_flag(build_configuration, settings_with_modulemaps, MODULE_MAP_FLAG, old_modulemap_names, path_to_search_path(path), false)
       end
 
       private
@@ -93,9 +114,13 @@ module XcodeArchiveCache
       OTHER_CFLAGS_KEY = "OTHER_CFLAGS"
       OTHER_CPLUSPLUSFLAGS_KEY = "OTHER_CPLUSPLUSFLAGS"
       OTHER_LDFLAGS_KEY = "OTHER_LDFLAGS"
+      OTHER_LIBTOOLFLAGS_KEY = "OTHER_LIBTOOLFLAGS"
       OTHER_SWIFT_FLAGS_KEY = "OTHER_SWIFT_FLAGS"
+      SWIFT_INCLUDE_PATHS_KEY = "SWIFT_INCLUDE_PATHS"
       INHERITED_SETTINGS_VALUE = "$(inherited)"
 
+      MODULE_MAP_FLAG = "-fmodule-map-file="
+
       # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
       # @param [String] flag
       #
@@ -103,6 +128,13 @@ module XcodeArchiveCache
         add_flag_to_configuration(build_configuration, OTHER_LDFLAGS_KEY, flag)
       end
 
+      # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
+      # @param [String] flag
+      #
+      def add_libtool_flag(build_configuration, flag)
+        add_flag_to_configuration(build_configuration, OTHER_LIBTOOLFLAGS_KEY, flag)
+      end
+
       # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
       # @param [String] flag
       #
@@ -191,50 +223,121 @@ module XcodeArchiveCache
         "-framework \"#{framework_name}\""
       end
 
-      # @param [Hash] build_settings
-      # @param [String] flags_key
-      # @param [Array<String>] old_modulemap_names
-      # @param [String] path
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
       #
-      def replace_module_map_flag(build_settings, flags_key, old_modulemap_names, path)
-        flags = build_settings[flags_key]
-        if flags
-          build_settings[flags_key] = replace_module_map_path(flags, old_modulemap_names, path)
-        end
-      end
+      # @return [String]
+      #
+      #         libSomething.a -> -lSomething
+      #
+      def get_linker_flag(node)
+        return unless node.product_file_name
 
-      MODULE_MAP_FLAG = "-fmodule-map-file="
+        node.product_file_name.gsub(/^lib/, "-l").gsub(/\.a$/, "")
+      end
 
-      # @param [String] flags
-      # @param [Array<String>] old_modulemap_names
-      # @param [String] path
+      # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
+      # @param [Array<String>] setting_keys
+      # @param [String] flag_name
+      # @param [Array<String>] possible_old_values
+      # @param [String] new_value
       #
-      # @return [String]
+      def replace_or_add_flag(build_configuration, setting_keys, flag_name, possible_old_values, new_value, add_if_missing)
+        replaced = false
+
+        setting_keys.each do |setting|
+          replaced = replace_flag_value(build_configuration.build_settings, setting, flag_name, possible_old_values, new_value) || replaced
+        end
+
+        if build_configuration.has_xcconfig?
+          replaced = replace_flag_value_in_xcconfig_recursively(
+            build_configuration.get_xcconfig_path,
+            build_configuration.get_project_dir,
+            setting_keys,
+            flag_name,
+            possible_old_values,
+            new_value) || replaced
+        end
+
+        if !replaced && add_if_missing
+          full_value = get_full_flag_value(flag_name, new_value)
+
+          setting_keys.each do |setting|
+            add_flag_to_configuration(build_configuration, setting, full_value)
+          end
+        end
+      end
+
+      # @param [String] xcconfig_path
+      # @param [String] project_dir
+      # @param [Array<String>] setting_keys
+      # @param [String] flag_name
+      # @param [Array<String>] possible_old_values
+      # @param [String] new_value
       #
-      def replace_module_map_path(flags, old_modulemap_names, path)
-        return if flags == nil
+      def replace_flag_value_in_xcconfig_recursively(xcconfig_path, project_dir, setting_keys, flag_name, possible_old_values, new_value)
+        debug("changing #{possible_old_values} to #{new_value} in #{File.basename(xcconfig_path)}")
+        return unless File.exist?(xcconfig_path)
+
+        replaced = false
+        xcconfig = Xcodeproj::Config.new(xcconfig_path)
+
+        setting_keys.each do |key|
+          replaced = replace_flag_value(xcconfig.attributes, key, flag_name, possible_old_values, new_value) || replaced
+        end
+
+        xcconfig.save_as(Pathname.new(xcconfig_path))
+
+        xcconfig.includes.each do |included_xcconfig|
+          included_xcconfig_path = File.join(project_dir, included_xcconfig)
+          replaced = replace_flag_value_in_xcconfig_recursively(included_xcconfig_path, project_dir, setting_keys, flag_name, possible_old_values, new_value) || replaced
+        end
+
+        replaced
+      end
 
-        is_flags_string = flags.is_a?(String)
-        flags = flags.split(" ") if is_flags_string
-        updated_flags = flags
-                            .map { |flags_line| flags_line.split(" ") }
+      # @param [Hash] attributes
+      # @param [String] setting_key
+      # @param [String] flag_name
+      # @param [Array<String>] possible_old_values
+      # @param [String] new_value
+      #
+      def replace_flag_value(attributes, setting_key, flag_name, possible_old_values, new_value)
+        build_settings = attributes[setting_key]
+        return unless build_settings
+
+        replaced = false
+        is_string = build_settings.is_a?(String)
+        build_settings = build_settings.split(" ") if is_string
+        full_value = get_full_flag_value(flag_name, new_value)
+        old_value_regexps = possible_old_values.map { |value| Regexp.new("/#{value}\"*$") }
+
+        updated_settings = build_settings
+                            .map { |line| line.split(" ") }
                             .flatten
                             .map do |line|
+          if flag_name
+            next line unless line.include?(flag_name)
+          end
+
           updated_line = line
 
-          if line.include?(MODULE_MAP_FLAG)
-            old_modulemap_names.each do |name|
-              if line.include?(name)
-                updated_line = "#{MODULE_MAP_FLAG}\"#{path}\""
-                break
-              end
+          old_value_regexps.each do |regexp|
+            if regexp.match?(line)
+              replaced = true
+              updated_line = full_value
+              break
             end
           end
 
           updated_line
         end
 
-        is_flags_string ? updated_flags.join(" ") : updated_flags
+        attributes[setting_key] = is_string ? updated_settings.join(" ") : updated_settings
+        replaced
+      end
+
+      def get_full_flag_value(flag_name, value)
+        "#{flag_name}#{value}"
       end
     end
   end

data/lib/injection/dependency_remover.rb

@@ -12,11 +12,21 @@ module XcodeArchiveCache
         debug("removing #{prebuilt_target.name} from #{dependent_target.display_name}")
 
         remove_from_dependencies(prebuilt_target, dependent_target)
+        remove_from_linking(prebuilt_node, dependent_target)
         remove_from_schemes(prebuilt_target, dependent_target)
 
         debug("finished removing #{prebuilt_target.name} from #{dependent_target.display_name}")
       end
 
+      # @param [XcodeArchiveCache::BuildGraph::Node] prebuilt_node
+      # @param [Xcodeproj::Project::Object::PBXNativeTarget] dependent_target
+      #
+      # @return [Boolean]
+      #
+      def is_linked(prebuilt_node, dependent_target)
+        !find_linked(prebuilt_node, dependent_target).empty?
+      end
+
       private
 
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] prebuilt_target
@@ -46,7 +56,7 @@ module XcodeArchiveCache
       #
       def remove_from_linking(prebuilt_node, dependent_target)
         debug("product name is #{prebuilt_node.product_file_name}")
-        frameworks = dependent_target.frameworks_build_phase.files.select {|file| file.display_name == prebuilt_node.product_file_name}
+        frameworks = find_linked(prebuilt_node, dependent_target)
         debug("found #{frameworks.length} linked products")
 
         frameworks.each do |framework|
@@ -67,6 +77,17 @@ module XcodeArchiveCache
         end
       end
 
+      # @param [Xcodeproj::Project::Object::PBXNativeTarget] dependent_target
+      # @param [XcodeArchiveCache::BuildGraph::Node] prebuilt_node
+      #
+      # @return [Array<PBXBuildFile>]
+      #
+      def find_linked(prebuilt_node, dependent_target)
+        return [] unless dependent_target.frameworks_build_phase
+
+        dependent_target.frameworks_build_phase.files.select {|file| file.display_name == prebuilt_node.product_file_name}
+      end
+
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
       #
       # @return [Array<Xcodeproj::XCScheme>]

data/lib/injection/headers_mover.rb

@@ -9,6 +9,7 @@ module XcodeArchiveCache
       def initialize(storage)
         @storage = storage
         @build_settings_interpolator = XcodeArchiveCache::BuildSettings::StringInterpolator.new
+        @modulemap_header_path_extractor = XcodeArchiveCache::Modulemap::HeaderPathExtractor.new
       end
 
       # @param [XcodeArchiveCache::BuildGraph::Node] node
@@ -33,16 +34,22 @@ module XcodeArchiveCache
           headers_file_paths = node.native_target
                                    .headers_build_phase
                                    .files
+                                   .select { |file| file.settings && file.settings["ATTRIBUTES"].include?("Public") }
                                    .map { |header| get_real_path(header) }
                                    .uniq
           storage.store_default_headers(node, headers_file_paths)
 
           header_count += headers_file_paths.length
+        end
 
-          storage.store_modulemap(node)
+        modulemap_file_path = node.original_modulemap_file_path
+        if modulemap_file_path && File.exist?(modulemap_file_path)
+          header_file_paths = modulemap_header_path_extractor.extract_all_paths(modulemap_file_path)
+          storage.store_modulemap_headers(node, header_file_paths)
+          header_count += header_file_paths.length
         end
 
-        debug("found #{header_count} headers")
+        debug("found #{header_count} header(s)")
       end
 
       private
@@ -55,6 +62,10 @@ module XcodeArchiveCache
       #
       attr_reader :build_settings_interpolator
 
+      # @return [XcodeArchiveCache::Modulemap::HeaderPathExtractor]
+      #
+      attr_reader :modulemap_header_path_extractor
+
       # @param [Xcodeproj::Project::Object::PBXBuildFile] build_file
       #
       # @return [String]

data/lib/injection/injector.rb

@@ -13,15 +13,15 @@ module XcodeArchiveCache
         @headers_mover = HeadersMover.new(storage)
         @dependency_remover = DependencyRemover.new
         @build_flags_changer = BuildFlagsChanger.new
-        @pods_fixer = PodsScriptFixer.new
-        @modulemap_fixer = ModulemapFixer.new(storage)
+        @pods_fixer = PodsScriptFixer.new(storage)
+        @modulemap_fixer = XcodeArchiveCache::Modulemap::HeaderPathFixer.new(storage)
         @framework_embedder = FrameworkEmbedder.new
       end
 
       # @param [XcodeArchiveCache::BuildGraph::Graph] graph
       #
       def perform_internal_injection(graph)
-        inject_unpacked(graph.nodes)
+        inject_unpacked_and_rebuilt(graph.nodes)
         add_header_paths(graph.nodes)
         save_graph_projects(graph)
       end
@@ -43,7 +43,7 @@ module XcodeArchiveCache
             modulemap_fixer.fix_modulemap(node)
           end
 
-          add_as_prebuilt_dependency(node, target, node.is_root)
+          add_as_prebuilt_dependency(node, target)
           remove_native_target_from_project(node)
         end
 
@@ -55,8 +55,8 @@ module XcodeArchiveCache
         # are covered by "Embed Pods Frameworks" script
         #
         if graph.node_by_name(get_pods_target_name(target))
-          pods_fixer.fix_embed_frameworks_script(target, graph, storage.container_dir_path)
-          pods_fixer.fix_copy_resources_script(target, graph, storage.container_dir_path)
+          pods_fixer.fix_embed_frameworks_script(target, graph)
+          pods_fixer.fix_copy_resources_script(target, graph)
         else
           framework_nodes = graph.nodes.select { |node| node.has_framework_product? }
           framework_file_paths = framework_nodes.map { |node| File.join(storage.get_storage_path(node), node.product_file_name) }
@@ -103,13 +103,18 @@ module XcodeArchiveCache
 
       # @param [Array<XcodeArchiveCache::BuildGraph::Node>] nodes
       #
-      def inject_unpacked(nodes)
+      def inject_unpacked_and_rebuilt(nodes)
         cached_nodes = nodes.select { |node| node.state == :unpacked }
         cached_nodes.each do |node|
           headers_mover.prepare_headers_for_injection(node)
           modulemap_fixer.fix_modulemap(node)
           add_as_prebuilt_to_dependents(node)
         end
+
+        built_nodes = nodes.select { |node| node.state == :rebuilt_and_cached }
+        built_nodes.each do |node|
+          add_as_prebuilt_to_dependents(node)
+        end
       end
 
       # @param [Array<XcodeArchiveCache::BuildGraph::Node>] nodes
@@ -131,7 +136,7 @@ module XcodeArchiveCache
 
         debug("adding #{paths} to #{target.display_name}")
 
-        build_configuration = find_build_configuration(target)
+        build_configuration = target.find_build_configuration(configuration_name)
         paths.each do |path|
           build_flags_changer.add_headers_search_path(build_configuration, path)
           build_flags_changer.add_iquote_path(build_configuration, path)
@@ -146,8 +151,7 @@ module XcodeArchiveCache
                                    .all_dependent_nodes
                                    .select(&:waiting_for_rebuild)
         dependent_to_rebuild.each do |dependent_node|
-          should_link = prebuilt_node.dependent.include?(dependent_node)
-          add_as_prebuilt_dependency(prebuilt_node, dependent_node.native_target, should_link)
+          add_as_prebuilt_dependency(prebuilt_node, dependent_node.native_target)
         end
 
         remove_native_target_from_project(prebuilt_node)
@@ -164,19 +168,24 @@ module XcodeArchiveCache
       # @param [XcodeArchiveCache::BuildGraph::Node] prebuilt_node
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] dependent_target
       #
-      def add_as_prebuilt_dependency(prebuilt_node, dependent_target, should_link)
+      def add_as_prebuilt_dependency(prebuilt_node, dependent_target)
+        target_identifier = get_target_identifier(dependent_target)
+        return if prebuilt_node.targets_injected_to.include?(target_identifier)
+
         debug("adding #{prebuilt_node.name} as prebuilt to #{dependent_target.display_name}")
 
         unless prebuilt_node.has_acceptable_product?
-          raise Informative, "#{prebuilt_node.name} has unsupported product type: #{prebuilt_node.native_target.product_type}"
+          raise XcodeArchiveCache::Informative, "#{prebuilt_node.name} has unsupported product type: #{prebuilt_node.native_target.product_type}"
         end
 
         if prebuilt_node.has_framework_product?
           add_as_prebuilt_framework(prebuilt_node, dependent_target)
         elsif prebuilt_node.has_static_library_product?
-          add_as_prebuilt_static_lib(prebuilt_node, dependent_target, should_link)
+          add_as_prebuilt_static_lib(prebuilt_node, dependent_target)
         end
 
+        prebuilt_node.targets_injected_to.push(target_identifier)
+
         debug("done with #{prebuilt_node.name} for #{dependent_target.display_name}")
       end
 
@@ -184,45 +193,47 @@ module XcodeArchiveCache
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] dependent_target
       #
       def add_as_prebuilt_framework(prebuilt_node, dependent_target)
-        build_configuration = find_build_configuration(dependent_target)
+        build_configuration = dependent_target.find_build_configuration(configuration_name)
 
         artifact_location = storage.get_storage_path(prebuilt_node)
-        build_flags_changer.add_framework_search_path(build_configuration, artifact_location)
+        build_flags_changer.replace_or_add_framework_search_path(build_configuration, prebuilt_node.native_target.name, artifact_location)
         build_flags_changer.add_framework_headers_iquote(build_configuration, artifact_location, prebuilt_node)
 
+        if dependency_remover.is_linked(prebuilt_node, dependent_target)
+          build_flags_changer.add_framework_linker_flag(build_configuration, prebuilt_node)
+        end
+
         dependency_remover.remove_dependency(prebuilt_node, dependent_target)
       end
 
       # @param [XcodeArchiveCache::BuildGraph::Node] prebuilt_node
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] dependent_target
-      # @param [Boolean] should_link
       #
-      def add_as_prebuilt_static_lib(prebuilt_node, dependent_target, should_link)
-        build_configuration = find_build_configuration(dependent_target)
+      def add_as_prebuilt_static_lib(prebuilt_node, dependent_target)
+        build_configuration = dependent_target.find_build_configuration(configuration_name)
 
         injected_modulemap_file_path = storage.get_modulemap_path(prebuilt_node)
         if injected_modulemap_file_path
-          modulemap_file_names = ["#{prebuilt_node.module_name}.modulemap", File.basename(prebuilt_node.modulemap_file_path)]
+          modulemap_file_names = [prebuilt_node.resulting_modulemap_file_name]
           build_flags_changer.fix_module_map_path(build_configuration, modulemap_file_names, injected_modulemap_file_path)
-        end
-
-        # if should_link
-          artifact_location = storage.get_storage_path(prebuilt_node)
-          build_flags_changer.add_library_search_path(build_configuration, artifact_location)
-        # end
 
-        dependency_remover.remove_dependency(prebuilt_node, dependent_target)
-      end
+          original_modulemap_path = prebuilt_node.original_modulemap_file_path
+          add_header_paths_to_target(dependent_target, [File.dirname(original_modulemap_path)])
+        end
 
-      # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
-      #
-      def find_build_configuration(target)
-        build_configuration = target.build_configurations.select { |configuration| configuration.name == configuration_name }.first
-        unless build_configuration
-          raise Informative, "#{configuration_name} build configuration not found on target #{node.name}"
+        artifact_location = storage.get_storage_path(prebuilt_node)
+        build_flags_changer.replace_or_add_library_search_path(build_configuration, prebuilt_node.native_target.name, artifact_location)
+        build_flags_changer.add_swift_include_path(build_configuration, artifact_location)
+
+        if dependency_remover.is_linked(prebuilt_node, dependent_target)
+          if dependent_target.product_type == Xcodeproj::Constants::PRODUCT_TYPE_UTI[:static_library]
+            build_flags_changer.add_static_lib_libtool_flag(build_configuration, prebuilt_node)
+          else
+            build_flags_changer.add_static_lib_linker_flag(build_configuration, prebuilt_node)
+          end
         end
 
-        build_configuration
+        dependency_remover.remove_dependency(prebuilt_node, dependent_target)
       end
 
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
@@ -242,6 +253,14 @@ module XcodeArchiveCache
         debug("deleting #{node.name} target")
         node.native_target.project.targets.delete(node.native_target)
       end
+
+      # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
+      #
+      # @return [String]
+      #
+      def get_target_identifier(target)
+        target.uuid + target.project.path.realpath.to_s
+      end
     end
   end
 end