cocoapods-alexandria 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 939deeb120d224d7de1d886e55edbe77151f73b6a2d0b083aee075ffc1c9c214
-  data.tar.gz: 1c13e5daec652c151d6d01d8e6c5bccfe2d3d3efda099ae9f70c60e6d6f8f3a1
+  metadata.gz: 6d3e818c908ebf093b15067e862eb0aa6b0c4a576023b07596014806386d605b
+  data.tar.gz: 064c89f49a1d7ffe73c8e8c2f45df3bd56550fbb594388f26b92e77bedfee02f
 SHA512:
-  metadata.gz: e79bd080912d587bb7ffa66f59da8fc75c7106e30eb40efc9775dbcf48cca63660df71cd74ed4a2d3cedb6dc3229c28c15a3730d49619aaf5f0eb1c86a09f893
-  data.tar.gz: eb4e35e5c6e55efa0412a022e3ca13c00bc1f5911b62910c70ce55870ace98b5a35374864f95ba68330b21b0ecb918f211077d642325150e61ec6878015c5964
+  metadata.gz: a5cb6e45538fa2b455bd4772a0a2abeab086624ec7f597c220f19b1590346234e08cfd039c8bb10b12479a46b0c2392efc5a055aa39cf9c6c24ce1311101febc
+  data.tar.gz: b0942db92ebf9f9eac042c07ddf84ee7a7f0548b6720869abe391f973a105d6de2dd6a04560241c945232f7c247ea63d9f2421f3cbe6294edc5860ecbf66f73c

data/lib/cocoapods-alexandria/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsAlexandria
-  VERSION = '0.2.2'
+  VERSION = '0.2.5'
 end

data/lib/cocoapods-alexandria/rome/compiler.rb

@@ -15,15 +15,16 @@ module PodAlexandria
       deployment_target = target.platform_deployment_target
       target_label = target.cocoapods_target_label
 
-      # build each dependency of target
-      spec_names = target.specs.map { |spec| [spec.root.name, spec.root.module_name] }.uniq
-      
-      spec_names.map { |root_name, module_name|
-        next if skip_build?(root_name, module_name, sdk)
-        if File.directory?(build_path(target, module_name, sdk))
-          build_path(target, module_name, sdk)
+      # find & build all dependencies
+      project.all_dependencies_for(target).map { |target|
+        # skip if already built (product, or by other target)
+        next if skip_build?(target, sdk)
+
+        # may already be built (by another target)
+        if File.directory?(build_path(target, sdk))
+          build_path(target, sdk)
         else
-          xcodebuild(root_name, module_name, sdk, deployment_target)
+          xcodebuild(target, sdk, deployment_target)
         end
       }.compact
     end
@@ -34,37 +35,73 @@ module PodAlexandria
       { :ios => 'iphoneos', :osx => 'macosx', :tvos => 'appletvos', :watchos => 'watchos' }
     end
 
-    def skip_build?(target, module_name, sdk)
-      File.directory?(destination_path(module_name)) ||
-        !is_native_target?(target)
+    def skip_build?(target, sdk)
+      File.directory?(destination_path(target)) ||
+        File.directory?(build_path(target, sdk))
     end
 
-    def is_native_target?(target_name)
-      project.targets
-        .find { |t| t.name == target_name }
-        .is_a?(Xcodeproj::Project::Object::PBXNativeTarget)
-    end
-
-    def xcodebuild(target, module_name, sdk, deployment_target)
-      args = %W(-project #{sandbox.project_path.realdirpath} -scheme #{target} -configuration #{configuration} -sdk #{sdk})
+    def xcodebuild(target, sdk, deployment_target)
+      args = %W(-project #{sandbox.project_path.realdirpath} -scheme #{target.name} -configuration #{configuration} -sdk #{sdk})
       args += flags unless flags.nil? 
       
-      Pod::UI.puts "Building '#{target}' for #{sdk}..."
+      Pod::UI.puts "Building '#{target.name}' for #{sdk}..."
       Pod::Executable.execute_command 'xcodebuild', args, true
 
-      build_path(target, module_name, sdk)
+      build_path(target, sdk)
     end
 
     def project
       @project ||= Xcodeproj::Project.open(sandbox.project_path)
     end
 
-    def build_path(target, module_name, sdk)
-      "#{build_dir}/#{configuration}-#{sdk}/#{target}/#{module_name}.framework"
+    def build_path(target, sdk)
+      # Note: using target.product_name is wrong in some cases (Cocoapods project generation bug)
+      # See https://github.com/CocoaPods/CocoaPods/issues/8007
+      "#{build_dir}/#{configuration}-#{sdk}/#{target.name}/#{target.product_reference.name}"
+    end
+
+    def destination_path(target)
+      # Note: using target.product_name is wrong in some cases (Cocoapods project generation bug)
+      # See https://github.com/CocoaPods/CocoaPods/issues/8007
+      "#{destination}/#{target.product_reference.name}"
+    end
+  end
+end
+
+module Xcodeproj
+  class Project
+    module Object
+      class AbstractTarget
+        def is_native?
+          is_a?(Xcodeproj::Project::Object::PBXNativeTarget)
+        end
+      end
+
+      class PBXNativeTarget
+        def is_bundle?
+          product_type == 'com.apple.product-type.bundle'
+        end
+
+        def all_dependencies
+          dependencies
+            .filter { |d| d.target.is_native? && !d.target.is_bundle? }
+            .map { |d| [d.target] + d.target.all_dependencies }
+            .flatten.uniq
+        end
+      end
+    end
+
+    def all_dependencies_for(umbrella_target)
+      target(umbrella_target.cocoapods_target_label).all_dependencies
     end
 
-    def destination_path(module_name)
-      "#{destination}/#{module_name}.framework"
+    def target(target_name)
+      result = targets.find { |t| t.name == target_name }
+      if result.is_native?
+        return result
+      else
+        return nil
+      end
     end
   end
 end

data/lib/cocoapods-alexandria/rome/framework_cache.rb

@@ -90,12 +90,12 @@ module PodAlexandria
 
     def delete(spec)
       name = spec_modules[spec] || module_name(spec)
-      paths = Dir["#{destination}/#{name}.{framework,xcframework}"]
+      paths = Dir["#{destination}/#{name}.{a,framework,xcframework}"]
       
       if !paths.empty?
-        paths.each { |path| FileUtils.remove_dir(path, true) }
+        paths.each { |path| FileUtils.remove_entry(path, true) }
       else
-        Pod::UI.warn "🤔  Could not delete #{destination}/#{name}.(xc)framework, it does not exist! (this is normal for newly added pods)"
+        Pod::UI.warn "🤔  Could not delete cached binary for #{name}, it does not exist! (this is normal for newly added pods)"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-alexandria
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - David Jennes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods