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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea58d5804a6b809038af9c443a49426935c3f1b82673ce4029cadcd5dcdb21a2
-  data.tar.gz: edae37d1c99f73465be2486e910e32bb4b445811d4ef8dd4db91e45853f34a6e
+  metadata.gz: b2121ee4ca94b2acfa38e1071a6f30209381464a7da5239e919d4b70cafd1d84
+  data.tar.gz: 9874700c995c65ee3ecaa4772a1aa6deba6868591b96da6d271b9ee1f32588df
 SHA512:
-  metadata.gz: a753ce67b8129209b5da8e0afbdbd542da9660651ae47559fcfacbcf25ed9d35bedc45dbc05d23f13b33b1e4d05885f54bb43aaea2d3e2b4085f3fc1e960be63
-  data.tar.gz: c90dee530d492db4c3986c0e0ca6d651e0099a8f0348cdb4f5fa0110a32d143932809bdfce295ab4dc36e8180456320a208ff9f927cc2478f9b8d086cc016c32
+  metadata.gz: 528092da4900b8232d71a9583ec0752c92ff2ee851bc13db3609c91c1a9aec3db4278abb777a3c574728d35b409b59ede6fc1481c0dafed49b93a396b994b114
+  data.tar.gz: c16c9ff1c2623437b5e29c0fea3cd1bc10cfe631c4df1772197595392b5a05286a8223294c20f9dc306b5ed47089f7c7c85c7eeb4138a940d2a37861c6266bdc

data/lib/build/product_extractor.rb

@@ -2,6 +2,8 @@ module XcodeArchiveCache
   module Build
     class ProductExtractor
 
+      include XcodeArchiveCache::Logs
+
       # @param [String] configuration
       # @param [String] derived_data_path
       #
@@ -17,7 +19,9 @@ 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
@@ -44,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
 
@@ -56,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)
@@ -75,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]
@@ -83,8 +87,32 @@ module XcodeArchiveCache
         # 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
+        swift_objc_interface_header_glob = get_swift_objc_interface_header_glob(built_node)
+        swift_objc_interface_header_path = Dir.glob(swift_objc_interface_header_glob).first
+        if swift_objc_interface_header_path
+          debug("using Swift-ObjC interface header #{swift_objc_interface_header_path}")
+          paths << swift_objc_interface_header_path
+        end
+
+        swiftmodule_glob = get_swiftmodule_glob(built_node)
+        if swiftmodule_glob
+          swiftmodule_path = Dir.glob(swiftmodule_glob).first
+          
+          if swiftmodule_path
+            debug("using swiftmodule #{swiftmodule_path}")
+            paths << swiftmodule_path
+          end
+        end
+
+        modulemap_glob = get_modulemap_glob(built_node)
+        if modulemap_glob
+          modulemap_path = Dir.glob(modulemap_glob).first
+
+          if modulemap_path
+            debug("using modulemap #{modulemap_path}")
+            paths << modulemap_path
+          end
+        end
 
         paths
       end
@@ -94,12 +122,57 @@ module XcodeArchiveCache
       # @return [String]
       #
       def get_main_product_glob(built_node)
-        product_name = built_node.native_target.product_reference.name ?
-                           built_node.native_target.product_reference.name :
-                           built_node.native_target.product_reference.path
+        product_names = [File.basename(built_node.native_target.product_reference.path)]
+        if built_node.native_target.product_reference.name
+          product_names.push(File.basename(built_node.native_target.product_reference.name))
+        end
+
+        get_product_glob(product_names.select { |name| File.extname(name).length > 0 })
+      end
+
+      # @param [XcodeArchiveCache::BuildGraph::Node] built_node
+      #
+      # @return [String]
+      #
+      def get_swift_objc_interface_header_glob(built_node)
+        get_product_glob([File.basename(built_node.swift_objc_interface_header_file)])
+      end
+
+      # @param [XcodeArchiveCache::BuildGraph::Node] built_node
+      #
+      # @return [String]
+      #
+      def get_swiftmodule_glob(built_node)
+        if built_node.module_name
+          get_product_glob([built_node.module_name + ".swiftmodule"])
+        end
+      end
+
+      # @param [XcodeArchiveCache::BuildGraph::Node] built_node
+      #
+      # @return [String]
+      #
+      def get_modulemap_glob(built_node)
+        resulting_modulemap_file_name = built_node.resulting_modulemap_file_name
+        if resulting_modulemap_file_name
+          get_product_glob([resulting_modulemap_file_name])
+        else
+          modulemap_file_path = built_node.original_modulemap_file_path
+          if modulemap_file_path && File.exist?(modulemap_file_path)
+            modulemap_file_name = File.basename(modulemap_file_path)
+            get_product_glob([modulemap_file_name])
+          end
+        end
+      end
+
+      # @param [Array<String>] file_names
+      #
+      # @return [String]
+      #
+      def get_product_glob(file_names)
         File.join(derived_data_path,
                   "**",
-                  File.basename(product_name))
+                  "{#{file_names.join(",")}}")
       end
 
       # @param [String] framework_path
@@ -110,7 +183,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,13 +61,17 @@ 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
         if node
           debug("already traversed this one")
-          graph.add_multiple_nodes(node.subgraph) unless graph.nodes.include?(node)
+          unless graph.nodes.include?(node)
+            nodes_to_add = node.subgraph.select {|subgraph_node| !graph.nodes.include?(subgraph_node)}
+            graph.add_multiple_nodes(nodes_to_add)
+          end
+
           return node
         else
           debug("adding new node")
@@ -79,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|
@@ -141,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
@@ -14,30 +19,67 @@ module XcodeArchiveCache
       #
       def extract_targets(projects)
         projects
-            .map {|project| unnest(project)}
-            .flatten
-            .uniq
-            .map(&:native_targets)
-            .flatten
-            .select {|target| !target.test_target_type?}
+          .map {|project| unnest(project)}
+          .flatten
+          .sort_by(&:path)
+          .inject([]) {|unique, current| unique.last && unique.last.path == current.path ? unique : unique + [current]}
+          .map(&:native_targets)
+          .flatten
+          .select {|target| !target.test_target_type?}
       end
 
       # @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]
@@ -60,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
@@ -68,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
@@ -77,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 || native_target.product_reference.path == product_name }
+          .first
+        
+        parsed = @product_name_to_target[product_name]
+
+        canonical ? canonical : parsed
       end
 
       private
@@ -92,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>]
@@ -106,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]
@@ -128,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_graph/node.rb

@@ -34,6 +34,10 @@ module XcodeArchiveCache
       #
       attr_accessor :build_settings
 
+      # @return [Array<Xcodeproj::Project::Object::PBXNativeTarget>]
+      #
+      attr_reader :targets_injected_to
+
       # @param [String] name
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] native_target
       # @param [Boolean] is_root
@@ -44,6 +48,7 @@ module XcodeArchiveCache
         @is_root = is_root
         @dependent = []
         @dependencies = []
+        @targets_injected_to = []
         @state = :unknown
       end
 
@@ -91,8 +96,8 @@ module XcodeArchiveCache
 
       # @return [String]
       #
-      def modulemap_file_path
-        modulemap_file = build_settings[XcodeArchiveCache::BuildSettings::MODULEMAP_FILE_KEY]
+      def original_modulemap_file_path
+        modulemap_file = modulemap_file_name
         return unless modulemap_file
 
         Pathname.new(modulemap_file).absolute? ? modulemap_file : File.join(File.dirname(native_target.project.path), modulemap_file)
@@ -100,11 +105,12 @@ module XcodeArchiveCache
 
       # @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)
+      def resulting_modulemap_file_name
+        if module_name
+          module_name + ".modulemap"
+        else
+          File.basename(modulemap_file_name)
+        end
       end
 
       # @return [String]
@@ -127,6 +133,12 @@ module XcodeArchiveCache
         build_settings[XcodeArchiveCache::BuildSettings::PRODUCT_MODULE_NAME_KEY]
       end
 
+      # @return [String]
+      #
+      def modulemap_file_name
+        build_settings[XcodeArchiveCache::BuildSettings::MODULEMAP_FILE_KEY]
+      end
+
       # @return [Array<Node>]
       #         Direct + transitive dependents
       #

data/lib/build_graph/sha_calculator.rb

@@ -2,6 +2,10 @@ module XcodeArchiveCache
   module BuildGraph
     class NodeShaCalculator
 
+      def initialize
+        @own_sha = calculate_own_sources_sha
+      end
+
       # @param [XcodeArchiveCache::BuildGraph::Node] node
       #
       def calculate(node)
@@ -24,6 +28,20 @@ module XcodeArchiveCache
 
       private
 
+      # @return [String]
+      #
+      attr_reader :own_sha
+
+      # @return [String]
+      #
+      def calculate_own_sources_sha
+        root = Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
+        source_file_glob = File.join(root.realpath.to_s, "**", "*.rb")
+        source_file_paths = Dir.glob(source_file_glob)
+
+        calculate_sha(source_file_paths)
+      end
+
       # @param [XcodeArchiveCache::BuildGraph::Node] node
       #
       # @return [Array<String>]
@@ -36,7 +54,7 @@ module XcodeArchiveCache
           inputs << list_build_phase_inputs(build_phase)
         end
 
-        modulemap_file_path = node.modulemap_file_path
+        modulemap_file_path = node.original_modulemap_file_path
         inputs << modulemap_file_path if modulemap_file_path
 
         # file path order should not affect evaluation result
@@ -74,7 +92,7 @@ module XcodeArchiveCache
       # @param [Array<String>] dependency_shas
       #
       def save_auxiliary_data(build_settings, dependency_shas, tempfile)
-        file_contents = build_settings + dependency_shas.join("\n")
+        file_contents = build_settings + dependency_shas.join("\n") + "\nXCODE-ARCHIVE-CACHE: #{own_sha}\n"
         tempfile << file_contents
         tempfile.flush
       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