xcode-archive-cache 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 192b06d6f502b86bc582ef0d588a1ff36a5a423997faa2624719c19b7ffe30e3
-  data.tar.gz: 24dc52a439387411b55215c2a653acedf6bfc96a7f346f0a8290209ffc38dcad
+  metadata.gz: 0f444a19221b84c55a31be3d82277eef653239bdec9299d65b1252c1874dae15
+  data.tar.gz: 9f1927ba1c9bf360d83a3b4febf128b069b8d846eca236a8d8f9bd848de9af24
 SHA512:
-  metadata.gz: 6103e50e46d42fca883b283455c0e702e3f7f3da1cc84074c027eb4f5748fb124e120283426c4e02b9d44c2ba03ddaceafb269931968bac06d2191316f41e4c2
-  data.tar.gz: 1bdd77278c74db8300cf0a1489792ba1c44a3f89f69bc2a39a8320cbbdf7f1828834d321b1419dc090276e103753159dcf7353ba5a0fa2d6899ee4b18fb87597
+  metadata.gz: a0b85c53b4127976dfee59597aade6e6e7d0064841b8ea240446f9f7482bf3bd438a482cc3d75bd86caa917c040fe5e9f89f3c35e07291fdb8cd08d3f5b6b9e6
+  data.tar.gz: c52f972d48a54b9331985d0b7a39f8e131a77a0e46c3cb8c0501422f313deb279b4ed9d0974fb99be7cd83f40a40feb374ae3d6f0feb73b5376089d7d574324a

data/lib/build_graph/native_target_finder.rb

@@ -5,13 +5,21 @@ module XcodeArchiveCache
       # @param [Array<Xcodeproj::Project>] projects
       #
       def initialize(projects)
-        @all_targets = projects
-                           .map {|project| unnest(project)}
-                           .flatten
-                           .uniq
-                           .map(&:native_targets)
-                           .flatten
-                           .select {|target| !target.test_target_type? }
+        @all_targets = extract_targets(projects)
+      end
+
+      # @param [Array<Xcodeproj::Project>] projects
+      #
+      # @return [Array<Xcodeproj::Project::Object::PBXNativeTarget>]
+      #
+      def extract_targets(projects)
+        projects
+            .map {|project| unnest(project)}
+            .flatten
+            .uniq
+            .map(&:native_targets)
+            .flatten
+            .select {|target| !target.test_target_type?}
       end
 
       # @param [String] platform_name
@@ -36,9 +44,26 @@ module XcodeArchiveCache
       #
       def find_for_file(file)
         if file.file_ref.is_a?(Xcodeproj::Project::Object::PBXReferenceProxy)
-          project = file.file_ref.remote_ref.container_portal_object
           product_reference_uuid = file.file_ref.remote_ref.remote_global_id_string
-          find_with_product_ref_uuid(project, product_reference_uuid)
+          target = find_with_product_ref_uuid(product_reference_uuid)
+          if target == nil
+            project = file.file_ref.remote_ref.container_portal_object
+            target = find_in_project(project, product_reference_uuid)
+
+            # allow all targets from this project
+            # to be linked to that exact project
+            #
+            # otherwise, injection will operate on different Xcodeproj::Project objects
+            # resulting to only the last target being actually removed
+            #
+            @all_targets += extract_targets([project])
+          end
+
+          if target == nil
+            raise Informative, "Target for #{file.file_ref.path} not found"
+          end
+
+          target
         elsif file.file_ref.is_a?(Xcodeproj::Project::Object::PBXFileReference)
           # products of sibling project targets are added as PBXFileReferences
           targets = find_with_product_path(file.file_ref.path)
@@ -54,7 +79,7 @@ module XcodeArchiveCache
       #
       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
+            .first
       end
 
       private
@@ -85,7 +110,16 @@ module XcodeArchiveCache
       #
       # @return [Xcodeproj::Project::Object::PBXNativeTarget]
       #
-      def find_with_product_ref_uuid(project, uuid)
+      def find_with_product_ref_uuid(uuid)
+        all_targets.select {|target| target.product_reference.uuid == uuid}.first
+      end
+
+      # @param [Xcodeproj::Project] project
+      # @param [String] uuid
+      #
+      # @return [Xcodeproj::Project::Object::PBXNativeTarget]
+      #
+      def find_in_project(project, uuid)
         project.native_targets.select {|target| target.product_reference.uuid == uuid}.first
       end
 

data/lib/injection/injector.rb

@@ -104,6 +104,7 @@ module XcodeArchiveCache
       #
       def add_header_paths(nodes)
         header_storage_paths = storage.get_all_headers_storage_paths
+        return if header_storage_paths.length == 0
 
         nodes
             .select(&:waiting_for_rebuild)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-archive-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Ilya Dyakonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj