pod-builder 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f124024bc7aa2aec5af41460be8461e8e3e0dbade8d118637c77dbfb63b125d
-  data.tar.gz: cde1502b7bcbb9a03434ba897d2ac4ab0af5cf4c341ba16aee15f7c6f0695b9b
+  metadata.gz: e63869c0a451bb9da5d5ecb974125bb7bc7e30a959d4f76f513734dc4cff8d10
+  data.tar.gz: be4e23baac9d74eadc8ef402b6fbc388598dedaaab2bae2f4fdeebe9e96c79f1
 SHA512:
-  metadata.gz: 030bc3bc42c5a5958a6fb63e0dcc1ea3d917e27958495e20f2e60da8e2f73301647edcfe529ebc48fb65b033e4b99802afa1a03b601d76516f365bb094985d0e
-  data.tar.gz: eeb5eac3de6e946bcdc9ab84eabaf5a527b73cec86935b1e2da7d87e319550fb98a055d911e61de6031ed369e6f631e0ff60457bbf99dc79a89d4fbc989d202c
+  metadata.gz: 93cee03862ea2a53db8a181b2a37e245618e4c0945322f4bca4e37e1db377daab61cc18ef9057d85ce61f59749f85e33cd14f50fa2438d676b7f842910f4f908
+  data.tar.gz: 8279100eacb50a378422e64595437dc1246d83ac62b49f3bdb5f92e325aa76b1a5220795271880a8b9b5ccf7720d5cd67ccb99d2f0f6d3a882e69962eb3b8baa

data/exe/pod_builder

@@ -242,11 +242,18 @@ Options:
         opts.banner = "
 Usage:
         
-    $ pod_builder install_sources
+    $ pod_builder install_sources [OPTIONS] <PODNAME...>
 
       Install source of prebuilt pods to be able to step into and debug prebuilt's code.
 
-"         
+Options:
+"       
+        opts.on("-a", "--all", "Install all available sources") do |o|
+          OPTIONS[:all] = o
+        end
+        opts.on("-s", "--no-stdin", "Never request interaction with sdtin (e.g. in CI environment)") do |o|
+          OPTIONS[:no_stdin_available] = o
+        end
       end,
       :call => [        
         PodBuilder::Command::InstallSources

data/lib/pod_builder/command/clean.rb

@@ -26,7 +26,15 @@ module PodBuilder
         Dir.glob(PodBuilder::prebuiltpath("*")).each do |path|
           basename = File.basename(path)
           unless root_names.include?(basename) 
-            puts "Cleanining up `#{basename}`, no longer found among dependencies".blue
+            puts "Cleaning up `#{basename}`, no longer found among dependencies".blue
+            PodBuilder::safe_rm_rf(path)
+          end
+        end
+
+        Dir.glob(PodBuilder::prebuiltpath("*")).each do |path|
+          basename = File.basename(path)
+          if (Dir.glob("#{path}/**/*.framework").count + Dir.glob("#{path}/**/*.a").count) == 0
+            puts "Cleaning up `#{basename}`, no prebuilt items found".blue
             PodBuilder::safe_rm_rf(path)
           end
         end
@@ -37,11 +45,10 @@ module PodBuilder
           dsym_basename = File.basename(path, ".*")
           dsym_basename.gsub!(/\.framework$/, "")
           unless module_names.include?(dsym_basename)
-            puts "Cleanining up `#{dsym_basename}`, no longer found among dependencies".blue
+            puts "Cleaning up `#{dsym_basename}`, no longer found among dependencies".blue
             PodBuilder::safe_rm_rf(path)
           end
         end
-
       end
 
       def self.install_sources(buildable_items)        
@@ -64,8 +71,12 @@ module PodBuilder
         end
 
         paths_to_delete.flatten.each do |path|
+          if OPTIONS.has_key?(:no_stdin_available)
+            PodBuilder::safe_rm_rf(path)
+            next
+          end
           confirm = ask("#{path} unused.\nDelete it? [Y/N] ") { |yn| yn.limit = 1, yn.validate = /[yn]/i }
-          if confirm.downcase == 'y' || OPTIONS.has_key?(:no_stdin_available)
+          if confirm.downcase == 'y'
             PodBuilder::safe_rm_rf(path)
           end
         end

data/lib/pod_builder/command/install_sources.rb

@@ -11,6 +11,8 @@ module PodBuilder
 
         PodBuilder::prepare_basepath
 
+        argument_pods = ARGV.dup
+
         install_update_repo = OPTIONS.fetch(:update_repos, true)
         installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
         podfile_items = Analyze.podfile_items(installer, analyzer).select { |x| !x.is_prebuilt }
@@ -20,9 +22,9 @@ module PodBuilder
         framework_files = Dir.glob("#{base_path}/**/*.framework")
         
         framework_files.each do |path|
-          rel_path = Pathname.new(path).relative_path_from(Pathname.new(base_path)).to_s
+          next if !OPTIONS.has_key?(:all) && !argument_pods.include?(File.basename(path, ".*"))
 
-          if podfile_spec = podfile_items.detect { |x| "#{x.root_name}/#{x.prebuilt_rel_path}" == rel_path }
+          if podfile_spec = podfile_items.detect { |x| x.root_name == File.basename(path, ".*") }
             update_repo(podfile_spec)
           end
         end
@@ -45,8 +47,8 @@ module PodBuilder
         dest_path = PodBuilder::basepath("Sources")
         FileUtils.mkdir_p(dest_path)
 
+        repo_dir = File.join(dest_path, spec.podspec_name)
         Dir.chdir(dest_path) do
-          repo_dir = File.join(dest_path, spec.podspec_name)
           if !File.directory?(repo_dir)
             raise "\n\nFailed cloning #{spec.name}".red if !system("git clone #{spec.repo} #{spec.podspec_name}")
           end

data/lib/pod_builder/configuration.rb

@@ -88,7 +88,7 @@ module PodBuilder
     @library_evolution_support = false
     @base_path = "PodBuilder" # Not nice. This value is used only for initial initization. Once config is loaded it will be an absolute path. FIXME
     @skip_licenses = []
-    @skip_pods = ["GoogleMaps", "React-RCTFabric", "React-Core", "React-CoreModules"] # Not including React-RCTNetwork might loose some debug warnings
+    @skip_pods = ["GoogleMaps", "React-RCTFabric", "React-Core", "React-CoreModules", "FBReactNativeSpec", "fmt", "RCT-Folly", "React-jsi"] # Not including React-RCTNetwork might loose some debug warnings
     @force_prebuild_pods = []
     @license_filename = "Pods-acknowledgements"
     @development_pods_paths = []

data/lib/pod_builder/install.rb

@@ -147,6 +147,10 @@ module PodBuilder
       podfile_content = Podfile.update_path_entries(podfile_content, Install.method(:podfile_path_transform))
       podfile_content = Podfile.update_project_entries(podfile_content, Install.method(:podfile_path_transform))
       podfile_content = Podfile.update_require_entries(podfile_content, Install.method(:podfile_path_transform))
+
+      if Configuration.react_native_project
+        podfile_content = Podfile.prepare_react_native_compilation_workarounds(podfile_content)
+      end
       
       podfile_path = File.join(Configuration.build_path, "Podfile")
       File.write(podfile_path, podfile_content)
@@ -222,7 +226,7 @@ module PodBuilder
           data["swift_version"] = swift_version
         end
         
-        specs = podfile_items.select { |x| x.module_name == podfile_item.module_name }
+        specs = podfile_items.select { |x| x.root_name == podfile_item.root_name }
         subspecs_deps = specs.map(&:dependency_names).flatten
         subspec_self_deps = subspecs_deps.select { |x| x.start_with?("#{prebuilt_name}/") }
         data["specs"] = (specs.map(&:name) + subspec_self_deps).uniq
@@ -237,6 +241,7 @@ module PodBuilder
 
       return ret
     end
+    
     private 
     
     def self.license_specifiers
@@ -386,32 +391,29 @@ module PodBuilder
 
       non_prebuilt_items = podfile_items.reject(&:is_prebuilt)
 
-      pod_names = non_prebuilt_items.map(&:root_name).uniq
-
-      pod_names.reject! { |t| 
-        folder_path = PodBuilder::buildpath_prebuiltpath(t)
-        File.directory?(folder_path) && Dir.empty?(folder_path) # When using prebuilt items we end up with empty folders
+      non_prebuilt_items.reject! { |item|
+        [item.module_name, item.root_name]
+          .map { |t| PodBuilder::buildpath_prebuiltpath(t) }
+          .select { |t| File.directory?(t) }  
+          .all? { |t| Dir.empty?(t) } # When using prebuilt items we end up with empty folders
       } 
 
-      pod_names.each do |pod_name|   
-        root_name = pod_name.split("/").first
-
+      non_prebuilt_items.each do |item|
         # Remove existing files
-        items_to_delete = Dir.glob("#{PodBuilder::prebuiltpath(root_name)}/**/*")
+        items_to_delete = Dir.glob("#{PodBuilder::prebuiltpath(item.root_name)}/**/*")
         items_to_delete.each { |t| PodBuilder::safe_rm_rf(t) }
       end
 
       # Now copy
-      pod_names.each do |pod_name|        
-        root_name = pod_name.split("/").first
-        source_path = PodBuilder::buildpath_prebuiltpath(root_name)
+      non_prebuilt_items.each do |item|
+        source_path = PodBuilder::buildpath_prebuiltpath(item.module_name)
 
         unless File.directory?(source_path)
-          puts "Prebuilt items for #{pod_name} not found".blue
+          puts "Prebuilt items for #{item.root_name} not found".blue
           next
         end
 
-        if podfile_item = podfile_items.detect { |t| t.root_name == pod_name }
+        if podfile_item = podfile_items.detect { |t| t.root_name == item.root_name }
           if Dir.glob("#{source_path}/**/Modules/**/*.swiftmodule/*.swiftinterface").count > 0
             # We can safely remove .swiftmodule if .swiftinterface exists
             swiftmodule_files = Dir.glob("#{source_path}/**/Modules/**/*.swiftmodule/*.swiftmodule")
@@ -427,7 +429,7 @@ module PodBuilder
         project_folder.select { |t| File.directory?(t) && Dir.empty?(t) }.each { |t| PodBuilder::safe_rm_rf(t) }
 
         unless Dir.glob("#{source_path}/**/*").select { |t| File.file?(t) }.empty?
-          destination_folder = PodBuilder::prebuiltpath(root_name)
+          destination_folder = PodBuilder::prebuiltpath(item.root_name)
           FileUtils.mkdir_p(destination_folder)
           FileUtils.cp_r("#{source_path}/.", destination_folder)  
         end

data/lib/pod_builder/podfile.rb

@@ -44,7 +44,11 @@ module PodBuilder
         # https://thi.imhttps://thi.im/posts/swift-serialize-debugging-options/
         build_settings["SWIFT_SERIALIZE_DEBUGGING_OPTIONS"] = "NO"
 
-        build_settings["IPHONEOS_DEPLOYMENT_TARGET"] = platform.deployment_target.version # Fix compilation warnings on Xcode 12
+        if Configuration.react_native_project && item.name.include?("Folly")
+          build_settings["IPHONEOS_DEPLOYMENT_TARGET"] = "9.0" # https://github.com/facebook/flipper/issues/834#issuecomment-899725463
+        else
+          build_settings["IPHONEOS_DEPLOYMENT_TARGET"] = platform.deployment_target.version # Fix compilation warnings on Xcode 12
+        end
 
         # Ignore deprecation warnings
         build_settings["GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS"] = "NO"
@@ -266,6 +270,11 @@ module PodBuilder
 
       Dir.chdir(PodBuilder::project_path) do
         bundler_prefix = Configuration.use_bundler ? "bundle exec " : ""
+        
+        if Configuration.react_native_project
+          system("#{bundler_prefix}pod deintegrate;")
+        end
+
         system("#{bundler_prefix}pod install;")
       end
     end
@@ -591,7 +600,7 @@ module PodBuilder
         if matches&.size == 4 && !stripped_line.start_with?("#")
           path = matches[2]
 
-          file_exists = File.exist?(File.expand_path(path))
+          file_exists = [path, "#{path}.rb"].any? { |t| File.exist?(File.expand_path(t)) }
 
           is_absolute = ["~", "/"].include?(path[0])
           if is_absolute || !file_exists
@@ -641,17 +650,32 @@ module PodBuilder
     end
 
     def self.prepare_for_react_native_rn_pods_file(podfile_content)
+      use_react_native_open_found = false
+      enable_hermes = false
+      indentation = ""
+
       lines = []
       podfile_content.each_line do |line|
-        if line.include?("use_react_native!")
+        if line.include?("use_react_native!(")
+          use_react_native_open_found = true
+
           matches = line.match(/(\s*)/)
           unless matches&.size == 2
             return podfile_content
           end
-    
           indentation = matches[1]
-          lines.push("#{indentation}use_react_native!(:path => rn_config[\"reactNativePath\"]) # pb added\n")
+        end
+
+        if use_react_native_open_found
+          if line.gsub(" ", "").include?(":hermes_enabled=>true")
+            enable_hermes = true
+          end
           lines.push("#{indentation}# #{line.strip} # pb removed\n")
+
+          if line.strip.end_with?(")")
+            use_react_native_open_found = false
+            lines.push("#{indentation}use_react_native!(:path => rn_config[\"reactNativePath\"], :hermes_enabled => #{enable_hermes ? "true" : "false"}) # pb added\n")
+          end
         else
           lines.push(line)
         end
@@ -700,5 +724,34 @@ module PodBuilder
 
       return podfile_content
     end
+
+    def self.prepare_react_native_compilation_workarounds(podfile_content)
+      return  podfile_content + """
+def prepare_rn_compilation_libevent
+  path = \"Pods/libevent/include/event.h\"
+  replace(path, \"#include <evutil.h>\", \"// #include <evutil.h>\")
+end
+
+def prepare_rn_flipper_module_redefinition
+  module_maps = [\"Pods/Target Support Files/Flipper-Fmt/Flipper-Fmt.modulemap\", \"Pods/Target Support Files/fmt/fmt.modulemap\"]
+  if module_maps.all? { |t| File.exist?(t) }
+    commented_module = \"/* \" + File.read(module_maps[0]) + \" */\"
+    File.write(module_maps[0], commented_module)
+  end
+end
+
+def replace(path, find, replace)
+  if File.exist?(path)
+    content = File.read(path).gsub(find, replace)
+    File.write(path, content)
+  end
+end      
+
+post_install do |installer|
+  prepare_rn_compilation_libevent()
+  prepare_rn_flipper_module_redefinition()
+end
+      """
+    end
   end
 end

data/lib/pod_builder/podspec.rb

@@ -242,7 +242,7 @@ module PodBuilder
         podspec += "    p1.license          = { :type => '#{item.license}' }\n"
 
         podspec += "\n"
-        podspec += "    p1.#{platform.safe_string_name.downcase}.deployment_target  = '#{platform.deployment_target.version}'\n"
+        podspec += "    p1.#{platform.safe_string_name.downcase}.deployment_target = '#{platform.deployment_target.version}'\n"
         podspec += "\n"
 
         main_keys, valid = generate_spec_keys_for(item, item.root_name, all_buildable_items, install_using_frameworks)

data/lib/pod_builder/rome/post_install.rb

@@ -284,6 +284,34 @@ module PodBuilder
   end
 end
 
+def self.copy_resources_and_vendored_items(installer_context, uses_frameworks, base_destination, sandbox)
+  installer_context.umbrella_targets.each do |umbrella|
+    umbrella.specs.each do |spec|
+      root_name = spec.name.split("/").first
+      
+      if uses_frameworks
+        destination = File.join(base_destination, root_name)        
+      else
+        destination = File.join(base_destination, root_name, root_name)        
+      end
+      # Make sure the device target overwrites anything in the simulator build, otherwise iTunesConnect
+      # can get upset about Info.plist containing references to the simulator SDK
+      files = Pathname.glob("build/#{root_name}/*").reject { |f| f.to_s =~ /Pods[^.]+\.framework/ }
+      
+      consumer = spec.consumer(umbrella.platform_name)
+      file_accessor = Pod::Sandbox::FileAccessor.new(sandbox.pod_dir(spec.root.name), consumer)
+      files += file_accessor.vendored_libraries
+      files += file_accessor.vendored_frameworks
+      files += file_accessor.resources
+      
+      FileUtils.mkdir_p(destination)        
+      files.each do |file|
+        FileUtils.cp_r(file, destination)
+      end    
+    end
+  end
+end
+
 Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_context, user_options|  
   enable_dsym = user_options.fetch('dsym', true)
   configuration = user_options.fetch('configuration', 'Debug')
@@ -303,8 +331,9 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
   
   build_dir = sandbox_root.parent + 'build'
   base_destination = sandbox_root.parent + 'Prebuilt'
-  
+
   build_dir.rmtree if build_dir.directory?
+  base_destination.rmtree if base_destination.directory?
 
   targets = installer_context.umbrella_targets.select { |t| t.specs.any? }
   raise "\n\nUnsupported target count\n".red unless targets.count == 1
@@ -367,6 +396,8 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
 
     built_count = built_items.count
     Pod::UI.puts "Built #{built_count} #{'item'.pluralize(built_count)}"
+
+    copy_resources_and_vendored_items(installer_context, true, base_destination, sandbox)
   else
     case [target.platform_name, uses_frameworks]
     when [:ios, true] then PodBuilder::build_for_iosish_platform_framework(sandbox, build_dir, target, 'iphoneos', 'iphonesimulator', configuration, PodBuilder::Configuration.deterministic_build)
@@ -383,35 +414,9 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
     
     specs = installer_context.umbrella_targets.map { |t| t.specs.map(&:name) }.flatten.map { |t| t.split("/").first }.uniq
     built_count = Dir["#{build_dir}/*"].select { |t| specs.include?(File.basename(t)) }.count
-    Pod::UI.puts "Built #{built_count} #{'item'.pluralize(built_count)}, copying..."
+    Pod::UI.puts "Built #{built_count} #{'item'.pluralize(built_count)}, copying..."    
     
-    base_destination.rmtree if base_destination.directory?
-      
-    installer_context.umbrella_targets.each do |umbrella|
-      umbrella.specs.each do |spec|
-        root_name = spec.name.split("/").first
-        
-        if uses_frameworks
-          destination = File.join(base_destination, root_name)        
-        else
-          destination = File.join(base_destination, root_name, root_name)        
-        end
-        # Make sure the device target overwrites anything in the simulator build, otherwise iTunesConnect
-        # can get upset about Info.plist containing references to the simulator SDK
-        files = Pathname.glob("build/#{root_name}/*").reject { |f| f.to_s =~ /Pods[^.]+\.framework/ }
-        
-        consumer = spec.consumer(umbrella.platform_name)
-        file_accessor = Pod::Sandbox::FileAccessor.new(sandbox.pod_dir(spec.root.name), consumer)
-        files += file_accessor.vendored_libraries
-        files += file_accessor.vendored_frameworks
-        files += file_accessor.resources
-        
-        FileUtils.mkdir_p(destination)        
-        files.each do |file|
-          FileUtils.cp_r(file, destination)
-        end    
-      end
-    end
+    copy_resources_and_vendored_items(installer_context, uses_frameworks, base_destination, sandbox)
     
     # Depending on the resource it may happen that it is present twice, both in the .framework and in the parent folder
     Dir.glob("#{base_destination}/*") do |path|

data/lib/pod_builder/version.rb

@@ -1,3 +1,3 @@
 module PodBuilder
-  VERSION = "4.2.0"
+  VERSION = "4.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Tomas Camin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -219,7 +219,7 @@ homepage: https://github.com/Subito-it/PodBuilder
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -234,8 +234,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Prebuild CocoaPods pods
 test_files: []