xcoed 0.0.4 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82a2f0dbe9c4bce9cf5f5be560b0da2f4ca986d64ea8953a2a50a3f83588ab8c
-  data.tar.gz: '0916221f57884e23ddf1813b4b3fffb93ebf92a0d9a5e2a9b5009410962a028f'
+  metadata.gz: d94890cd2678b91ab943c55e57af2cfa8ad70d40f39551978be0d5ca1207ec92
+  data.tar.gz: 2ac29928257a0b809702d5f69907e115422a9afc9c37669ae6b8f03387735612
 SHA512:
-  metadata.gz: a5c28b654a7640d371a2c70040a07817ea9dd7e8c8241fceb6ecd559ebe754c11274546f02b157dc9e9b4a4b2077d591a475aa2386fa9d6be2cdba20d730b878
-  data.tar.gz: bcd2a9a24cda75cadc55103164d48ff440b28bb5fdd5be6f4ab145574cd0c6a2400c663b39dbb85c77e39a297a7a9e5354804f92558decfcc8165b4c25c482d6
+  metadata.gz: 3187585fa60727e8d700e5c40b81efd4caaf97fbc3bfae64dc68268587e43a02cac719dcd507a40d35f6d88311b87f33ad9b4cf54af36851692c4273f0f91240
+  data.tar.gz: 89e9c493afcd6831afedcba10f19da2cf3104d053c9531891242917bae78df2ecc01acbe9ce85908a8820bf270d056d1158609193d37156decbdf7f02cf816b6

data/lib/xcoed.rb

@@ -1,15 +1,29 @@
-require 'xcoed/version'
-require 'xcoed/constants'
-require 'xcodeproj'
 require 'json'
+require 'xcodeproj'
+require 'xcoed/constants'
+require 'xcoed/version'
+require 'xcoed/xcoed-swiftpm-pre-5.5'
 
 module Xcoed
   def self.integrate_package_swift!(project)
-    package_json = JSON.parse(`swift package dump-package`)
+    swiftpm_version = Gem::Version.new(`xcrun swift package --version`.split.last)
+
+    if swiftpm_version < Gem::Version.new('5.5.0')
+      XcoedSwiftPMPre5_5::integrate_package_swift!(project)
+      return
+    end
+
+    package_json = JSON.parse(`xcrun swift package dump-package`)
 
     packages = {}
     package_json['dependencies'].each do |dependency|
-      package_ref = add_swift_package_reference(project, dependency)
+      if dependency.key?('local')
+        package_ref = add_local_swift_package_reference(project, dependency['local'].first)
+      else
+        dependency = dependency['scm'].first if dependency.key?('scm')
+        package_ref = add_remote_swift_package_reference(project, dependency)
+      end
+       
       packages[dependency['name']] = package_ref
     end
 
@@ -32,26 +46,28 @@ module Xcoed
     end
   end
 
-  def self.add_swift_package_reference(project, dependency)
+  def self.add_remote_swift_package_reference(project, dependency)
     STDERR.puts dependency
-    requirement_type = dependency['requirement'].keys.first
+    requirement_type = dependency['requirement']&.keys&.first
     case requirement_type
     when 'range'
-      add_remote_swift_package_reference(project, dependency)
-    when 'localPackage'
-      add_local_swift_package_reference(project, dependency)
+      add_remote_swift_package_range_reference(project, dependency)
+    when 'branch'
+      add_remote_swift_package_branch_reference(project, dependency)
+    when 'revision'
+      add_remote_swift_package_revision_reference(project, dependency)
     else
-      raise "Unsupported package requirement `#{requirement_type}`"
+      raise "Unsupported package requirement for dependency: `#{dependency}`"
     end
   end
 
-  def self.add_remote_swift_package_reference(project, dependency)
+  def self.add_remote_swift_package_range_reference(project, dependency)
     project.root_object.package_references
-           .select { |r| r.repositoryURL.downcase == dependency['url'].downcase }
+           .select { |r| r.repositoryURL.downcase == dependency['location'].downcase }
            .each(&:remove_from_project)
 
     package_ref = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference.new(project, project.generate_uuid)
