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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f444a19221b84c55a31be3d82277eef653239bdec9299d65b1252c1874dae15
-  data.tar.gz: 9f1927ba1c9bf360d83a3b4febf128b069b8d846eca236a8d8f9bd848de9af24
+  metadata.gz: ea58d5804a6b809038af9c443a49426935c3f1b82673ce4029cadcd5dcdb21a2
+  data.tar.gz: edae37d1c99f73465be2486e910e32bb4b445811d4ef8dd4db91e45853f34a6e
 SHA512:
-  metadata.gz: a0b85c53b4127976dfee59597aade6e6e7d0064841b8ea240446f9f7482bf3bd438a482cc3d75bd86caa917c040fe5e9f89f3c35e07291fdb8cd08d3f5b6b9e6
-  data.tar.gz: c52f972d48a54b9331985d0b7a39f8e131a77a0e46c3cb8c0501422f313deb279b4ed9d0974fb99be7cd83f40a40feb374ae3d6f0feb73b5376089d7d574324a
+  metadata.gz: a753ce67b8129209b5da8e0afbdbd542da9660651ae47559fcfacbcf25ed9d35bedc45dbc05d23f13b33b1e4d05885f54bb43aaea2d3e2b4085f3fc1e960be63
+  data.tar.gz: c90dee530d492db4c3986c0e0ca6d651e0099a8f0348cdb4f5fa0110a32d143932809bdfce295ab4dc36e8180456320a208ff9f927cc2478f9b8d086cc016c32

data/lib/artifact_cache/archiver.rb

@@ -9,7 +9,8 @@ module XcodeArchiveCache
       #
       def archive(path, destination)
         if File.exists?(destination)
-          raise ArgumentError.new, "Artifact cache path #{destination} is already taken"
+          warn "Replacing artifact archive at path #{destination}"
+          FileUtils.rm_rf(destination)
         end
 
         if File.file?(path)

data/lib/artifact_cache/local_storage.rb

@@ -60,7 +60,8 @@ module XcodeArchiveCache
         state_file_path = archive_path + ".state"
 
         if File.exist?(state_file_path)
-          raise ArgumentError.new, "State file already exists: #{state_file_path}"
+          warn "Replacing state file #{state_file_path}"
+          FileUtils.rm_f(state_file_path)
         end
 
         dependency_shas = node.dependencies

data/lib/build/performer.rb

@@ -35,7 +35,7 @@ module XcodeArchiveCache
       # @param [XcodeArchiveCache::BuildGraph::Graph] graph
       #
       def should_rebuild?(graph)
-        graph.nodes.reduce(false) {|rebuild, node| rebuild || node.waiting_for_rebuild}
+        graph.root_node.state != :unpacked
       end
 
       private

data/lib/build/product_extractor.rb

@@ -17,7 +17,7 @@ module XcodeArchiveCache
       #
       def list_product_contents(built_node)
         file_paths = list_products(built_node)
-        file_paths.select {|path| File.exist?(path)}.map {|path| File.realpath(path)}
+        file_paths.select { |path| File.exist?(path) }.map { |path| File.realpath(path) }
       end
 
       private
@@ -78,7 +78,15 @@ module XcodeArchiveCache
           raise Informative, "Product of type #{built_node.native_target.product_type} not found for #{built_node.name}"
         end
 
-        [product_path]
+        paths = [product_path]
+
+        # this one is generated during Swift compilation
+        # so we need to cache it as well
+        #
+        swift_objc_interface_header_path = built_node.swift_objc_interface_header_path
+        paths << swift_objc_interface_header_path if swift_objc_interface_header_path
+
+        paths
       end
 
       # @param [XcodeArchiveCache::BuildGraph::Node] built_node
@@ -106,7 +114,7 @@ module XcodeArchiveCache
         end
 
         uuids = list_bc_symbolmap_uuids(executable_path)
-        uuids.map {|uuid| find_bc_symbolmap(uuid)}.flatten
+        uuids.map { |uuid| find_bc_symbolmap(uuid) }.flatten
       end
 
       # @param [String] executable_path
@@ -114,7 +122,11 @@ module XcodeArchiveCache
       # @return [Array<String>]
       #
       def list_bc_symbolmap_uuids(executable_path)
-        shell_executor.execute_for_output("otool -l #{executable_path} | grep uuid | awk {'print $2'}").split("\n")
+        begin
+          shell_executor.execute_for_output("otool -l #{executable_path} | grep uuid | awk {'print $2'}").split("\n")
+        rescue
+          []
+        end
       end
 
       # @param [String] uuid

data/lib/build_graph/node.rb

@@ -86,9 +86,45 @@ module XcodeArchiveCache
       # @return [String]
       #
       def dsym_file_name
-        return nil unless build_settings
+        build_settings ? build_settings[XcodeArchiveCache::BuildSettings::DWARF_DSYM_FILE_NAME_KEY] : nil
+      end
+
+      # @return [String]
+      #
+      def modulemap_file_path
+        modulemap_file = build_settings[XcodeArchiveCache::BuildSettings::MODULEMAP_FILE_KEY]
+        return unless modulemap_file
 
-        build_settings[XcodeArchiveCache::BuildSettings::DWARF_DSYM_FILE_NAME_KEY]
+        Pathname.new(modulemap_file).absolute? ? modulemap_file : File.join(File.dirname(native_target.project.path), modulemap_file)
+      end
+
+      # @return [String]
+      #
+      def swift_objc_interface_header_path
+        header_file = swift_objc_interface_header_file
+        return if header_file == nil
+
+        File.join(build_settings[XcodeArchiveCache::BuildSettings::DERIVED_SOURCES_DIR_KEY], header_file)
+      end
+
+      # @return [String]
+      #
+      def swift_objc_interface_header_file
+        header_file = build_settings[XcodeArchiveCache::BuildSettings::SWIFT_OBJC_INTERFACE_HEADER_NAME_KEY]
+        if header_file == nil
+          our_module_name = module_name
+          return if our_module_name == nil
+
+          header_file = our_module_name + "-Swift.h"
+        end
+
+        header_file
+      end
+
+      # @return [String]
+      #
+      def module_name
+        build_settings[XcodeArchiveCache::BuildSettings::PRODUCT_MODULE_NAME_KEY]
       end
 
       # @return [Array<Node>]

data/lib/build_graph/rebuild_evaluator.rb

@@ -8,24 +8,50 @@ module XcodeArchiveCache
         @cache_storage = cache_storage
       end
 
+      # @param [XcodeArchiveCache::BuildGraph::Graph] graph
+      #
+      def evaluate_build_graph(graph)
+        return if graph.root_node.state != :unknown
+
+        # DFS over graph, evaluating dependencies first
+        #
+        stack = [graph.root_node]
+
+        while stack.length > 0
+          last_node = stack.last
+
+          if last_node.state == :evaluating_dependencies
+            # dependencies were evaluated, we're good to go
+            evaluate(last_node)
+            stack.delete_at(stack.length - 1)
+          elsif last_node.state == :unknown
+            last_node.state = :evaluating_dependencies
+            stack += last_node.dependencies.select { |dependency| dependency.state == :unknown }
+          else
+            stack.delete_at(stack.length - 1)
+          end
+        end
+      end
+
+      private
+
       # @param [XcodeArchiveCache::BuildGraph::Node] node
       #
       def evaluate(node)
-        return if node.state != :unknown
+        has_dependencies_waiting_for_rebuild = node.dependencies
+                                                   .reduce(false) { |rebuild, dependency| rebuild || dependency.waiting_for_rebuild }
 
         # we include dependency shas in every node sha calculation,
         # so if some dependency changes, that change propagates
         # all the way to the top level
         #
-        if cache_storage.cached_artifact_path(node) == nil
+        if has_dependencies_waiting_for_rebuild || cache_storage.cached_artifact_path(node) == nil
           node.state = :waiting_for_rebuild
         else
           node.state = :exists_in_cache
         end
       end
 
-      private
-
       # @return [XcodeArchiveCache::ArtifactCache::AbstractStorage]
       #
       attr_reader :cache_storage

data/lib/build_graph/sha_calculator.rb

@@ -36,6 +36,9 @@ module XcodeArchiveCache
           inputs << list_build_phase_inputs(build_phase)
         end
 
+        modulemap_file_path = node.modulemap_file_path
+        inputs << modulemap_file_path if modulemap_file_path
+
         # file path order should not affect evaluation result
         inputs.flatten.compact.sort
       end

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

@@ -64,13 +64,36 @@ module XcodeArchiveCache
         add_cflag(build_configuration, path_to_capital_i(path))
       end
 
+      # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
+      # @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)
+
+        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
+      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_SWIFT_FLAGS_KEY = "OTHER_SWIFT_FLAGS"
       INHERITED_SETTINGS_VALUE = "$(inherited)"
 
       # @param [Xcodeproj::Project::Object::XCBuildConfiguration] build_configuration
@@ -167,6 +190,52 @@ module XcodeArchiveCache
 
         "-framework \"#{framework_name}\""
       end
+
+      # @param [Hash] build_settings
+      # @param [String] flags_key
+      # @param [Array<String>] old_modulemap_names
+      # @param [String] path
+      #
+      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
+
+      MODULE_MAP_FLAG = "-fmodule-map-file="
+
+      # @param [String] flags
+      # @param [Array<String>] old_modulemap_names
+      # @param [String] path
+      #
+      # @return [String]
+      #
+      def replace_module_map_path(flags, old_modulemap_names, path)
+        return if flags == nil
+
+        is_flags_string = flags.is_a?(String)
+        flags = flags.split(" ") if is_flags_string
+        updated_flags = flags
+                            .map { |flags_line| flags_line.split(" ") }
+                            .flatten
+                            .map do |line|
+          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
+            end
+          end
+
+          updated_line
+        end
+
+        is_flags_string ? updated_flags.join(" ") : updated_flags
+      end
     end
   end
 end

data/lib/injection/headers_mover.rb

@@ -19,16 +19,29 @@ 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
 
+        if node.has_static_library_product?
+          headers_file_paths = node.native_target
+                                   .headers_build_phase
+                                   .files
+                                   .map { |header| get_real_path(header) }
+                                   .uniq
+          storage.store_default_headers(node, headers_file_paths)
+
+          header_count += headers_file_paths.length
+
+          storage.store_modulemap(node)
+        end
+
         debug("found #{header_count} headers")
       end
 

data/lib/injection/injector.rb

@@ -14,6 +14,7 @@ module XcodeArchiveCache
         @dependency_remover = DependencyRemover.new
         @build_flags_changer = BuildFlagsChanger.new
         @pods_fixer = PodsScriptFixer.new
+        @modulemap_fixer = ModulemapFixer.new(storage)
         @framework_embedder = FrameworkEmbedder.new
       end
 
@@ -34,8 +35,14 @@ module XcodeArchiveCache
           return
         end
 
+        no_rebuild_performed = root_node.state == :unpacked
+
         graph.nodes.each do |node|
-          headers_mover.prepare_headers_for_injection(node)
+          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, node.is_root)
           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,6 +93,10 @@ module XcodeArchiveCache
       #
       attr_reader :pods_fixer
 
+      # @return [ModulemapFixer]
+      #
+      attr_reader :modulemap_fixer
+
       # @return [FrameworkEmbedder]
       #
       attr_reader :framework_embedder
@@ -93,9 +104,10 @@ module XcodeArchiveCache
       # @param [Array<XcodeArchiveCache::BuildGraph::Node>] nodes
       #
       def inject_unpacked(nodes)
-        cached_nodes = nodes.select {|node| node.state == :unpacked}
+        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
       end
@@ -108,7 +120,7 @@ module XcodeArchiveCache
 
         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
@@ -146,7 +158,7 @@ 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
@@ -188,10 +200,16 @@ module XcodeArchiveCache
       def add_as_prebuilt_static_lib(prebuilt_node, dependent_target, should_link)
         build_configuration = find_build_configuration(dependent_target)
 
-        if should_link
+        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)]
+          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
+        # end
 
         dependency_remover.remove_dependency(prebuilt_node, dependent_target)
       end
@@ -199,7 +217,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

data/lib/injection/modulemap_fixer.rb

@@ -0,0 +1,47 @@
+module XcodeArchiveCache
+  module Injection
+
+    class ModulemapFixer
+
+      # @param [Storage] storage
+      #
+      def initialize(storage)
+        @storage = storage
+      end
+
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      #
+      def fix_modulemap(node)
+        return unless node.has_static_library_product?
+
+        modulemap_file_path = node.modulemap_file_path
+        return if modulemap_file_path == nil
+
+        injected_modulemap_file_path = storage.get_modulemap_path(node)
+        return if injected_modulemap_file_path == nil
+
+        swift_objc_interface_header_file_name = node.swift_objc_interface_header_file
+        return if swift_objc_interface_header_file_name == nil
+
+        # add generated header to modulemap to make Swift stuff available module users
+        #
+        storage_path = storage.get_storage_path(node)
+        header_path = File.join(storage_path, swift_objc_interface_header_file_name)
+        return unless File.exist?(header_path)
+
+        File.open(injected_modulemap_file_path, "a") do |modulemap_file|
+          modulemap_file.puts "\nmodule #{node.module_name}.Swift {\n"
+          modulemap_file.puts "  header \"#{header_path}\"\n"
+          modulemap_file.puts "  requires objc\n"
+          modulemap_file.puts "}\n"
+        end
+      end
+
+      private
+
+      # @return [Storage]
+      #
+      attr_accessor :storage
+    end
+  end
+end

data/lib/injection/storage.rb

@@ -31,12 +31,41 @@ module XcodeArchiveCache
         end
 
         file_paths.each do |file_path|
-          FileUtils.cp(file_path, File.join(storage_path, File.basename(file_path)))
+          FileUtils.cp(file_path, get_stored_file_path(storage_path, file_path))
         end
 
         save_header_storage_path(storage_path, node)
       end
 
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      # @param [Array<String>] file_paths
+      #
+      def store_default_headers(node, file_paths)
+        store_headers(node, get_default_headers_storage_path(node), file_paths)
+      end
+
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      #
+      def store_modulemap(node)
+        modulemap_file_path = node.modulemap_file_path
+        if modulemap_file_path && File.exist?(modulemap_file_path)
+          store_headers(node, get_default_headers_storage_path(node), [modulemap_file_path])
+        end
+      end
+
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      #
+      # @return [String]
+      #
+      def get_modulemap_path(node)
+        modulemap_file_path = node.modulemap_file_path
+        return if modulemap_file_path == nil
+
+        storage_path = get_full_header_storage_path(get_default_headers_storage_path(node))
+        stored_modulemap_file_path = get_stored_file_path(storage_path, modulemap_file_path)
+        File.exist?(stored_modulemap_file_path) ? stored_modulemap_file_path : nil
+      end
+
       # @param [XcodeArchiveCache::BuildGraph::Node] node
       # @param [Array<String>] file_paths
       #
@@ -70,7 +99,7 @@ module XcodeArchiveCache
 
       # @param [XcodeArchiveCache::BuildGraph::Node] node
       #
-      # @return [Array<String>]
+      # @return [String]
       #
       def get_headers_storage_paths(node)
         headers_storage_dir_paths[node.name]
@@ -78,11 +107,19 @@ module XcodeArchiveCache
 
       def get_all_headers_storage_paths
         headers_storage_dir_paths
-            .map {|_, path| path}
+            .map { |_, path| path }
             .flatten
             .uniq
       end
 
+      # @param [XcodeArchiveCache::BuildGraph::Node] node
+      #
+      # @return [String]
+      #
+      def get_default_headers_storage_path(node)
+        "include/#{node.name}"
+      end
+
       private
 
       def prepare_container_dir
@@ -99,6 +136,15 @@ module XcodeArchiveCache
         File.absolute_path(path, container_dir_path)
       end
 
+      # @param [String] storage_path
+      # @param [String] file_path
+      #
+      # @return [String]
+      #
+      def get_stored_file_path(storage_path, file_path)
+        File.join(storage_path, File.basename(file_path))
+      end
+
       # @param [String] path
       # @param [XcodeArchiveCache::BuildGraph::Node] node
       #

data/lib/runner/runner.rb

@@ -92,20 +92,12 @@ module XcodeArchiveCache
       graph_builder = XcodeArchiveCache::BuildGraph::Builder.new(@native_target_finder, xcodebuild_executor)
       graph = graph_builder.build_graph(target, dependency_target)
 
-      evaluate_for_rebuild(graph)
+      @rebuild_evaluator.evaluate_build_graph(graph)
       unpack_cached_artifacts(graph)
       rebuild_if_needed(xcodebuild_executor, dependency_target, graph)
       @injector.perform_outgoing_injection(graph, target)
     end
 
-    # @param [XcodeArchiveCache::BuildGraph::Graph] graph
-    #
-    def evaluate_for_rebuild(graph)
-      graph.nodes.each do |node|
-        @rebuild_evaluator.evaluate(node)
-      end
-    end
-
     # @param [XcodeArchiveCache::BuildGraph::Graph] graph
     #
     def unpack_cached_artifacts(graph)

data/lib/shell/executor.rb

@@ -57,12 +57,12 @@ module XcodeArchiveCache
       # @return [String]
       #
       def pipefail_flags(print_command)
-        flags = %w(e o)
+        flags = ["e", "o pipefail"]
         if print_command
           flags.insert(1, "x")
         end
 
-        "-" + flags.join("")
+        "-" + flags.join(" -")
       end
     end
   end

data/lib/xcode-archive-cache.rb

@@ -40,6 +40,7 @@ require 'build_settings/parser'
 
 require 'injection/injector'
 require 'injection/pods_script_fixer'
+require 'injection/modulemap_fixer'
 require 'injection/build_flags_changer'
 require 'injection/dependency_remover'
 require 'injection/headers_mover'

data/lib/xcodebuild/executor.rb

@@ -55,6 +55,10 @@ module XcodeArchiveCache
         shell_executor.execute(command, true)
       end
 
+      def set_up_for_simulator?
+        destination_flag.include?("Simulator")
+      end
+
       private
 
       # @return [String]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-archive-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10.pre.1
 platform: ruby
 authors:
 - Ilya Dyakonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -112,6 +112,7 @@ files:
 - lib/injection/framework_embedder.rb
 - lib/injection/headers_mover.rb
 - lib/injection/injector.rb
+- lib/injection/modulemap_fixer.rb
 - lib/injection/pods_script_fixer.rb
 - lib/injection/storage.rb
 - lib/logs/logs.rb
@@ -134,9 +135,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.4
 signing_key: