xcode-archive-cache 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff86c853bc7b50f265964695cd55edd14821c821f5d27a1f916dcc23ccc1c4b4
-  data.tar.gz: a11e6dd9c98f59526f6f5329aab00acdcc58b5d7e2b65d83b6a1348d647a2323
+  metadata.gz: 3c3de4b956fe76ce673329ecf9977a911d3c6bb3055c00e59c3e6903cb16e6b2
+  data.tar.gz: 92253d7316a2a716b71a053f182483e7af54aeb1662111175f3e071909d79998
 SHA512:
-  metadata.gz: a71f194f4af63d93ee4f256977eb98525065599a36f270215c5c0f3a18cb8742957bb8f2e407497a7629f05ba18b9532d093d02b1dec305fcf4f82f815473431
-  data.tar.gz: ba25058d81d37e12594422d9a765d07fb8af192b53fe980ca3b4da3e1eac61f5a0bc69454f406be92094742e7809dbe8f4887d33e48b305c869733e5c581a4d8
+  metadata.gz: 88b0a7e44eecbdc426755761dd5df10fb0e1cff4a00c44f915df1f65515685ce3f2527d8d9b1173ea439bff032d49f4875f32a859291a702f829d378103c8234
+  data.tar.gz: c63650b58e921da5e38bb8648d0e6e3cfeddb55165e72f8984511c769a139b6ab3108350c0e684ed27ed9dbf9e02ef46135cc315a182ebc00586bb33c3fdae1f

data/lib/build/product_extractor.rb

@@ -48,7 +48,7 @@ module XcodeArchiveCache
         elsif built_node.has_acceptable_product?
           list_single_product(built_node)
         else
-          raise Informative, "#{built_node.name} has unsupported product type: #{built_node.native_target.product_type}"
+          raise XcodeArchiveCache::Informative, "#{built_node.name} has unsupported product type: #{built_node.native_target.product_type}"
         end
       end
 
@@ -60,7 +60,7 @@ module XcodeArchiveCache
         framework_glob = get_main_product_glob(built_node)
         framework_path = Dir.glob(framework_glob).first
         unless framework_path
-          raise Informative, "Framework product not found for #{built_node.name}"
+          raise XcodeArchiveCache::Informative, "Framework product not found for #{built_node.name}"
         end
 
         framework_dsym_glob = File.join(File.dirname(framework_glob), built_node.dsym_file_name)
@@ -79,7 +79,7 @@ module XcodeArchiveCache
         product_glob = get_main_product_glob(built_node)
         product_path = Dir.glob(product_glob).first
         unless product_path
-          raise Informative, "Product of type #{built_node.native_target.product_type} not found for #{built_node.name}"
+          raise XcodeArchiveCache::Informative, "Product of type #{built_node.native_target.product_type} not found for #{built_node.name}"
         end
 
         paths = [product_path]
@@ -181,7 +181,7 @@ module XcodeArchiveCache
         executable_name = File.basename(framework_path, File.extname(framework_path))
         executable_path = File.join(framework_path, executable_name)
         unless File.exist?(executable_path)
-          raise Informative, "Failed to find executable inside framework: #{framework_path}"
+          raise XcodeArchiveCache::Informative, "Failed to find executable inside framework: #{framework_path}"
         end
 
         uuids = list_bc_symbolmap_uuids(executable_path)

data/lib/build_graph/builder.rb

@@ -6,8 +6,8 @@ module XcodeArchiveCache
 
       # @param [XcodeArchiveCache::Xcodebuild::Executor] xcodebuild_executor
       #
-      def initialize(native_target_finder, xcodebuild_executor)
-        @build_settings_loader = XcodeArchiveCache::BuildSettings::Loader.new(xcodebuild_executor)
+      def initialize(native_target_finder, build_settings_loader)
+        @build_settings_loader = build_settings_loader
         @native_target_finder = native_target_finder
         @sha_calculator = NodeShaCalculator.new
       end
@@ -61,7 +61,7 @@ module XcodeArchiveCache
         display_name = target.display_name
         if target_stack.include?(display_name)
           target_stack.push(display_name)
-          raise Informative, "Circular dependency detected: #{target_stack.join(" -> ")}"
+          raise XcodeArchiveCache::Informative, "Circular dependency detected: #{target_stack.join(" -> ")}"
         end
 
         node = ALL_NODES.select {|node| node.native_target.uuid == target.uuid && node.native_target.project == target.project}.first
@@ -83,11 +83,7 @@ module XcodeArchiveCache
         dependencies = []
         target_stack.push(display_name)
 
-        dependency_targets = target.dependencies.map {|dependency| native_target_finder.find_for_dependency(dependency)} +
-            target.frameworks_build_phase.files.map {|file| native_target_finder.find_for_file(file)}
-
-        # PBXNativeTarget has no custom equality check
-        deduplicated_targets = dependency_targets.compact.uniq {|dependency_target| dependency_target.uuid + dependency_target.display_name}
+        deduplicated_targets = native_target_finder.find_native_dependencies(target)
         debug("dependency targets: #{deduplicated_targets.map(&:display_name)}")
 
         deduplicated_targets.each do |dependency_target|
@@ -145,7 +141,7 @@ module XcodeArchiveCache
         info("getting settings for #{target.display_name}")
         build_settings = build_settings_loader.get_settings(target.project.path, target.display_name)
         unless build_settings
-          raise Informative, "No build settings loaded for #{target.display_name}"
+          raise XcodeArchiveCache::Informative, "No build settings loaded for #{target.display_name}"
         end
 
         build_settings

data/lib/build_graph/native_target_finder.rb

@@ -3,9 +3,14 @@ module XcodeArchiveCache
     class NativeTargetFinder
 
       # @param [Array<Xcodeproj::Project>] projects
+      # @param [String] build_configuration_name
       #
-      def initialize(projects)
+      def initialize(projects, build_configuration_name)
         @all_targets = extract_targets(projects)
+        @build_configuration_name = build_configuration_name
+        @interpolator = XcodeArchiveCache::BuildSettings::StringInterpolator.new
+
+        setup_product_name_to_target_mapping
       end
 
       # @param [Array<Xcodeproj::Project>] projects
@@ -25,20 +30,56 @@ module XcodeArchiveCache
 
       # @param [String] platform_name
       #
+      # @return [Array<Xcodeproj::Project::Object::PBXNativeTarget>]
+      #
       def set_platform_name_filter(platform_name)
         @platform_name = platform_name
       end
 
+      # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
+      #
+      # @return [Array<Xcodeproj::Project::Object::PBXNativeTarget>]
+      #
+      def find_native_dependencies(target)
+        direct_dependencies = target
+                                .dependencies
+                                .map {|dependency| find_for_dependency(dependency)}
+        linked_dependencies = find_linked_dependencies(target)
+        join(direct_dependencies, linked_dependencies)
+      end
+
+      # @param [Xcodeproj::Project::Object::PBXAbstractTarget] target
+      #
+      # @return [Array<Xcodeproj::Project::Object::PBXAbstractTarget>]
+      #
+      def find_all_dependencies(target)
+        direct_dependencies = target
+                                .dependencies
+                                .map {|dependency| find_any_for_dependency(dependency)}
+        linked_dependencies = []
+        
+        if target.is_a?(Xcodeproj::Project::Object::PBXNativeTarget) 
+          linked_dependencies = find_linked_dependencies(target)
+        end
+
+        join(direct_dependencies, linked_dependencies)
+      end
+
       # @param [Xcodeproj::Project::Object::PBXTargetDependency] dependency
       #
       # @return [Xcodeproj::Project::Object::PBXNativeTarget]
       #
       def find_for_dependency(dependency)
         # targets from embedded projects are proxied
