Merge pull request #919 from taphouseio/fix-local-package

Use relative_path for local Swift packages
CocoaPods · Sep 12, 2023 · ea0cc26 · ea0cc26
2 parents 2ce68b6 + 4933515
commit ea0cc26
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/xcodeproj/project/object/swift_package_local_reference.rb b/lib/xcodeproj/project/object/swift_package_local_reference.rb
@@ -10,6 +10,11 @@ class XCLocalSwiftPackageReference < AbstractObject
         #
         attribute :path, String
 
+        # @return [String] the repository path where the package is located relative
+        #                  to the Xcode project.
+        #
+        attribute :relative_path, String
+
         # @!group AbstractObject Hooks
         #--------------------------------------#
 
@@ -20,7 +25,7 @@ def ascii_plist_annotation
         # @return [String] the path of the local Swift package reference.
         #
         def display_name
-          return path if path
+          return relative_path if relative_path
           super
         end
       end

diff --git a/spec/project/object/swift_package_local_reference_spec.rb b/spec/project/object/swift_package_local_reference_spec.rb
@@ -11,12 +11,12 @@ module ProjectSpecs
     end
 
     it 'returns path for display_name if path is set' do
-      @proxy.path = '../path'
+      @proxy.relative_path = '../path'
       @proxy.display_name.should == '../path'
     end
 
     it 'returns the ascii plist annotation with the last component of path' do
-      @proxy.path = '../path'
+      @proxy.relative_path = '../path'
       @proxy.ascii_plist_annotation.should == ' XCLocalSwiftPackageReference "path" '
     end
   end