cocoapods-alexandria 0.2.6 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eba5dd06d1fde3d97386d1333d408561de1e7ac99e5bc4699db45b9b7f6ab67a
-  data.tar.gz: ebc430e13e2fa6c1682487ab7cb1aa886f73cec78b5c8578f643018c179da960
+  metadata.gz: 16689da9df218088e945e9bd5190c859f4caa49f7c386ccc494f574d457653cf
+  data.tar.gz: 8d0bacb4327067501e4f2a34c4dc31922cfed795d33bf3080cf211dde1c45f16
 SHA512:
-  metadata.gz: 50ee3e10c737b7abfed342dd8d9f5d35b94ad32d8750c815122ac04b075a3fc01ce35708a42b55aea181017516bd648259aa0cfacf239e108950121be6754efb
-  data.tar.gz: 6b22e61d5c6d5e6ba795f69dfc156cdd987c5275ab6395f2ffe5f4f471d4d9a6bc85e838b2fd02da4e280b5dcc0114f21d0bb4f8a09b1c0edab42516fb27ad9f
+  metadata.gz: d1cc5ab209cbfc294c14af092d7bec073c48be29392e40e17e0ff6c3eb39f0f53a5a5f2173f7c4c8dc556e0620d3be675645eafc81501c0b8138a9ff0d97cb58
+  data.tar.gz: b92845b7f530a63ef5ec257d7794442353fd15bec10c67db797010a6ddfcd04b3683a8445a8ffd600762aa84a927310e9df3994d560279b7247346b912efae4a

data/lib/cocoapods-alexandria/gem_version.rb

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

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

@@ -22,11 +22,13 @@ module PodAlexandria
 
         # 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)
+          Pod::UI.puts "Already built '#{target.name}', probably by another dependency."
         else
+          Pod::UI.puts "Building '#{target.name}' for #{sdk}..."
           xcodebuild(target, sdk, deployment_target)
         end
+
+        build_path(target, sdk)
       }.compact
     end
 
@@ -44,10 +46,7 @@ module PodAlexandria
       args = %W(-project #{sandbox.project_path.realdirpath} -scheme #{target.name} -configuration #{configuration} -sdk #{sdk})
       args += flags unless flags.nil? 
       
-      Pod::UI.puts "Building '#{target.name}' for #{sdk}..."
       Pod::Executable.execute_command 'xcodebuild', args, true
-
-      build_path(target, sdk)
     end
 
     def project
@@ -55,15 +54,11 @@ module PodAlexandria
     end
 
     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}"
+      "#{build_dir}/#{configuration}-#{sdk}/#{target.name}/#{target.product_path}"
     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}"
+      "#{destination}/#{target.product_path}"
     end
   end
 end
@@ -88,6 +83,14 @@ module Xcodeproj
             .map { |d| [d.target] + d.target.all_dependencies }
             .flatten.uniq
         end
+
+        # Note: using target.product_name is wrong in some cases (Cocoapods project generation bug)
+        # See https://github.com/CocoaPods/CocoaPods/issues/8007
+        def product_path
+          extension = File.extname(product_reference.path)
+          module_name = resolved_build_setting('PRODUCT_MODULE_NAME', true).values[0]
+          "#{module_name}#{extension}"
+        end
       end
     end
 

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

@@ -49,7 +49,7 @@ module PodAlexandria
       compiler = Compiler.new(sandbox, build_dir, destination, configuration, flags)
       frameworks = umbrella_targets.select { |t| t.specs.any? }.flat_map { |target|
         compiler.build(target)
-      }
+      }.uniq
 
       Pod::UI.info "🔥  Built #{frameworks.count} #{'frameworks'.pluralize(frameworks.count)}" unless frameworks.empty?
 

metadata

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