-        target = dependency.target ? dependency.target : dependency.target_proxy.proxied_object
+        target = find_any_for_dependency(dependency)
         target.is_a?(Xcodeproj::Project::Object::PBXNativeTarget) ? target : nil
       end
 
+      def find_any_for_dependency(dependency)
+        target = dependency.target ? dependency.target : dependency.target_proxy.proxied_object
+        target && target.platform_name == platform_name ? target : nil
+      end
+
       # @param [Xcodeproj::Project::Object::PBXBuildFile] file
       #
       # @return [Xcodeproj::Project::Object::PBXNativeTarget]
@@ -61,7 +102,7 @@ module XcodeArchiveCache
           end
 
           if target == nil
-            raise Informative, "Target for #{file.file_ref.path} not found"
+            raise XcodeArchiveCache::Informative, "Target for #{file.file_ref.path} not found"
           end
 
           target
@@ -69,7 +110,7 @@ module XcodeArchiveCache
           # products of sibling project targets are added as PBXFileReferences
           targets = find_with_product_path(file.file_ref.path)
           if targets.length > 1
-            raise Informative, "Found more than one target with product #{File.basename(file.file_ref.path)} in:\n#{targets.map(&:project)}"
+            raise XcodeArchiveCache::Informative, "Found more than one target with product #{File.basename(file.file_ref.path)} in:\n#{targets.map(&:project)}"
           end
 
           targets.first
@@ -78,9 +119,16 @@ module XcodeArchiveCache
 
       # @param [String] product_name
       #
+      # @return [Xcodeproj::Project::Object::PBXNativeTarget]
+      #
       def find_for_product_name(product_name)
-        all_targets.select {|native_target| native_target.name == product_name || native_target.product_reference.display_name == product_name}
-            .first
+        canonical = all_targets
+          .select {|native_target| native_target.name == product_name || native_target.product_reference.display_name == product_name}
+          .first
+        
+        parsed = @product_name_to_target[product_name]
+
+        canonical ? canonical : parsed
       end
 
       private
@@ -93,6 +141,36 @@ module XcodeArchiveCache
       #
       attr_accessor :platform_name
 
+      # @return [String]
+      #
+      attr_reader :build_configuration_name
+
+      def setup_product_name_to_target_mapping
+        @product_name_to_target = Hash.new
+
+        @all_targets.each do |target|
+          build_settings = target.find_build_configuration(build_configuration_name, raise_if_not_found: false)&.build_settings
+          next unless build_settings
+
+          full_settings = build_settings
+          full_settings[XcodeArchiveCache::BuildSettings::TARGET_NAME_KEY] = target.name
+          product_name = @interpolator.interpolate(build_settings[XcodeArchiveCache::BuildSettings::PRODUCT_NAME_KEY], full_settings)
+
+          next if product_name == nil
+
+          product_name_extension = ""
+          case target.product_type
+          when Xcodeproj::Constants::PRODUCT_TYPE_UTI[:framework]
+            product_name_extension = ".framework"
+          when Xcodeproj::Constants::PRODUCT_TYPE_UTI[:static_library]
+            product_name_extension = ".a"
+          end
+
+          full_product_name = "#{product_name}#{product_name_extension}"
+          @product_name_to_target[full_product_name] = target
+        end
+      end
+
       # @param [Xcodeproj::Project] project
       #
       # @return [Array<Xcodeproj::Project>]
@@ -107,6 +185,28 @@ module XcodeArchiveCache
         [project] + nested_projects + subnested_projects
       end
 
+      # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
+      #
+      # @return [Array<Xcodeproj::Project::Object::PBXNativeTarget>]
+      #
+      def find_linked_dependencies(target)
+        target
+          .frameworks_build_phase
+          .files
+          .map {|file| find_for_file(file)}
+      end
+
+      # @param [Array<Xcodeproj::Project::Object::PBXAbstractTarget>] direct_dependencies
+      # @params [Array<Xcodeproj::Project::Object::PBXNativeTarget>] linked_dependencies
+      #
+      # @return [Array<Xcodeproj::Project::Object::PBXAbstractTarget>]
+      #
+      def join(direct_dependencies, linked_dependencies)
+        (direct_dependencies + linked_dependencies)
+          .compact
+          .uniq(&:equatable_identifier)
+      end
+
       # @param [String] uuid
       #
       # @return [Xcodeproj::Project::Object::PBXNativeTarget]
@@ -129,7 +229,16 @@ module XcodeArchiveCache
       # @return [Array<Xcodeproj::Project::Object::PBXNativeTarget>]
       #
       def find_with_product_path(path)
-        all_targets.select {|target| target.platform_name == platform_name && target.product_reference.path == path}
+        canonical = all_targets.select {|target| target.platform_name == platform_name && target.product_reference.path == path }
+        parsed = @product_name_to_target[File.basename(path)]
+
+        if canonical.length > 0
+          canonical
+        elsif parsed
+          [parsed]
+        else
+          []
+        end
       end
     end
   end

data/lib/build_settings/extractor.rb

@@ -73,6 +73,7 @@ module XcodeArchiveCache
         original_platform = settings[EFFECTIVE_PLATFORM_NAME_KEY]
         simulator_platform = settings[CORRESPONDING_SIMULATOR_PLATFORM_NAME_KEY]
         settings[EFFECTIVE_PLATFORM_NAME_KEY] = "-#{simulator_platform}"
+        settings[PLATFORM_NAME_KEY] = simulator_platform
 
         configuration = settings[CONFIGURATION_KEY]
         path_regexp = Regexp.new("#{configuration}#{original_platform}")
@@ -82,6 +83,7 @@ module XcodeArchiveCache
         end
       end
 
+      PLATFORM_NAME_KEY = "PLATFORM_NAME".freeze
       EFFECTIVE_PLATFORM_NAME_KEY = "EFFECTIVE_PLATFORM_NAME".freeze
       CORRESPONDING_SIMULATOR_PLATFORM_NAME_KEY = "CORRESPONDING_SIMULATOR_PLATFORM_NAME".freeze
       CONFIGURATION_KEY = "CONFIGURATION".freeze

data/lib/build_settings/loader.rb

@@ -1,6 +1,8 @@
 module XcodeArchiveCache
   module BuildSettings
 
+    PRODUCT_NAME_KEY = "PRODUCT_NAME".freeze
+    TARGET_NAME_KEY = "TARGET_NAME".freeze
     FULL_PRODUCT_NAME_KEY = "FULL_PRODUCT_NAME".freeze
     DWARF_DSYM_FILE_NAME_KEY = "DWARF_DSYM_FILE_NAME".freeze
     MODULEMAP_FILE_KEY = "MODULEMAP_FILE".freeze

data/lib/build_settings/parser.rb

@@ -1,11 +1,24 @@
 module XcodeArchiveCache
   module BuildSettings
+    class SettingEntry
+      attr_reader :name
+      attr_reader :modifiers
+      attr_reader :full_string
+
+      def initialize(name, modifiers, full_string)
+        @name = name
+        @modifiers = modifiers
+        @full_string = full_string
+      end
+    end
+
     class Parser
 
       def initialize
         @setting_name_regex = Regexp.new("^(?<#{SETTING_NAME_GROUP}>#{SETTING_NAME_CHARACTERS})\s=")
         @setting_value_regex = Regexp.new("^#{SETTING_NAME_CHARACTERS}\s=\s(?<#{SETTING_VALUE_GROUP}>.+)$")
         @setting_entry_regex = create_entry_regex
+        @setting_entry_part_regex = Regexp.new("#{SETTING_ENTRY_PART_CHARACTERS}")
         @setting_entry_name_regex = Regexp.new(SETTING_NAME_CHARACTERS)
       end
 
@@ -13,12 +26,18 @@ module XcodeArchiveCache
       #
       # @return [Array<String>]
       #
-      def find_all_names(string)
+      def find_all_entries(string)
+        return nil if string == nil
+
         string.scan(setting_entry_regex)
-            .map {|entry| entry.scan(setting_entry_name_regex).first}
-            .flatten
+            .map {|entry| 
+            parts = entry.scan(setting_entry_part_regex)
+            name = parts.first
+            modifiers = parts.drop(1)
+
+            name != nil ? SettingEntry.new(name, modifiers, entry) : nil
+          }
             .compact
-            .uniq
       end
 
       # @param [String] string
@@ -47,7 +66,7 @@ module XcodeArchiveCache
       #
       # @return [Regexp]
       #
-      def create_entry_regex(characters = SETTING_NAME_CHARACTERS)
+      def create_entry_regex(characters = SETTING_ALL_CHARACTERS)
         Regexp.new("\\$[({]#{characters}[)}]")
       end
 
@@ -65,10 +84,14 @@ module XcodeArchiveCache
       #
       attr_reader :setting_entry_regex
 
+      attr_reader :setting_entry_part_regex
+
       # @return [Regexp]
       #
       attr_reader :setting_entry_name_regex
 
+      SETTING_ALL_CHARACTERS = "[A-Za-z0-9_:]+".freeze
+      SETTING_ENTRY_PART_CHARACTERS = "[A-Za-z0-9_]+".freeze
       SETTING_NAME_CHARACTERS = "[A-Z0-9_]+".freeze
       SETTING_NAME_GROUP = "name".freeze
       SETTING_VALUE_GROUP = "value".freeze

data/lib/build_settings/string_interpolator.rb

@@ -12,15 +12,17 @@ module XcodeArchiveCache
       # @return [String]
       #
       def interpolate(string, build_settings)
-        names = parser.find_all_names(string)
+        return nil if string == nil
+
+        entries = parser.find_all_entries(string)
         result = string
 
-        names.each do |name|
-          value = build_settings[name]
+        entries.each do |entry|
+          value = build_settings[entry.name]
           next unless value
 
-          replacement_regex = parser.create_entry_regex(name)
-          result = result.gsub(replacement_regex, value)
+          modified_value = modify_setting_value(value, entry.modifiers)
+          result = result.gsub(entry.full_string, modified_value)
         end
 
         result
@@ -31,6 +33,20 @@ module XcodeArchiveCache
       # @return [Parser]
       #
       attr_accessor :parser
+
+      def modify_setting_value(value, modifiers)
+        modified_value = value
+
+        modifiers.each do |modifier|
+          case modifier
+          when "c99extidentifier"
+            modified_value = modified_value.gsub(/[-\s]/, "_")
+          else
+          end
+        end
+
+        modified_value
+      end
     end
   end
 end

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

@@ -248,11 +248,14 @@ module XcodeArchiveCache
           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
+        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
@@ -306,7 +309,7 @@ module XcodeArchiveCache
         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}\"*$") }
+        old_value_regexps = possible_old_values.map { |value| Regexp.new("/#{value}\"*$") }
 
         updated_settings = build_settings
                             .map { |line| line.split(" ") }

data/lib/injection/injector.rb

@@ -136,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)
@@ -175,7 +175,7 @@ module XcodeArchiveCache
         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?
@@ -193,7 +193,7 @@ 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.replace_or_add_framework_search_path(build_configuration, prebuilt_node.native_target.name, artifact_location)
@@ -210,7 +210,7 @@ module XcodeArchiveCache
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] dependent_target
       #
       def add_as_prebuilt_static_lib(prebuilt_node, dependent_target)
-        build_configuration = find_build_configuration(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
@@ -236,17 +236,6 @@ module XcodeArchiveCache
         dependency_remover.remove_dependency(prebuilt_node, dependent_target)
       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}"
-        end
-
-        build_configuration
-      end
-
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
       #
       def get_pods_target_name(target)

data/lib/injection/pods_script_fixer.rb

@@ -44,7 +44,7 @@ module XcodeArchiveCache
       # @return [String]
       #
       def find_embed_frameworks_script(target, build_settings)
-        find_script(target, build_settings, "[CP] Embed Pods Frameworks")
+        target.find_script(build_settings_interpolator, build_settings, "[CP] Embed Pods Frameworks")
       end
 
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
@@ -53,25 +53,7 @@ module XcodeArchiveCache
       # @return [String]
       #
       def find_copy_resources_script(target, build_settings)
-        find_script(target, build_settings, "[CP] Copy Pods Resources")
-      end
-
-      # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
-      # @param [XcodeArchiveCache::BuildSettings::Container] build_settings
-      # @param [String] script_name
-      #
-      # @return [String]
-      #
-      def find_script(target, build_settings, script_name)
-        target.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
+        target.find_script(build_settings_interpolator, build_settings, "[CP] Copy Pods Resources")
       end
 
       # @param [String] file_path

data/lib/injection/pods_xcframework_fixer.rb

@@ -0,0 +1,126 @@
+module XcodeArchiveCache
+  module Injection
+    class PodsXCFrameworkFixer
+
+      include XcodeArchiveCache::Logs
+
+      # @param [XcodeArchiveCache::Injection::Storage] storage
+      # @param [XcodeArchive::BuildGraph::NativeTargetFinder] native_target_finder
+      # @param [String] configuration_name
+      #
+      def initialize(storage, native_target_finder, configuration_name)
+        @storage = storage
+        @native_target_finder = native_target_finder
+        @configuration_name = configuration_name
+        @shell_executor = XcodeArchiveCache::Shell::Executor.new
+        @build_settings_interpolator = XcodeArchiveCache::BuildSettings::StringInterpolator.new
+        @checked_targets = []
+      end
+
+      # @param [Xcodeproj::Project::Object::PBXAbstractTarget] target
+      # @param [XcodeArchiveCache::BuildSettings::Container] build_settings
+      #
+      def fix(target, build_settings_loader)
+        checked_targets.push(target.equatable_identifier)
+        build_settings = build_settings_loader.get_settings(target.project.path, target.display_name)
+
+        debug("fixing #{target.display_name}")
+        script_path = find_copy_xcframeworks_script(target, build_settings)
+        if script_path != nil
+          fix_file(script_path)
+          
+          unless shell_executor.execute_with_env(script_path, build_settings.all)
+            raise XcodeArchiveCache::Informative, "Failed to execute Pods XCFramework script #{script_path}"
+          end
+        end
+
+        embed_frameworks_script_path = find_embed_frameworks_script(target, build_settings)
+        if embed_frameworks_script_path != nil
+          fix_file(embed_frameworks_script_path)
+        end
+
+        build_configuration = target.find_build_configuration(configuration_name)
+        if build_configuration.has_xcconfig?
+          fix_xcconfig_recursively(build_configuration.get_xcconfig_path, build_configuration.get_project_dir)
+        end
+
+        dependencies = native_target_finder.find_all_dependencies(target)
+        dependencies.each do |dependency_target|
+          if checked_targets.include?(dependency_target.equatable_identifier)
+            next
+          end
+
+          fix(dependency_target, build_settings_loader)
+        end
+      end
+
+      private
+
+      # @return [XcodeArchive::Injection::InjectionStorage]
+      #
+      attr_reader :storage
+
+      # @return [XcodeArchive::BuildGraph::NativeTargetFinder]
+      #
+      attr_reader :native_target_finder
+
+      # @return [String]
+      #
+      attr_reader :configuration_name
+
+      # @return [XcodeArchiveCache::Shell::Executor]
+      #
+      attr_reader :shell_executor
+
+      # @return [XcodeArchiveCache::BuildSettings::StringInterpolator]
+      #
+      attr_reader :build_settings_interpolator
+
+      # @return [Array<String>]
+      #
+      attr_accessor :checked_targets
+
+      # @param [String] path
+      # @param [String] project_dir
+      #
+      def fix_xcconfig_recursively(path, project_dir)
+        fix_file(path)
+        xcconfig = Xcodeproj::Config.new(path)
+
+        xcconfig.includes.each do |included_xcconfig|
+          included_xcconfig_path = File.join(project_dir, included_xcconfig)
+          fix_xcconfig_recursively(included_xcconfig_path, project_dir)
+        end
+      end
+
+      # @param [Xcodeproj::Project::Object::PBXAbstractTarget] target
+      # @param [XcodeArchiveCache::BuildSettings::Container] build_settings
+      #
+      # @return [String]
+      #
+      def find_copy_xcframeworks_script(target, build_settings)
+        target.find_script(build_settings_interpolator, build_settings, "[CP] Copy XCFrameworks")
+      end
+
+      # @param [Xcodeproj::Project::Object::PBXAbstractTarget] target
+      # @param [XcodeArchiveCache::BuildSettings::Container] build_settings
+      #
+      # @return [String]
+      #
+      def find_embed_frameworks_script(target, build_settings)
+        target.find_script(build_settings_interpolator, build_settings, "[CP] Embed Pods Frameworks")
+      end
+
+      # @param [String] file_path
+      #
+      def fix_file(file_path)
+        debug("fixing #{file_path}")
+        contents = File
+          .read(file_path)
+          .gsub("${PODS_XCFRAMEWORKS_BUILD_DIR}", storage.container_dir_path)
+
+        File.open(file_path, "w") {|file| file.puts(contents)}
+      end
+    end
+  end
+end

data/lib/runner/runner.rb

@@ -9,7 +9,7 @@ module XcodeArchiveCache
       @config = config
 
       projects = list_projects
-      @native_target_finder = XcodeArchiveCache::BuildGraph::NativeTargetFinder.new(projects)
+      @native_target_finder = XcodeArchiveCache::BuildGraph::NativeTargetFinder.new(projects, config.active_configuration.build_configuration)
 
       storage_path = File.absolute_path(config.storage.path)
       @cache_storage = XcodeArchiveCache::ArtifactCache::LocalStorage.new(storage_path)
@@ -37,7 +37,7 @@ module XcodeArchiveCache
         return workspace.file_references.map {|file_reference| Xcodeproj::Project.open(file_reference.absolute_path(workspace_dir))}
       end
 
-      raise Informative, "Configuration misses entry point -- must have either a project or a workspace"
+      raise XcodeArchiveCache::Informative, "Configuration misses entry point -- must have either a project or a workspace"
     end
 
     def run
@@ -65,7 +65,7 @@ module XcodeArchiveCache
     def handle_target(target_config)
       target = @native_target_finder.find_for_product_name(target_config.name)
       unless target
-        raise Informative, "Target not found for #{target_config.name}"
+        raise XcodeArchiveCache::Informative, "Target not found for #{target_config.name}"
       end
 
       xcodebuild_executor = XcodeArchiveCache::Xcodebuild::Executor.new(config.active_configuration.build_configuration,
@@ -73,7 +73,8 @@ module XcodeArchiveCache
                                                                         config.settings.destination,
                                                                         config.active_configuration.action,
                                                                         config.active_configuration.xcodebuild_args)
-      graph_builder = XcodeArchiveCache::BuildGraph::Builder.new(@native_target_finder, xcodebuild_executor)
+      build_settings_loader = XcodeArchiveCache::BuildSettings::Loader.new(xcodebuild_executor)
+      graph_builder = XcodeArchiveCache::BuildGraph::Builder.new(@native_target_finder, build_settings_loader)
 
       dependency_targets = Hash.new
       build_graphs = Hash.new
@@ -86,6 +87,9 @@ module XcodeArchiveCache
         build_graphs[dependency_name] = graph_builder.build_graph(target, dependency_target)
       end
 
+      pods_xcframeworks_fixer = XcodeArchiveCache::Injection::PodsXCFrameworkFixer.new(@injection_storage, @native_target_finder, config.active_configuration.build_configuration)
+      pods_xcframeworks_fixer.fix(target, build_settings_loader)
+
       target_config.dependencies.each do |dependency_name|
         info("processing #{dependency_name}")
 
@@ -107,7 +111,7 @@ module XcodeArchiveCache
     def find_dependency_target(target, dependency_name)
       dependency_target = @native_target_finder.find_for_product_name(dependency_name)
       unless dependency_target
-        raise Informative, "Target not found for #{dependency_name} of #{target.display_name}"
+        raise XcodeArchiveCache::Informative, "Target not found for #{dependency_name} of #{target.display_name}"
       end
 
       dependency_target

data/lib/shell/executor.rb

@@ -12,7 +12,7 @@ module XcodeArchiveCache
         output, status = Open3.capture2e(actual_command)
 
         if status.exitstatus != 0
-          raise Informative, "#{command}\nexecution failed\n#{output}"
+          raise XcodeArchiveCache::Informative, "#{command}\nexecution failed\n#{output}"
         end
 
         output
@@ -31,6 +31,18 @@ module XcodeArchiveCache
         result
       end
 
+      # @param [String] command
+      # @param [Hash] env
+      #
+      # @return [Boolean] true if command succeeded and returned 0, false otherwise
+      #
+      def execute_with_env(command, env)
+        result = system(env, "set -x && '#{command}'")
+
+        return false if result == nil
+        result
+      end
+
       private
 
       # @param [String] command

data/lib/xcode-archive-cache.rb

@@ -45,6 +45,7 @@ require 'injection/dependency_remover'
 require 'injection/headers_mover'
 require 'injection/storage'
 require 'injection/framework_embedder'
+require 'injection/pods_xcframework_fixer'
 
 require 'modulemap/file_handler'
 require 'modulemap/header_path_extractor'
@@ -56,6 +57,9 @@ require 'shell/executor'
 
 require 'xcodebuild/executor'
 
+require 'extensions/target'
+require 'extensions/build_configuration'
+
 module XcodeArchiveCache
   class Informative < StandardError
     include CLAide::InformativeError

data/lib/xcodebuild/executor.rb

@@ -117,7 +117,7 @@ module XcodeArchiveCache
         #
         inferred_destination = action == ARCHIVE_ACTION ? GENERIC_DESTINATION : destination_by_platform
         if inferred_destination == nil
-          raise Informative, "Destination not set for #{platform} platform"
+          raise XcodeArchiveCache::Informative, "Destination not set for #{platform} platform"
         end
 
         destination_specifier = inferred_destination == GENERIC_DESTINATION ? "generic/platform=#{platform}" : inferred_destination

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-archive-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Ilya Dyakonov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: xcpretty
   requirement: !ruby/object:Gem::Requirement
@@ -107,12 +107,15 @@ files:
 - lib/command/inject.rb
 - lib/config/config.rb
 - lib/config/dsl.rb
+- lib/extensions/build_configuration.rb
+- lib/extensions/target.rb
 - lib/injection/build_flags_changer.rb
 - lib/injection/dependency_remover.rb
 - lib/injection/framework_embedder.rb
 - lib/injection/headers_mover.rb
 - lib/injection/injector.rb
 - lib/injection/pods_script_fixer.rb
+- lib/injection/pods_xcframework_fixer.rb
 - lib/injection/storage.rb
 - lib/logs/logs.rb
 - lib/modulemap/file_handler.rb
@@ -141,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: Native targets cache for Xcode archive builds.