cocoapods-alexandria 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c19c80e81e9b4539ec08ffbdb7396994387f4573489366c6448e7faa47fedef9
-  data.tar.gz: d0e271ac412f94fd696ed6c5cf804eef6399550ddff808f29afe0da1e622d0c8
+  metadata.gz: d14087c2b2f1d05bb410c616e2cb6c518fdea5f267fcf287804b316d884f24be
+  data.tar.gz: 562dc7e56b4b2bf69e9966c79fdd79f52e2a72dbc6e305218b3cac897f05a34c
 SHA512:
-  metadata.gz: 4833167107e4c4417dbfee798e3586040beded30746a44194a20a4b76c29d887a537063cbdf8a75c7b9dde36f12dd942a5655fb22c0e76d486aad24592155dbd
-  data.tar.gz: '092626723d276d12c32c7dd739ef19c1357d664b34cb26ef06eeafdce6420999198ee20b6eb634fc4f6ac4cefd18241d4f711b5740b3df2b61fe7237df00a7f9'
+  metadata.gz: 5b24f3b39733aea2b1db05514b65d3d78cb0f7766f0d27e2578124a53f6d7c309a9bb05a74b37f61e6a56a70d260da4b1324b9a52fe89014aa372396ea23659d
+  data.tar.gz: 6b68e71f259e6cc56bb4fe80b4fa8428d2fe973d280be7013964975dee4fc8222359a54f24fa4ed4c1b24894c27dccbd7c5a6c6cf7ac96d68640c28248188c3b

data/lib/cocoapods-alexandria/env_ci/post_install.rb

@@ -12,8 +12,11 @@ module PodAlexandria
     def run
       Pod::UI.title "Compile dependencies"
       
-      if options.force_bitcode
-        Pod::UI.puts "Forcing bitcode generation"
+      if options.disable_bitcode
+        Pod::UI.puts "Disabling bitcode generation"
+        pods_project.disable_bitcode_generation
+      elsif options.force_bitcode
+        Pod::UI.puts "!!DEPRECTATED!! Forcing bitcode generation"
         pods_project.force_bitcode_generation
       end
       cache.delete_changed_frameworks

data/lib/cocoapods-alexandria/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsAlexandria
-  VERSION = '0.2.8'
+  VERSION = '0.3.0'
 end

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

@@ -1,13 +1,15 @@
 module PodAlexandria
   class UserOptions
     attr_reader :environment_configs
+    attr_reader :disable_bitcode
     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)
+      @disable_bitcode = user_options.fetch('disable_bitcode', true)
+      @force_bitcode = user_options.fetch('force_bitcode', false)
       @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

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

@@ -9,7 +9,16 @@ module Xcodeproj
     def fix_deployment_target_warnings
       targets.each do |target|
         target.build_configurations.each do |config|
-          config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0' if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] == '8.0'
+          config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0' if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] == '8.0'
+        end
+      end
+      save
+    end
+
+    def disable_bitcode_generation
+      targets.each do |target|
+        target.build_configurations.each do |config|
+          config.build_settings['ENABLE_BITCODE'] = 'NO'
         end
       end
       save

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

@@ -54,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.path}"
+      "#{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.path}"
+      "#{destination}/#{target.product_path}"
     end
   end
 end
@@ -87,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
 

metadata

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