-    package_ref.repositoryURL = dependency['url']
+    package_ref.repositoryURL = dependency['location']
     package_ref.requirement = {
       'kind' => 'versionRange',
       'minimumVersion' => dependency['requirement']['range'][0]['lowerBound'],
@@ -61,12 +77,42 @@ module Xcoed
     package_ref
   end
 
+  def self.add_remote_swift_package_branch_reference(project, dependency)
+    project.root_object.package_references
+           .select { |r| r.repositoryURL.downcase == dependency['location'].downcase }
+           .each(&:remove_from_project)
+
+    package_ref = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference.new(project, project.generate_uuid)
+    package_ref.repositoryURL = dependency['location']
+    package_ref.requirement = {
+      'kind' => 'branch',
+      'branch' => dependency['requirement']['branch'].first
+    }
+    project.root_object.package_references << package_ref
+    package_ref
+  end
+
+  def self.add_remote_swift_package_revision_reference(project, dependency)
+    project.root_object.package_references
+           .select { |r| r.repositoryURL.downcase == dependency['location'].downcase }
+           .each(&:remove_from_project)
+
+    package_ref = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference.new(project, project.generate_uuid)
+    package_ref.repositoryURL = dependency['location']
+    package_ref.requirement = {
+      'kind' => 'revision',
+      'revision' => dependency['requirement']['revision'].first
+    }
+    project.root_object.package_references << package_ref
+    package_ref
+  end
+
   def self.add_local_swift_package_reference(project, dependency)
     local_packages_group = local_packages_group(project)
     local_packages_group.children
-                        .select { |c| File.expand_path(c.path).downcase == dependency['url'].downcase }
+                        .select { |c| File.expand_path(c.path).downcase == dependency['path'].downcase }
                         .each(&:remove_from_project)
-    package_ref = Xcodeproj::Project::Object::FileReferencesFactory.new_reference(local_packages_group, dependency['url'], :group)
+    package_ref = Xcodeproj::Project::Object::FileReferencesFactory.new_reference(local_packages_group, dependency['path'], :group)
     package_ref.last_known_file_type = 'folder'
     package_ref
   end

data/lib/xcoed/version.rb

@@ -1,3 +1,3 @@
 module Xcoed
-  VERSION = '0.0.4'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/lib/xcoed/xcoed-swiftpm-pre-5.5.rb

@@ -0,0 +1,113 @@
+require 'xcoed/version'
+require 'xcoed/constants'
+require 'xcodeproj'
+require 'json'
+
+module XcoedSwiftPMPre5_5
+  def self.integrate_package_swift!(project)
+    package_json = JSON.parse(`swift package dump-package`)
+
+    packages = {}
+    package_json['dependencies'].each do |dependency|
+      package_ref = add_swift_package_reference(project, dependency)
+      packages[dependency['name']] = package_ref
+    end
+
+    package_json['targets'].each do |target|
+      target_ref = project.targets.select { |t| t.name == target['name'] }.first
+      raise "Target `#{target['name']}` not found in project" if target_ref.nil?
+
+      target['dependencies'].each do |dependency|
+        by_name = dependency['byName'].first
+
+        target_ref.package_product_dependencies
+                  .select { |p| p.product_name == by_name }
+                  .each(&:remove_from_project)
+
+        package_dep = Xcodeproj::Project::Object::XCSwiftPackageProductDependency.new(project, project.generate_uuid)
+        package_dep.product_name = by_name
+
+        target_ref.package_product_dependencies << package_dep
+      end
+    end
+  end
+
+  def self.add_swift_package_reference(project, dependency)
+    STDERR.puts dependency
+    requirement_type = dependency['requirement'].keys.first
+    case requirement_type
+    when 'range'
+      add_remote_swift_package_range_reference(project, dependency)
+    when 'branch'
+      add_remote_swift_package_branch_reference(project, dependency)
+    when 'revision'
+      add_remote_swift_package_revision_reference(project, dependency)
+    when 'localPackage'
+      add_local_swift_package_reference(project, dependency)
+    else
+      raise "Unsupported package requirement `#{requirement_type}`"
+    end
+  end
+
+  def self.add_remote_swift_package_range_reference(project, dependency)
+    project.root_object.package_references
+           .select { |r| r.repositoryURL.downcase == dependency['url'].downcase }
+           .each(&:remove_from_project)
+
+    package_ref = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference.new(project, project.generate_uuid)
+    package_ref.repositoryURL = dependency['url']
+    package_ref.requirement = {
+      'kind' => 'versionRange',
+      'minimumVersion' => dependency['requirement']['range'][0]['lowerBound'],
+      'maximumVersion' => dependency['requirement']['range'][0]['upperBound']
+    }
+    project.root_object.package_references << package_ref
+    package_ref
+  end
+
+  def self.add_remote_swift_package_branch_reference(project, dependency)
+    project.root_object.package_references
+           .select { |r| r.repositoryURL.downcase == dependency['url'].downcase }
+           .each(&:remove_from_project)
+
+    package_ref = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference.new(project, project.generate_uuid)
+    package_ref.repositoryURL = dependency['url']
+    package_ref.requirement = {
+      'kind' => 'branch',
+      'branch' => dependency['requirement']['branch'].first
+    }
+    project.root_object.package_references << package_ref
+    package_ref
+  end
+
+  def self.add_remote_swift_package_revision_reference(project, dependency)
+    project.root_object.package_references
+           .select { |r| r.repositoryURL.downcase == dependency['url'].downcase }
+           .each(&:remove_from_project)
+
+    package_ref = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference.new(project, project.generate_uuid)
+    package_ref.repositoryURL = dependency['url']
+    package_ref.requirement = {
+      'kind' => 'revision',
+      'revision' => dependency['requirement']['revision'].first
+    }
+    project.root_object.package_references << package_ref
+    package_ref
+  end
+
+  def self.add_local_swift_package_reference(project, dependency)
+    local_packages_group = local_packages_group(project)
+    local_packages_group.children
+                        .select { |c| File.expand_path(c.path).downcase == dependency['url'].downcase }
+                        .each(&:remove_from_project)
+    package_ref = Xcodeproj::Project::Object::FileReferencesFactory.new_reference(local_packages_group, dependency['url'], :group)
+    package_ref.last_known_file_type = 'folder'
+    package_ref
+  end
+
+  def self.local_packages_group(project)
+    name = 'Local Packages'
+    project.main_group.groups.select { |g| g.name == name }.first ||
+      project.main_group.new_group(name)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcoed
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.1
 platform: ruby
 authors:
 - Igor Makarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hooks
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -239,6 +239,7 @@ files:
 - lib/xcoed.rb
 - lib/xcoed/constants.rb
 - lib/xcoed/version.rb
+- lib/xcoed/xcoed-swiftpm-pre-5.5.rb
 homepage: https://github.com/igor-makarov/xcoed/
 licenses:
 - MIT
@@ -258,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Add Swift Packages to an Xcode Project