kintsugi 0.4.3 → 0.5.3

data/lib/kintsugi/apply_change_to_project.rb

@@ -5,6 +5,7 @@
 require "xcodeproj"
 
 require_relative "utils"
+require_relative "error"
 require_relative "xcodeproj_extensions"
 
 module Kintsugi
@@ -28,26 +29,28 @@ module Kintsugi
           puts "Warning: Main group doesn't exist, ignoring changes to it."
         else
           apply_change_to_component(project.root_object, "mainGroup",
-                                    change["rootObject"]["mainGroup"])
+                                    change["rootObject"]["mainGroup"], "rootObject")
         end
       end
 
       unless change["rootObject"]["projectReferences"].nil?
         apply_change_to_component(project.root_object, "projectReferences",
-                                  change["rootObject"]["projectReferences"])
+                                  change["rootObject"]["projectReferences"], "rootObject")
       end
 
       apply_change_to_component(project, "rootObject",
                                 change["rootObject"].reject { |key|
                                   %w[mainGroup projectReferences].include?(key)
-                                })
+                                }, "")
     end
 
     private
 
-    def apply_change_to_component(parent_component, change_name, change)
+    def apply_change_to_component(parent_component, change_name, change, parent_change_path)
       return if change_name == "displayName"
 
+      change_path = parent_change_path.empty? ? change_name : "#{parent_change_path}/#{change_name}"
+
       attribute_name = attribute_name_from_change_name(change_name)
       if simple_attribute?(parent_component, attribute_name)
         apply_change_to_simple_attribute(parent_component, attribute_name, change)
@@ -61,7 +64,7 @@ module Kintsugi
         component = child_component(parent_component, change_name)
 
         if component.nil?
-          add_missing_component_if_valid(parent_component, change_name, change)
+          add_missing_component_if_valid(parent_component, change_name, change, change_path)
           return
         end
       end
@@ -75,11 +78,12 @@ module Kintsugi
 
       (change[:added] || []).each do |added_change|
         is_object_list = component.is_a?(Xcodeproj::Project::ObjectList)
-        add_child_to_component(is_object_list ? parent_component : component, added_change)
+        add_child_to_component(is_object_list ? parent_component : component, added_change,
+                               change_path)
       end
 
       subchanges_of_change(change).each do |subchange_name, subchange|
-        apply_change_to_component(component, subchange_name, subchange)
+        apply_change_to_component(component, subchange_name, subchange, change_path)
       end
     end
 
@@ -92,16 +96,16 @@ module Kintsugi
     end
 
     def attribute_name_from_change_name(change_name)
-      if change_name == "fileEncoding"
+      if %w[fileEncoding repositoryURL].include?(change_name)
         change_name.to_sym
       else
         Xcodeproj::Project::Object::CaseConverter.convert_to_ruby(change_name)
       end
     end
 
-    def add_missing_component_if_valid(parent_component, change_name, change)
+    def add_missing_component_if_valid(parent_component, change_name, change, change_path)
       if change[:added] && change.compact.count == 1
-        add_child_to_component(parent_component, change[:added])
+        add_child_to_component(parent_component, change[:added], change_path)
         return
       end
 
@@ -111,10 +115,7 @@ module Kintsugi
 
     def replace_component_with_new_type(parent_component, name_in_parent_component, change)
       old_component = parent_component.send(name_in_parent_component)
-
-      new_component = parent_component.project.new(
-        Module.const_get("Xcodeproj::Project::#{change["isa"][:added]}")
-      )
+      new_component = component_of_new_type(parent_component, change, old_component)
 
       copy_attributes_to_new_component(old_component, new_component)
 
@@ -122,6 +123,27 @@ module Kintsugi
       new_component
     end
 
+    def component_of_new_type(parent_component, change, old_component)
+      if change["isa"][:added] == "PBXFileReference"
+        path = (change["path"] && change["path"][:added]) || old_component.path
+        case parent_component
+        when Xcodeproj::Project::XCBuildConfiguration
+          parent_component.base_configuration_reference = find_file(parent_component.project, path)
+          return parent_component.base_configuration_reference
+        when Xcodeproj::Project::PBXNativeTarget
+          parent_component.product_reference = find_file(parent_component.project, path)
+          return parent_component.product_reference
+        when Xcodeproj::Project::PBXBuildFile
+          parent_component.file_ref = find_file(parent_component.project, path)
+          return parent_component.file_ref
+        end
+      end
+
+      parent_component.project.new(
+        Module.const_get("Xcodeproj::Project::#{change["isa"][:added]}")
+      )
+    end
+
     def copy_attributes_to_new_component(old_component, new_component)
       # The change won't describe the attributes that haven't changed, therefore the attributes
       # are copied to the new component.
@@ -164,15 +186,8 @@ module Kintsugi
     end
 
     def simple_attribute_value_with_change(old_value, change)
-      new_value = nil
-
-      if change.key?(:removed)
-        new_value = apply_removal_to_simple_attribute(old_value, change[:removed], change[:added])
-      end
-
-      if change.key?(:added)
-        new_value = apply_addition_to_simple_attribute(old_value, change[:added])
-      end
+      type = simple_attribute_type(old_value, change[:removed], change[:added])
+      new_value = new_simple_attribute_value(type, old_value, change[:removed], change[:added])
 
       subchanges_of_change(change).each do |subchange_name, subchange_value|
         new_value = new_value || old_value || {}
@@ -183,13 +198,67 @@ module Kintsugi
       new_value
     end
 
-    def apply_removal_to_simple_attribute(old_value, removed_change, added_change)
-      case removed_change
-      when Array
-        (old_value || []) - removed_change
-      when Hash
-        (old_value || {}).reject do |key, value|
-          if value != removed_change[key] && added_change[key] != value
+    def simple_attribute_type(old_value, removed_change, added_change)
+      types = [old_value.class, removed_change.class, added_change.class]
+
+      if types.include?(Hash)
+        unless types.to_set.subset?([Hash, NilClass].to_set)
+          raise MergeError, "Cannot apply changes because the types are not compatible. Existing " \
+            "value: '#{old_value}', removed change: '#{removed_change}', added change: " \
+            "'#{added_change}'"
+        end
+        Hash
+      elsif types.include?(Array)
+        unless types.to_set.subset?([Array, String, NilClass].to_set)
+          raise MergeError, "Cannot apply changes because the types are not compatible. Existing " \
+            "value: '#{old_value}', removed change: '#{removed_change}', added change: " \
+            "'#{added_change}'"
+        end
+        Array
+      elsif types.include?(String)
+        unless types.to_set.subset?([String, NilClass].to_set)
+          raise MergeError, "Cannot apply changes because the types are not compatible. Existing " \
+            "value: '#{old_value}', removed change: '#{removed_change}', added change: " \
+            "'#{added_change}'"
+        end
+        String
+      else
+        raise MergeError, "Unsupported types of all of the values. Existing value: " \
+          "'#{old_value}', removed change: '#{removed_change}', added change: '#{added_change}'"
+      end
+    end
+
+    def new_simple_attribute_value(type, old_value, removed_change, added_change)
+      if type == Hash
+        new_hash_simple_attribute_value(old_value, removed_change, added_change)
+      elsif type == Array
+        new_array_simple_attribute_value(old_value, removed_change, added_change)
+      elsif type == String
+        new_string_simple_attribute_value(old_value, removed_change, added_change)
+      else
+        raise MergeError, "Unsupported types of all of the values. Existing value: " \
+          "'#{old_value}', removed change: '#{removed_change}', added change: '#{added_change}'"
+      end
+    end
+
+    def new_hash_simple_attribute_value(old_value, removed_change, added_change)
+      return added_change if ((old_value || {}).to_a - (removed_change || {}).to_a).empty?
+
+      # First apply the added change to see if there are any conflicts with it.
+      new_value = (old_value || {}).merge(added_change || {})
+
+      unless (old_value.to_a - new_value.to_a).empty?
+        raise MergeError, "New hash #{change} contains values that conflict with old hash " \
+          "#{old_value}"
+      end
+
+      if removed_change.nil?
+        return new_value
+      end
+
+      new_value
+        .reject do |key, value|
+          if value != removed_change[key] && value != (added_change || {})[key]
             raise MergeError, "Trying to remove value '#{removed_change[key]}' of hash with key " \
               "'#{key}' but it changed to #{value}. This is considered a conflict that should be " \
               "resolved manually."
@@ -197,41 +266,31 @@ module Kintsugi
 
           removed_change.key?(key)
         end
-      when String
-        if old_value != removed_change && !old_value.nil? && added_change != old_value
-          raise MergeError, "Trying to remove value '#{removed_change}', but the existing value " \
-            "is '#{old_value}'. This is considered a conflict that should be resolved manually."
-        end
+    end
 
-        nil
-      when nil
-        nil
-      else
-        raise MergeError, "Unsupported change #{removed_change} of type #{removed_change.class}"
+    def new_array_simple_attribute_value(old_value, removed_change, added_change)
+      if old_value.is_a?(String)
+        old_value = [old_value]
+      end
+      if removed_change.is_a?(String)
+        removed_change = [removed_change]
+      end
+      if added_change.is_a?(String)
+        added_change = [added_change]
       end
-    end
 
-    def apply_addition_to_simple_attribute(old_value, change)
-      case change
-      when Array
-        (old_value || []) + change
-      when Hash
-        old_value ||= {}
-        new_value = old_value.merge(change)
+      return added_change if ((old_value || []) - (removed_change || [])).empty?
 
-        unless (old_value.to_a - new_value.to_a).empty?
-          raise MergeError, "New hash #{change} contains values that conflict with old hash " \
-            "#{old_value}"
-        end
+      (old_value || []) + (added_change || []) - (removed_change || [])
+    end
 
-        new_value
-      when String
-        change
-      when nil
-        nil
-      else
-        raise MergeError, "Unsupported change #{change} of type #{change.class}"
+    def new_string_simple_attribute_value(old_value, removed_change, added_change)
+      if old_value != removed_change && !old_value.nil? && added_change != old_value
+        raise MergeError, "Trying to remove value '#{removed_change || "nil"}', but the existing " \
+          "value is '#{old_value}'. This is considered a conflict that should be resolved manually."
       end
+
+      added_change
     end
 
     def remove_component(component, change)
@@ -260,56 +319,94 @@ module Kintsugi
       end
     end
 
-    def add_child_to_component(component, change)
+    def add_child_to_component(component, change, component_change_path)
+      change_path = "#{component_change_path}/#{change["displayName"]}"
+
       if change["ProjectRef"] && change["ProductGroup"]
-        add_subproject_reference(component, change)
+        add_subproject_reference(component, change, change_path)
         return
       end
 
       case change["isa"]
       when "PBXNativeTarget"
-        add_target(component, change)
+        add_target(component, change, change_path)
       when "PBXAggregateTarget"
-        add_aggregate_target(component, change)
+        add_aggregate_target(component, change, change_path)
       when "PBXFileReference"
-        add_file_reference(component, change)
+        add_file_reference(component, change, change_path)
       when "PBXGroup"
-        add_group(component, change)
+        add_group(component, change, change_path)
       when "PBXContainerItemProxy"
-        add_container_item_proxy(component, change)
+        add_container_item_proxy(component, change, change_path)
       when "PBXTargetDependency"
-        add_target_dependency(component, change)
+        add_target_dependency(component, change, change_path)
       when "PBXBuildFile"
-        add_build_file(component, change)
+        add_build_file(component, change, change_path)
       when "XCConfigurationList"
-        add_build_configuration_list(component, change)
+        add_build_configuration_list(component, change, change_path)
       when "XCBuildConfiguration"
-        add_build_configuration(component, change)
+        add_build_configuration(component, change, change_path)
       when "PBXHeadersBuildPhase"
-        add_headers_build_phase(component, change)
+        add_headers_build_phase(component, change, change_path)
       when "PBXSourcesBuildPhase"
-        add_sources_build_phase(component, change)
+        add_sources_build_phase(component, change, change_path)
       when "PBXCopyFilesBuildPhase"
-        add_copy_files_build_phase(component, change)
+        add_copy_files_build_phase(component, change, change_path)
       when "PBXShellScriptBuildPhase"
-        add_shell_script_build_phase(component, change)
+        add_shell_script_build_phase(component, change, change_path)
       when "PBXFrameworksBuildPhase"
-        add_frameworks_build_phase(component, change)
+        add_frameworks_build_phase(component, change, change_path)
       when "PBXResourcesBuildPhase"
-        add_resources_build_phase(component, change)
+        add_resources_build_phase(component, change, change_path)
       when "PBXBuildRule"
-        add_build_rule(component, change)
+        add_build_rule(component, change, change_path)
       when "PBXVariantGroup"
-        add_variant_group(component, change)
+        add_variant_group(component, change, change_path)
       when "PBXReferenceProxy"
-        add_reference_proxy(component, change)
+        add_reference_proxy(component, change, change_path)
+      when "XCSwiftPackageProductDependency"
+        add_swift_package_product_dependency(component, change, change_path)
+      when "XCRemoteSwiftPackageReference"
+        add_remote_swift_package_reference(component, change, change_path)
       else
         raise MergeError, "Trying to add unsupported component type #{change["isa"]}. Full " \
           "component change is: #{change}"
       end
     end
 
-    def add_reference_proxy(containing_component, change)
+    def add_remote_swift_package_reference(containing_component, change, change_path)
+      remote_swift_package_reference =
+        containing_component.project.new(Xcodeproj::Project::XCRemoteSwiftPackageReference)
+      add_attributes_to_component(remote_swift_package_reference, change, change_path)
+
+      case containing_component
+      when Xcodeproj::Project::XCSwiftPackageProductDependency
+        containing_component.package = remote_swift_package_reference
+      when Xcodeproj::Project::PBXProject
+        containing_component.package_references << remote_swift_package_reference
+      else
+        raise MergeError, "Trying to add remote swift package reference to an unsupported " \
+          "component type #{containing_component.isa}. Change is: #{change}"
+      end
+    end
+
+    def add_swift_package_product_dependency(containing_component, change, change_path)
+      swift_package_product_dependency =
+        containing_component.project.new(Xcodeproj::Project::XCSwiftPackageProductDependency)
+      add_attributes_to_component(swift_package_product_dependency, change, change_path)
+
+      case containing_component
+      when Xcodeproj::Project::PBXBuildFile
+        containing_component.product_ref = swift_package_product_dependency
+      when Xcodeproj::Project::PBXNativeTarget
+        containing_component.package_product_dependencies << swift_package_product_dependency
+      else
+        raise MergeError, "Trying to add swift package product dependency to an unsupported " \
+          "component type #{containing_component.isa}. Change is: #{change}"
+      end
+    end
+
+    def add_reference_proxy(containing_component, change, change_path)
       case containing_component
       when Xcodeproj::Project::PBXBuildFile
         # If there are two file references that refer to the same file, one with a build file and
@@ -331,74 +428,78 @@ module Kintsugi
       when Xcodeproj::Project::PBXGroup
         reference_proxy = containing_component.project.new(Xcodeproj::Project::PBXReferenceProxy)
         containing_component << reference_proxy
-        add_attributes_to_component(reference_proxy, change)
+        add_attributes_to_component(reference_proxy, change, change_path)
       else
         raise MergeError, "Trying to add reference proxy to an unsupported component type " \
           "#{containing_component.isa}. Change is: #{change}"
       end
     end
 
-    def add_variant_group(containing_component, change)
+    def add_variant_group(containing_component, change, change_path)
       case containing_component
       when Xcodeproj::Project::PBXBuildFile
         containing_component.file_ref =
           find_variant_group(containing_component.project, change["displayName"])
       when Xcodeproj::Project::PBXGroup, Xcodeproj::Project::PBXVariantGroup
+        unless adding_files_and_groups_allowed?(change_path)
+          return
+        end
+
         variant_group = containing_component.project.new(Xcodeproj::Project::PBXVariantGroup)
         containing_component.children << variant_group
-        add_attributes_to_component(variant_group, change)
+        add_attributes_to_component(variant_group, change, change_path)
       else
         raise MergeError, "Trying to add variant group to an unsupported component type " \
           "#{containing_component.isa}. Change is: #{change}"
       end
     end
 
-    def add_build_rule(target, change)
+    def add_build_rule(target, change, change_path)
       build_rule = target.project.new(Xcodeproj::Project::PBXBuildRule)
       target.build_rules << build_rule
-      add_attributes_to_component(build_rule, change)
+      add_attributes_to_component(build_rule, change, change_path)
     end
 
-    def add_shell_script_build_phase(target, change)
+    def add_shell_script_build_phase(target, change, change_path)
       build_phase = target.new_shell_script_build_phase(change["displayName"])
-      add_attributes_to_component(build_phase, change)
+      add_attributes_to_component(build_phase, change, change_path)
     end
 
-    def add_headers_build_phase(target, change)
-      add_attributes_to_component(target.headers_build_phase, change)
+    def add_headers_build_phase(target, change, change_path)
+      add_attributes_to_component(target.headers_build_phase, change, change_path)
     end
 
-    def add_sources_build_phase(target, change)
-      add_attributes_to_component(target.source_build_phase, change)
+    def add_sources_build_phase(target, change, change_path)
+      add_attributes_to_component(target.source_build_phase, change, change_path)
     end
 
-    def add_frameworks_build_phase(target, change)
-      add_attributes_to_component(target.frameworks_build_phase, change)
+    def add_frameworks_build_phase(target, change, change_path)
+      add_attributes_to_component(target.frameworks_build_phase, change, change_path)
     end
 
-    def add_resources_build_phase(target, change)
-      add_attributes_to_component(target.resources_build_phase, change)
+    def add_resources_build_phase(target, change, change_path)
+      add_attributes_to_component(target.resources_build_phase, change, change_path)
     end
 
-    def add_copy_files_build_phase(target, change)
+    def add_copy_files_build_phase(target, change, change_path)
       copy_files_phase_name = change["displayName"] == "CopyFiles" ? nil : change["displayName"]
       copy_files_phase = target.new_copy_files_build_phase(copy_files_phase_name)
 
-      add_attributes_to_component(copy_files_phase, change)
+      add_attributes_to_component(copy_files_phase, change, change_path)
     end
 
-    def add_build_configuration_list(target, change)
+    def add_build_configuration_list(target, change, change_path)
       target.build_configuration_list = target.project.new(Xcodeproj::Project::XCConfigurationList)
-      add_attributes_to_component(target.build_configuration_list, change)
+      add_attributes_to_component(target.build_configuration_list, change, change_path)
     end
 
-    def add_build_configuration(configuration_list, change)
+    def add_build_configuration(configuration_list, change, change_path)
       build_configuration = configuration_list.project.new(Xcodeproj::Project::XCBuildConfiguration)
       configuration_list.build_configurations << build_configuration
-      add_attributes_to_component(build_configuration, change)
+      add_attributes_to_component(build_configuration, change, change_path)
     end
 
-    def add_build_file(build_phase, change)
+    def add_build_file(build_phase, change, change_path)
       if change["fileRef"].nil?
         puts "Warning: Trying to add a build file without any file reference to build phase " \
           "'#{build_phase}'"
@@ -407,7 +508,7 @@ module Kintsugi
 
       build_file = build_phase.project.new(Xcodeproj::Project::PBXBuildFile)
       build_phase.files << build_file
-      add_attributes_to_component(build_file, change)
+      add_attributes_to_component(build_file, change, change_path)
     end
 
     def find_variant_group(project, display_name)
@@ -416,7 +517,7 @@ module Kintsugi
       end
     end
 
-    def add_target_dependency(target, change)
+    def add_target_dependency(target, change, change_path)
       target_dependency = find_target(target.project, change["displayName"])
 
       if target_dependency
@@ -427,14 +528,14 @@ module Kintsugi
       target_dependency = target.project.new(Xcodeproj::Project::PBXTargetDependency)
 
       target.dependencies << target_dependency
-      add_attributes_to_component(target_dependency, change)
+      add_attributes_to_component(target_dependency, change, change_path)
     end
 
     def find_target(project, display_name)
       project.targets.find { |target| target.display_name == display_name }
     end
 
-    def add_container_item_proxy(component, change)
+    def add_container_item_proxy(component, change, change_path)
       container_proxy = component.project.new(Xcodeproj::Project::PBXContainerItemProxy)
       container_proxy.container_portal = find_containing_project_uuid(component.project, change)
 
@@ -447,7 +548,8 @@ module Kintsugi
         raise MergeError, "Trying to add container item proxy to an unsupported component type " \
           "#{containing_component.isa}. Change is: #{change}"
       end
-      add_attributes_to_component(container_proxy, change, ignore_keys: ["containerPortal"])
+      add_attributes_to_component(container_proxy, change, change_path,
+                                  ignore_keys: ["containerPortal"])
     end
 
     def find_containing_project_uuid(project, container_item_proxy_change)
@@ -478,16 +580,22 @@ module Kintsugi
       container_item_proxies.first.container_portal
     end
 
-    def add_subproject_reference(root_object, project_reference_change)
+    def add_subproject_reference(root_object, project_reference_change, change_path)
       filter_subproject_without_project_references = lambda do |file_reference|
         root_object.project_references.find do |project_reference|
           project_reference.project_ref.uuid == file_reference.uuid
         end.nil?
       end
       subproject_reference =
-        find_file(root_object.project, project_reference_change["ProjectRef"],
+        find_file(root_object.project, project_reference_change["ProjectRef"]["path"],
                   file_filter: filter_subproject_without_project_references)
 
+      unless subproject_reference
+        raise MergeError, "No file reference was found for project reference with change " \
+          "#{project_reference_change}. This might mean that the file used to exist in the " \
+          "project the but was removed at some point"
+      end
+
       attribute =
         Xcodeproj::Project::PBXProject.references_by_keys_attributes
                                       .find { |attrb| attrb.name == :project_references }
@@ -498,7 +606,7 @@ module Kintsugi
       updated_project_reference_change =
         change_with_updated_subproject_uuid(project_reference_change, subproject_reference.uuid)
       add_attributes_to_component(project_reference, updated_project_reference_change,
-                                  ignore_keys: ["ProjectRef"])
+                                  change_path, ignore_keys: ["ProjectRef"])
     end
 
     def change_with_updated_subproject_uuid(change, subproject_reference_uuid)
@@ -510,19 +618,19 @@ module Kintsugi
       new_change
     end
 
-    def add_target(root_object, change)
+    def add_target(root_object, change, change_path)
       target = root_object.project.new(Xcodeproj::Project::PBXNativeTarget)
       root_object.project.targets << target
-      add_attributes_to_component(target, change)
+      add_attributes_to_component(target, change, change_path)
     end
 
-    def add_aggregate_target(root_object, change)
+    def add_aggregate_target(root_object, change, change_path)
       target = root_object.project.new(Xcodeproj::Project::PBXAggregateTarget)
       root_object.project.targets << target
-      add_attributes_to_component(target, change)
+      add_attributes_to_component(target, change, change_path)
     end
 
-    def add_file_reference(containing_component, change)
+    def add_file_reference(containing_component, change, change_path)
       # base configuration reference and product reference always reference a file that exists
       # inside a group, therefore in these cases the file is searched for.
       # In the case of group and variant group, the file can't exist in another group, therefore a
@@ -530,25 +638,41 @@ module Kintsugi
       case containing_component
       when Xcodeproj::Project::XCBuildConfiguration
         containing_component.base_configuration_reference =
-          find_file(containing_component.project, change)
+          find_file(containing_component.project, change["path"])
       when Xcodeproj::Project::PBXNativeTarget
-        containing_component.product_reference = find_file(containing_component.project, change)
+        containing_component.product_reference =
+          find_file(containing_component.project, change["path"])
       when Xcodeproj::Project::PBXBuildFile
-        containing_component.file_ref = find_file(containing_component.project, change)
+        containing_component.file_ref = find_file(containing_component.project, change["path"])
       when Xcodeproj::Project::PBXGroup, Xcodeproj::Project::PBXVariantGroup
+        unless adding_files_and_groups_allowed?(change_path)
+          return
+        end
+
         file_reference = containing_component.project.new(Xcodeproj::Project::PBXFileReference)
         containing_component.children << file_reference
 
-        # For some reason, `include_in_index` is set to `1` by default.
+        # For some reason, `include_in_index` is set to `1` and `source_tree` to `SDKROOT` by
+        # default.
         file_reference.include_in_index = nil
-        add_attributes_to_component(file_reference, change)
+        file_reference.source_tree = nil
+        add_attributes_to_component(file_reference, change, change_path)
       else
         raise MergeError, "Trying to add file reference to an unsupported component type " \
           "#{containing_component.isa}. Change is: #{change}"
       end
     end
 
-    def add_group(containing_component, change)
+    def adding_files_and_groups_allowed?(change_path)
+      change_path.start_with?("rootObject/mainGroup") ||
+        change_path.start_with?("rootObject/projectReferences")
+    end
+
+    def add_group(containing_component, change, change_path)
+      unless adding_files_and_groups_allowed?(change_path)
+        return
+      end
+
       case containing_component
       when Xcodeproj::Project::ObjectDictionary
         # It is assumed that an `ObjectDictionary` always represents a project reference.
@@ -562,25 +686,29 @@ module Kintsugi
           "#{containing_component.isa}. Change is: #{change}"
       end
 
-      add_attributes_to_component(new_group, change)
+      add_attributes_to_component(new_group, change, change_path)
     end
 
-    def add_attributes_to_component(component, change, ignore_keys: [])
+    def add_attributes_to_component(component, change, change_path, ignore_keys: [])
       change.each do |change_name, change_value|
         next if (%w[isa displayName] + ignore_keys).include?(change_name)
 
         attribute_name = attribute_name_from_change_name(change_name)
         if simple_attribute?(component, attribute_name)
-          apply_change_to_simple_attribute(component, attribute_name, {added: change_value})
+          simple_attribute_change = {
+            added: change_value,
+            removed: simple_attribute_default_value(component, attribute_name)
+          }
+          apply_change_to_simple_attribute(component, attribute_name, simple_attribute_change)
           next
         end
 
         case change_value
         when Hash
-          add_child_to_component(component, change_value)
+          add_child_to_component(component, change_value, change_path)
         when Array
           change_value.each do |added_attribute_element|
-            add_child_to_component(component, added_attribute_element)
+            add_child_to_component(component, added_attribute_element, change_path)
           end
         else
           raise MergeError, "Trying to add attribute of unsupported type '#{change_value.class}' " \
@@ -589,16 +717,20 @@ module Kintsugi
       end
     end
 
-    def find_file(project, file_reference_change, file_filter: ->(_) { true })
+    def simple_attribute_default_value(component, attribute_name)
+      component.simple_attributes.find do |attribute|
+        attribute.name == attribute_name
+      end.default_value
+    end
+
+    def find_file(project, path, file_filter: ->(_) { true })
       file_references = project.files.select do |file_reference|
-        file_reference.path == file_reference_change["path"] && file_filter.call(file_reference)
+        file_reference.path == path && file_filter.call(file_reference)
       end
       if file_references.length > 1
-        puts "Debug: Found more than one matching file with path " \
-          "'#{file_reference_change["path"]}'. Using the first one."
+        puts "Debug: Found more than one matching file with path '#{path}'. Using the first one."
       elsif file_references.empty?
-        puts "Debug: No file reference found for file with path " \
-          "'#{file_reference_change["path"]}'."
+        puts "Debug: No file reference found for file with path '#{path}'."
         return
       end