cocoapods-alexandria 0.1.4 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 517ace8b579f051031cfc0ac5fedb40928e7e0fb355cdc4cdef496fcb66d2a33
-  data.tar.gz: 06154bcf0cabd6a81496f298e860e1f41213dfb6a59209ac7c8e51c1a47d2d7f
+  metadata.gz: 939deeb120d224d7de1d886e55edbe77151f73b6a2d0b083aee075ffc1c9c214
+  data.tar.gz: 1c13e5daec652c151d6d01d8e6c5bccfe2d3d3efda099ae9f70c60e6d6f8f3a1
 SHA512:
-  metadata.gz: 755d5f29b4ee6e8c98fdee75e5cb71835a7c9a11f57e5f6f4cce63422e32b050a1b65bf86dac7021bfaa24cbfbcd69c482aa91ce47b7304b961e4575ace4daeb
-  data.tar.gz: 03d8fe36a2e6053da601ce2b329a25325591cd2403c236ce1757dc5d2c56de4b18fa617d3c507ad132a99cfe1ddc2e27160ddfa2fe51ac6930ddc7ee1995661a
+  metadata.gz: e79bd080912d587bb7ffa66f59da8fc75c7106e30eb40efc9775dbcf48cca63660df71cd74ed4a2d3cedb6dc3229c28c15a3730d49619aaf5f0eb1c86a09f893
+  data.tar.gz: eb4e35e5c6e55efa0412a022e3ca13c00bc1f5911b62910c70ce55870ace98b5a35374864f95ba68330b21b0ecb918f211077d642325150e61ec6878015c5964

data/lib/cocoapods-alexandria/gem_version.rb

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

data/lib/cocoapods-alexandria/helper/user_options.rb

@@ -3,17 +3,23 @@ module PodAlexandria
     attr_reader :environment_configs
     attr_reader :force_bitcode
     attr_reader :xcodegen_dependencies_file
+    attr_reader :do_not_embed_dependencies_in_targets
 
     def initialize(installer_context, user_options)
       @environment_configs = user_options.fetch('environment_configs', default_configurations(installer_context))
       @force_bitcode = user_options.fetch('force_bitcode', true)
       @xcodegen_dependencies_file = user_options.fetch('xcodegen_dependencies_file', 'projectDependencies.yml')
+      @do_not_embed_dependencies_in_targets = user_options.fetch('do_not_embed_dependencies_in_targets', [])
     end
 
     def environment_configs_for(target)
       environment_configs[normalize_target(target)]
     end
 
+    def allow_embed_dependencies_for(target)
+      !do_not_embed_dependencies_in_targets.include?(normalize_target(target))
+    end
+
     private
 
     def default_configurations(installer_context)

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

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

data/lib/cocoapods-alexandria/xcodegen/dependencies_generator.rb

@@ -6,7 +6,12 @@ module PodAlexandria
     # and also checking if they are linked dynamically or not.
     def self.generate_dependencies(installer_context, options)
       targets = installer_context.umbrella_targets.map { |target|
-        generate_for_target(installer_context, target, options.environment_configs_for(target.cocoapods_target_label))
+        generate_for_target(
+          installer_context,
+          target,
+          options.environment_configs_for(target.cocoapods_target_label),
+          options.allow_embed_dependencies_for(target.cocoapods_target_label)
+        )
       }.to_h
 
       File.open(options.xcodegen_dependencies_file, 'w') { |file|
@@ -16,7 +21,7 @@ module PodAlexandria
 
     private
 
-    def self.generate_for_target(installer_context, target, configurations)
+    def self.generate_for_target(installer_context, target, configurations, allow_embed)
       target_name = target.cocoapods_target_label.sub(/^Pods-/, '')
       xcconfig = config_file_for_target(installer_context, target)
 
@@ -24,13 +29,13 @@ module PodAlexandria
         target_name,
         {
           'configFiles' => configurations,
-          'dependencies' => get_dependencies_from_xcconfig(xcconfig).map(&:xcodegen_info)
+          'dependencies' => get_dependencies_from_xcconfig(xcconfig).map { |d| d.xcodegen_info(allow_embed) }
         }
       ]
     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}.*.xcconfig"]
+      Dir["#{installer_context.sandbox_root}/Target Support Files/#{target.cocoapods_target_label}/#{target.cocoapods_target_label}.*release.xcconfig"]
         .first
     end
 

data/lib/cocoapods-alexandria/xcodegen/dependency.rb

@@ -8,11 +8,11 @@ module PodAlexandria
       @module_name = value.delete_prefix('-l').delete_prefix('-f').delete_prefix('-wf')
     end
 
-    def xcodegen_info
+    def xcodegen_info(allow_embed)
       if exists?
         {
           'framework' => path,
-          'embed' => is_dynamic?,
+          'embed' => is_dynamic? && allow_embed,
           'weak' => is_weak?
         }
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-alexandria
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.2
 platform: ruby
 authors:
 - David Jennes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Alexandria allows for easier integration with XcodeGen, and automatically