xcode-archive-cache 0.0.8.pre.2 → 0.0.10

data/lib/build_settings/extractor.rb

@@ -13,7 +13,7 @@ module XcodeArchiveCache
       # @return [Hash{String => Container}]
       #         Target build settings keyed by target name
       #
-      def extract_per_target(build_settings)
+      def extract_per_target(build_settings, fix_simulator)
         per_target_settings = build_settings.split("Build settings for action")
         result = Hash.new
 
@@ -22,6 +22,7 @@ module XcodeArchiveCache
           target_name = get_target_name(parsed_settings)
           next unless target_name
 
+          replace_platform_with_simulator(parsed_settings) if fix_simulator
           filtered_settings = filter.filter(parsed_settings)
           result[target_name] = Container.new(parsed_settings, filtered_settings)
         end
@@ -65,6 +66,25 @@ module XcodeArchiveCache
         result
       end
 
+
+      # @param [Hash{String => String}] settings
+      #
+      def replace_platform_with_simulator(settings)
+        original_platform = settings[EFFECTIVE_PLATFORM_NAME_KEY]
+        simulator_platform = settings[CORRESPONDING_SIMULATOR_PLATFORM_NAME_KEY]
+        settings[EFFECTIVE_PLATFORM_NAME_KEY] = "-#{simulator_platform}"
+
+        configuration = settings[CONFIGURATION_KEY]
+        path_regexp = Regexp.new("#{configuration}#{original_platform}")
+        simulator_path = "#{configuration}-#{simulator_platform}"
+        settings.each do |key, value|
+          settings[key] = value.gsub(path_regexp, simulator_path)
+        end
+      end
+
+      EFFECTIVE_PLATFORM_NAME_KEY = "EFFECTIVE_PLATFORM_NAME".freeze
+      CORRESPONDING_SIMULATOR_PLATFORM_NAME_KEY = "CORRESPONDING_SIMULATOR_PLATFORM_NAME".freeze
+      CONFIGURATION_KEY = "CONFIGURATION".freeze
       TARGET_NAME_KEY = "TARGETNAME".freeze
 
       # @param [Hash{String => String}] parsed_settings

data/lib/build_settings/filter.rb

@@ -10,7 +10,7 @@ module XcodeArchiveCache
       # Machine-dependent settings i.e. paths, user names, group names are rejected
       #
       def filter(settings, settings_to_keep = SETTINGS_TO_KEEP)
-        filtered_settings = settings.select {|name, _| settings_to_keep.include?(name)}
+        filtered_settings = settings.select { |name, _| settings_to_keep.include?(name) }
         SETTINGS_TO_STRIP.each do |name|
           value = filtered_settings[name]
           next if value == nil
@@ -44,7 +44,9 @@ module XcodeArchiveCache
         # splitting will be broken, but probability of
         # someone using such path is quite low (or it isn't ?)
         #
-        value_components = value_without_quotes.split(/\s-/)
+        value_components = value_without_quotes
+                               .split(/^-|\s-/)
+                               .select { |component| component.length > 0 }
 
         index = 0
         indices_to_remove = []
@@ -66,7 +68,8 @@ module XcodeArchiveCache
           kept_components.push(component) unless indices_to_remove.include?(component_index)
         end
 
-        kept_components.join(" -")
+        result = kept_components.join(" -")
+        result.length > 0 ? "-#{result}" : ""
       end
 
       # TODO: extend
@@ -283,6 +286,7 @@ module XcodeArchiveCache
         output-file-map
         save-optimization-record-path
         working-directory
+        fmodule-map-file
         )
     end
   end

data/lib/build_settings/loader.rb

@@ -3,6 +3,11 @@ module XcodeArchiveCache
 
     FULL_PRODUCT_NAME_KEY = "FULL_PRODUCT_NAME".freeze
     DWARF_DSYM_FILE_NAME_KEY = "DWARF_DSYM_FILE_NAME".freeze
+    MODULEMAP_FILE_KEY = "MODULEMAP_FILE".freeze
+    SWIFT_OBJC_INTERFACE_HEADER_NAME_KEY = "SWIFT_OBJC_INTERFACE_HEADER_NAME".freeze
+    SWIFT_MODULE_NAME_KEY = "SWIFT_MODULE_NAME".freeze
+    PRODUCT_MODULE_NAME_KEY = "PRODUCT_MODULE_NAME".freeze
+    DERIVED_SOURCES_DIR_KEY = "DERIVED_SOURCES_DIR".freeze
 
     class Container
 
@@ -58,9 +63,11 @@ module XcodeArchiveCache
           end
         end
 
+        should_fix_settings = executor.set_up_for_simulator?
+
         threads.each do |thread|
           project_path, all_targets_settings = thread.value
-          per_target_settings = extractor.extract_per_target(all_targets_settings)
+          per_target_settings = extractor.extract_per_target(all_targets_settings, should_fix_settings)
           set_project_settings(project_path, per_target_settings)
         end
       end

data/lib/build_settings/parser.rb

@@ -45,7 +45,7 @@ module XcodeArchiveCache
 
       # @param [String] characters
       #
-      # @return [String]
+      # @return [Regexp]
       #
       def create_entry_regex(characters = SETTING_NAME_CHARACTERS)
         Regexp.new("\\$[({]#{characters}[)}]")

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
@@ -64,15 +95,32 @@ module XcodeArchiveCache
         add_cflag(build_configuration, path_to_capital_i(path))
       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)
+        debug("using #{path}")
+
+        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
 
       FRAMEWORK_SEARCH_PATHS_KEY = "FRAMEWORK_SEARCH_PATHS"
       LIBRARY_SEARCH_PATHS_KEY = "LIBRARY_SEARCH_PATHS"
       HEADER_SEARCH_PATHS_KEY = "HEADER_SEARCH_PATHS"
       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
       #
@@ -80,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
       #
@@ -167,6 +222,120 @@ module XcodeArchiveCache
 
         "-framework \"#{framework_name}\""
       end
+
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      #
+      # @return [String]
+      #
+      #         libSomething.a -> -lSomething
+      #
+      def get_linker_flag(node)
+        return unless node.product_file_name
+
+        node.product_file_name.gsub(/^lib/, "-l").gsub(/\.a$/, "")
+      end
+
+      # @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
+      #
+      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.base_configuration_reference
+          xcconfig_path = build_configuration.base_configuration_reference.real_path
+          project_dir = File.dirname(build_configuration.project.path)
+
+          replaced = replace_flag_value_in_xcconfig_recursively(xcconfig_path, 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_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
+
+      # @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
+
+          old_value_regexps.each do |regexp|
+            if regexp.match?(line)
+              replaced = true
+              updated_line = full_value
+              break
+            end
+          end
+
+          updated_line
+        end
+
+        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
 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
@@ -19,17 +20,36 @@ module XcodeArchiveCache
 
         node.native_target.copy_files_build_phases.each do |build_phase|
           file_paths = build_phase.files
-                           .map {|build_file| get_real_path(build_file)}
+                           .map { |build_file| get_real_path(build_file) }
                            .compact
                            .uniq
-                           .select {|path| File.extname(path) == ".h"}
+                           .select { |path| File.extname(path) == ".h" }
           destination_path = get_destination_dir_path(node, build_phase)
           storage.store_headers(node, destination_path, file_paths)
 
           header_count += file_paths.length
         end
 
-        debug("found #{header_count} headers")
+        if node.has_static_library_product?
+          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
+
+        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} header(s)")
       end
 
       private
@@ -42,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

@@ -14,13 +14,14 @@ module XcodeArchiveCache
         @dependency_remover = DependencyRemover.new
         @build_flags_changer = BuildFlagsChanger.new
         @pods_fixer = PodsScriptFixer.new
+        @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
@@ -34,9 +35,15 @@ module XcodeArchiveCache
           return
         end
 
+        no_rebuild_performed = root_node.state == :unpacked
+
         graph.nodes.each do |node|
-          headers_mover.prepare_headers_for_injection(node)
-          add_as_prebuilt_dependency(node, target, node.is_root)
+          if no_rebuild_performed || node.state == :rebuilt_and_cached
+            headers_mover.prepare_headers_for_injection(node)
+            modulemap_fixer.fix_modulemap(node)
+          end
+
+          add_as_prebuilt_dependency(node, target)
           remove_native_target_from_project(node)
         end
 
@@ -51,8 +58,8 @@ module XcodeArchiveCache
           pods_fixer.fix_embed_frameworks_script(target, graph, storage.container_dir_path)
           pods_fixer.fix_copy_resources_script(target, graph, storage.container_dir_path)
         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)}
+          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) }
           framework_embedder.embed(framework_file_paths, target)
         end
 
@@ -86,16 +93,26 @@ module XcodeArchiveCache
       #
       attr_reader :pods_fixer
 
+      # @return [ModulemapFixer]
+      #
+      attr_reader :modulemap_fixer
+
       # @return [FrameworkEmbedder]
       #
       attr_reader :framework_embedder
 
       # @param [Array<XcodeArchiveCache::BuildGraph::Node>] nodes
       #
-      def inject_unpacked(nodes)
-        cached_nodes = nodes.select {|node| node.state == :unpacked}
+      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
@@ -104,10 +121,11 @@ module XcodeArchiveCache
       #
       def add_header_paths(nodes)
         header_storage_paths = storage.get_all_headers_storage_paths
+        return if header_storage_paths.length == 0
 
         nodes
             .select(&:waiting_for_rebuild)
-            .each {|node| add_header_paths_to_target(node.native_target, header_storage_paths)}
+            .each { |node| add_header_paths_to_target(node.native_target, header_storage_paths) }
       end
 
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
@@ -133,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)
@@ -145,13 +162,16 @@ module XcodeArchiveCache
       def save_graph_projects(graph)
         projects = graph.nodes.map(&:native_target).map(&:project).uniq
         debug("updating #{projects.length} projects")
-        projects.each {|project| project.save}
+        projects.each { |project| project.save }
       end
 
       # @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?
@@ -161,9 +181,11 @@ module XcodeArchiveCache
         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
 
@@ -174,22 +196,41 @@ module XcodeArchiveCache
         build_configuration = find_build_configuration(dependent_target)
 
         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)
+      def add_as_prebuilt_static_lib(prebuilt_node, dependent_target)
         build_configuration = find_build_configuration(dependent_target)
 
-        if should_link
-          artifact_location = storage.get_storage_path(prebuilt_node)
-          build_flags_changer.add_library_search_path(build_configuration, artifact_location)
+        injected_modulemap_file_path = storage.get_modulemap_path(prebuilt_node)
+        if injected_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)
+
+          original_modulemap_path = prebuilt_node.original_modulemap_file_path
+          add_header_paths_to_target(dependent_target, [File.dirname(original_modulemap_path)])
+        end
+
+        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
 
         dependency_remover.remove_dependency(prebuilt_node, dependent_target)
@@ -198,7 +239,7 @@ module XcodeArchiveCache
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
       #
       def find_build_configuration(target)
-        build_configuration = target.build_configurations.select {|configuration| configuration.name == configuration_name}.first
+        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}"
         end
@@ -223,6 +264,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