censorius 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46b3d4beed818e6c6b9edcd78043a71cbde0b816dc4b35d04acdc0ac39e2d3d3
-  data.tar.gz: 63d77b8ebc1e068335831916a1e4424439d9a6db1a619cbce24c410044ed471f
+  metadata.gz: d7500f0e7dc03a9472fc453a92e7ca7f090b9fc0ee1b8641f088c3fd432af4a8
+  data.tar.gz: 4c248662afebf76b803742d01f53d21207e69a849e44f57e76a5403a86178968
 SHA512:
-  metadata.gz: 9a9c243ac1c3b97ac2b4da903fad51b5f9dce5fd70f4600b43889a75d40a79cb33f6c559fc0f45faa102a5eb7b5c16af1ebd62991643ad804cc26c4ab38f3c2b
-  data.tar.gz: f26db090293d4c60c36114565a03bea7d9a4d9c852a4a07a2e8a1234d35086c440a7de601764f38cce88c6ac4daf629ab95f2ec76f343c68a01e4c50dad8f7c7
+  metadata.gz: a135f6714a83ff0f81d682a7f4b4ef4abd8f830b056d4c79b63568cf791ed56429a9b2b8adf8c5f10cdcf075347e78b772d32a09f6c33551629ff5d0140154d8
+  data.tar.gz: 1a0ef97777f3840a123dff9a522b5591783fd53155e002b87e20d4d56baed1b7ffbe29e95b15b4d3c8feeed7c902c083270507a7748319781820805caedf952e

data/lib/censorius/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Censorius
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/lib/censorius.rb

@@ -47,7 +47,7 @@ module Censorius
       when Xcodeproj::Project::Object::XCLocalSwiftPackageReference
         generate_paths_local_swift_package_reference(object, parent_path)
       when Xcodeproj::Project::Object::XCSwiftPackageProductDependency
-        generate_paths_remote_swift_package_product_dependency(object, parent_path)
+        generate_paths_swift_package_product_dependency(object, parent_path)
       else
         raise "Unrecognized: #{object.class}, at: #{parent_path}"
       end
@@ -59,12 +59,12 @@ module Censorius
       @paths_by_object[project] = path = "PBXProject(#{project.name})"
       generate_paths(project.main_group, path)
       generate_paths(project.build_configuration_list, path)
-      project.targets.each do |target|
-        generate_paths(target, path)
-      end
       project.package_references.each do |package_reference|
         generate_paths(package_reference, path)
       end
+      project.targets.each do |target|
+        generate_paths(target, path)
+      end
     end
 
     def generate_paths_configuration_list(configuration_list, parent_path)
@@ -80,6 +80,11 @@ module Censorius
 
     def generate_paths_target(target, parent_path)
       @paths_by_object[target] = path = "#{parent_path}/#{target.class.name.split('::').last}(#{target.name})"
+      if target.respond_to?(:package_product_dependencies)
+        target.package_product_dependencies.each do |dependency|
+          generate_paths(dependency, path)
+        end
+      end
       target.build_phases.each do |phase|
         generate_paths(phase, path)
       end
@@ -92,11 +97,6 @@ module Censorius
       target.dependencies.each do |dependency|
         generate_paths(dependency, path)
       end
-      if target.respond_to?(:package_product_dependencies)
-        target.package_product_dependencies.each do |dependency|
-          generate_paths(dependency, path)
-        end
-      end
     end
 
     def generate_paths_phase(phase, parent_path)
@@ -111,7 +111,7 @@ module Censorius
         file_ref_path = generate_paths(build_file.file_ref)
         @paths_by_object[build_file] = "#{parent_path}/PBXBuildFile(#{file_ref_path})"
       elsif build_file.product_ref
-        product_ref_path = generate_paths(build_file.product_ref)
+        product_ref_path = @paths_by_object[build_file.product_ref]
         @paths_by_object[build_file] = "#{parent_path}/PBXBuildFile(#{product_ref_path})"
       else
         raise "Unsupported: #{build_file}"
@@ -149,7 +149,7 @@ module Censorius
         @paths_by_object[dependency] = path = "#{parent_path}/PBXTargetDependency(#{dependency.name})"
         generate_paths(dependency.target_proxy, path)
       elsif dependency.product_ref
-        product_ref_path = generate_paths(dependency.product_ref)
+        product_ref_path = @paths_by_object[dependency.product_ref]
         @paths_by_object[dependency] = "#{parent_path}/PBXTargetDependency(#{product_ref_path})"
       else
         raise "Unsupported: #{dependency}"
@@ -185,8 +185,12 @@ module Censorius
       @paths_by_object[reference] = "#{parent_path}/XCLocalSwiftPackageReference(#{params.join(', ')})"
     end
 
-    def generate_paths_remote_swift_package_product_dependency(dependency, parent_path)
-      @paths_by_object[dependency] = "#{parent_path}/XCSwiftPackageProductDependency(#{dependency.product_name})"
+    def generate_paths_swift_package_product_dependency(dependency, parent_path)
+      params = [
+        @paths_by_object[dependency.package],
+        dependency.product_name
+      ]
+      @paths_by_object[dependency] = "#{parent_path}/XCSwiftPackageProductDependency(#{params.join(', ')})"
     end
 
     def write_debug_paths

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: censorius
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Igor Makarov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-20 00:00:00.000000000 Z
+date: 2024-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj