cocoapods-alexandria 0.2.3 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46cf82205ab24e541ad33a1ca9a006bcdcca91b9d74de55bcca6f30cfd3d20a5
-  data.tar.gz: 07fb6b9a0ab2303f8101b078d36ca57afb8d3a05b954d4bbcb46e85f95d6d540
+  metadata.gz: eba5dd06d1fde3d97386d1333d408561de1e7ac99e5bc4699db45b9b7f6ab67a
+  data.tar.gz: ebc430e13e2fa6c1682487ab7cb1aa886f73cec78b5c8578f643018c179da960
 SHA512:
-  metadata.gz: 27422e274948754cc86b5d80bf18d8a4c145a33fd7702056c541d2f138b5e46bf397f5c639cdd0b4ffdc47adeb3b64e23e0ae13734b6b866c71992ce7750f5b8
-  data.tar.gz: 390bb68dbb97befcb794831b5834aa6e4520e7b4b823dfc471a54fc309c646f54fd1d56db3fb403c75dafc865a3b10a725819f0c7c0fa2a7916e7da59a94aa94
+  metadata.gz: 50ee3e10c737b7abfed342dd8d9f5d35b94ad32d8750c815122ac04b075a3fc01ce35708a42b55aea181017516bd648259aa0cfacf239e108950121be6754efb
+  data.tar.gz: 6b22e61d5c6d5e6ba795f69dfc156cdd987c5275ab6395f2ffe5f4f471d4d9a6bc85e838b2fd02da4e280b5dcc0114f21d0bb4f8a09b1c0edab42516fb27ad9f

data/lib/cocoapods-alexandria/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsAlexandria
-  VERSION = '0.2.3'
+  VERSION = '0.2.6'
 end

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

@@ -15,15 +15,17 @@ 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))
+          Pod::UI.puts "Already built '#{target.name}'."
+          build_path(target, sdk)
         else
-          xcodebuild(root_name, module_name, sdk, deployment_target)
+          xcodebuild(target, sdk, deployment_target)
         end
       }.compact
     end
@@ -34,38 +36,72 @@ module PodAlexandria
       { :ios => 'iphoneos', :osx => 'macosx', :tvos => 'appletvos', :watchos => 'watchos' }
     end
 
-    def skip_build?(target, module_name, sdk)
-      File.directory?(destination_path(module_name)) ||
-      File.directory?(build_path(target, module_name, sdk)) ||
-        !is_native_target?(target)
+    def skip_build?(target, sdk)
+      File.directory?(destination_path(target))
     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.3
+  version: 0.2.6
 platform: ruby
 authors:
 - David Jennes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods