cocoapods-alexandria 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27616506322af399e0045f19891817ae5ec87f1023fc1c66121b617e6b62fc2c
-  data.tar.gz: 900b0c88287e32f8c96db19fca25ab6c3eccc7ed314c29a996b9cc3734bb3670
+  metadata.gz: 53a4f9bbe821077493e3ed28b9498c8d354568a5d1db2b21325a410f01ac9174
+  data.tar.gz: dc38d21a6c95984c84398423813359c35f9c38c1d10acfff3ec1ec568749f97c
 SHA512:
-  metadata.gz: e005c66afc5ea2a076dbeb60cbbc9582713b2fd133abbd539fb993c385ffe0b27f28dea850d28e957311ab710293c248cc5f8218bc49113795719be99ed1ad6e
-  data.tar.gz: 648ba30e5d6834466f13a8370eb90dd0fd4125f7d93121c6e785e15d9af869509a8904825fea66fbb892d2bef378f3bfb184ac2efe913d10d268e1ad36bbe6ed
+  metadata.gz: 2bd60a0217002b5c9301f3ccc9cc72dffec098f5aacd479a630aa13cdcf531c53126717b3baf745a8690ac9fb6d0d22607bf1a5a2cfbf8586f9ccbf013eb277f
+  data.tar.gz: c99fd46bf20edd1e1c96ebae578d555fe761c2488e04bea00b37bfc595df310f0f200b5b253cc6e4dc1b1a655110dc00611707655fefd01254b97874eef63abf

data/lib/cocoapods-alexandria/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsAlexandria
-  VERSION = '0.2.1'
+  VERSION = '0.2.4'
 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,69 @@ 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)
+      "#{build_dir}/#{configuration}-#{sdk}/#{target.name}/#{target.product_name}.framework"
+    end
+
+    def destination_path(target)
+      "#{destination}/#{target.product_name}.framework"
+    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/xcodegen/dependencies_generator.rb

@@ -35,7 +35,7 @@ module PodAlexandria
     end
 
     def self.config_file_for_target(installer_context, target)
-      Dir["#{installer_context.sandbox_root}/Target Support Files/#{target.cocoapods_target_label}/#{target.cocoapods_target_label}.*-release.xcconfig"]
+      Dir["#{installer_context.sandbox_root}/Target Support Files/#{target.cocoapods_target_label}/#{target.cocoapods_target_label}.*release.xcconfig"]
         .first
     end
 

metadata

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