kintsugi 0.7.5 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9210fcd7501da6106887f3ff32cd8951ecb6a81ddc156e49bb9b6e486ae37e49
-  data.tar.gz: c571e02062f74ef3cca2830401a8a74a9d554bd93fb3e3f410cec3359200971b
+  metadata.gz: 9b0413f794996391109383356f249e747af5146d987ad541f01c1f2761c65544
+  data.tar.gz: e8c2c1d36c741ca461264c3bad5f1f763e9ff515573aa47119f1a8d4512a2c2b
 SHA512:
-  metadata.gz: acd1dde008c1ddf553547285fe00b044fc4e3a25305d7c1830ab2a55b77f2ffb6a2f3b04740c8c28c1d95f2bdebe201fbe4cf2c3f1e4a5cae51b96965e1e2e51
-  data.tar.gz: 45691f167ebb859989ce64cb4f171402e8372adbab38dc76f0d1ce279008546f960a011ef66b17f0bf54b72e9b2e840cce028b3a7c5b7381415ff39f3ece7fd2
+  metadata.gz: 2be49bcadbeaafd76258414480c35128bb1e82c8ed07c1758492c16d7f2dc4bc4c7632f5e812c9ec42157c90a262c3815597f8084156325e6c8a67df773aa90f
+  data.tar.gz: d74feac0094461014eebeb2477dd7f0fd5989738c995d626c0d0e053f8df63faab4e44258b44039455929d38c28269f9630bc349617bd6b967c9b389aa4626bb

data/lib/kintsugi/apply_change_to_project.rb

@@ -306,7 +306,8 @@ module Kintsugi
         component = child_component(parent_component, change_name)
       elsif change[:added].is_a?(Array)
         (change[:added]).each do |added_change|
-          add_child_to_component(parent_component, added_change, change_path)
+          add_child_to_component(parent_component, added_change,
+                                 join_path(change_path, added_change["displayName"]))
         end
       elsif !change[:added].nil?
         raise MergeError, "Unsupported added change type for #{change[:added]}"
@@ -341,9 +342,8 @@ module Kintsugi
         else
           parent_component
         end
-      parent_change_path = change_path.split("/")[0...-1].join("/")
       add_child_to_component(non_object_list_parent, source_project_component.to_tree_hash,
-                             parent_change_path)
+                             change_path)
       component_at_path(non_object_list_parent.project, change_path)
     end
 
@@ -637,9 +637,7 @@ module Kintsugi
       end
     end
 
-    def add_child_to_component(component, change, component_change_path)
-      change_path = join_path(component_change_path, change["displayName"])
-
+    def add_child_to_component(component, change, change_path)
       if change["ProjectRef"] && change["ProductGroup"]
         add_subproject_reference(component, change, change_path)
         return
@@ -1031,13 +1029,14 @@ module Kintsugi
           next
         end
 
+        child_path = join_path(change_path, change_name)
         case change_value
         when Hash
-          add_child_to_component(component, change_value, change_path)
+          add_child_to_component(component, change_value, child_path)
         when Array
           change_value.each do |added_attribute_element|
-            add_child_to_component(component, added_attribute_element,
-                                   "#{change_path}/#{change_name}")
+            element_path = join_path(child_path, added_attribute_element["displayName"])
+            add_child_to_component(component, added_attribute_element, element_path)
           end
         else
           raise MergeError, "Trying to add attribute of unsupported type '#{change_value.class}' " \

data/lib/kintsugi/version.rb

@@ -3,6 +3,6 @@
 module Kintsugi
   # This module holds the Kintsugi version information.
   module Version
-    STRING = "0.7.5"
+    STRING = "0.7.7"
   end
 end

data/lib/kintsugi/xcodeproj_extensions.rb

@@ -136,6 +136,16 @@ module Xcodeproj
           " #{display_name.delete_prefix("plugin:")} "
         end
       end
+
+      # The original implementation is  `" #{isa} \"#{File.basename(display_name)}\"` so that means that if we have a
+      # relative path which is Path/To/Package, the item will be serialized as `XCLocalSwiftPackageReference "Package"`.
+      # And Xcode will automatically fix this to be `XCLocalSwiftPackageReference "Path/To/Package"`.
+      # So, we need to patch the implementation and make sure the whole path is used.
+      class XCLocalSwiftPackageReference
+        def ascii_plist_annotation
+          " #{isa} \"#{display_name}\" "
+        end
+      end
     end
   end