cocoapods-alexandria 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78e151c7ffabfa1fbd96664cb624d48be0f71951cfaed1f9fec9e100cc89cf1d
-  data.tar.gz: 8d587ba944d86a928421700b9a46f4aabebd1282ea44db6fc8bdc41628dd59df
+  metadata.gz: 27616506322af399e0045f19891817ae5ec87f1023fc1c66121b617e6b62fc2c
+  data.tar.gz: 900b0c88287e32f8c96db19fca25ab6c3eccc7ed314c29a996b9cc3734bb3670
 SHA512:
-  metadata.gz: c6dc83e067aabe9c0e890f1ad579e7abcd546c234fe2dbd692e9614a238f38809181ea47d892f65e567f6cbdaf50b2eba9e93feb61749d7ad02bb83d29c3af76
-  data.tar.gz: e035c88b38adbb67c12c42b753cdf7de4670842d342f26c7eb87e405a085ff54e8c849b35b65f469aac347fb02003610cec93f3234d28fff9a8990544e72e559
+  metadata.gz: e005c66afc5ea2a076dbeb60cbbc9582713b2fd133abbd539fb993c385ffe0b27f28dea850d28e957311ab710293c248cc5f8218bc49113795719be99ed1ad6e
+  data.tar.gz: 648ba30e5d6834466f13a8370eb90dd0fd4125f7d93121c6e785e15d9af869509a8904825fea66fbb892d2bef378f3bfb184ac2efe913d10d268e1ad36bbe6ed

data/lib/cocoapods-alexandria/env_local/pre_install.rb

@@ -8,17 +8,40 @@ module PodAlexandria
     end
 
     def run
-      Pod::UI.puts "Cocoapods Alexandria running in local mode."
+      Pod::UI.puts 'Cocoapods Alexandria running in local mode.'
 
-      Pod::UI.title "Generating project using XcodeGen"
+      if should_predownload_dep
+        Pod::UI.title 'Pre-downloading dependency for XcodeGen'
+        predownload_dep
+      end
+
+      Pod::UI.title 'Generating project using XcodeGen'
       XcodeGen::cleanupRome
       XcodeGen::clearDependencies(options.xcodegen_dependencies_file)
       XcodeGen::generate
 
-      Pod::UI.title "Preparing environment..."
+      Pod::UI.title 'Preparing environment...'
       podfile.prepare_for_xcodegen
 
-      Pod::UI.title "Continuing with normal CocoaPods"
+      Pod::UI.title 'Continuing with normal CocoaPods'
+    end
+
+    private
+
+    def should_predownload_dep
+      File.readlines('project.yml').grep(/Pods\/AppwiseCore\/XcodeGen/).any? &&
+        !File.directory?('Pods/AppwiseCore/XcodeGen')
+    end
+
+    def predownload_dep
+      system(
+        'rm -rf Pods/AppwiseCore && '\
+        'mkdir -p Pods && '\
+        'rm -f /tmp/ac.zip && '\
+        'curl -L "https://github.com/appwise-labs/AppwiseCore/archive/master.zip" > /tmp/ac.zip && '\
+        'unzip -q -d Pods /tmp/ac.zip && '\
+        'mv Pods/AppwiseCore-master Pods/AppwiseCore'
+      )
     end
   end
 end

data/lib/cocoapods-alexandria/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsAlexandria
-  VERSION = '0.1.3'
+  VERSION = '0.2.1'
 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.3
+  version: 0.2.1
 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