pod-builder 2.0.0.beta.34 → 2.0.0.beta.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31aa509b926c753841f3739996fad1be623bac4ceee8ae30ae9b1ee254f2ddb3
-  data.tar.gz: 56df221c8e00be54c33cfa491629d0d13a22087108d8722a8bf925cbd85e959e
+  metadata.gz: f1a4e26182b712538e25c3d25a6b672485626bf5fba20db3fd7f6857aa65feeb
+  data.tar.gz: 13d479f9b5707424937418b03a0f4f0d54bac9b4f546b648192fe5fed95ed499
 SHA512:
-  metadata.gz: 3b55c31c20f5e676ff8c004d233449cbd57acac51d2fb7925340e7e25c949e9c72743ba2683255b34e5ea72bf13da5394b39f2cd0383fa95d82f9ebbb263c948
-  data.tar.gz: 05e76c637a0dcb3856698ce8f144e9ca734e4463edfe19ed9677c87dee7447b473da3e0918fb7c0c79f78b90604938ebe7d2b22ba1826f74377fb808ba77818e
+  metadata.gz: d4aa3f53f9778cb53901f560c7ce9af36eed3637e8340e8ef3fd4ee96a4c4447627c5fa966dc1a6d7d485bf084307821a79203bae191384f50e245fcad5b66e2
+  data.tar.gz: 6848089c51216aef7d107be05b4c95a4ccc9ea8d090fd2ab793664cb52c5c5d0d3613ecc93fca67b1bc3798b8430e6d22635c20c8cf84638739b52269f8fc9f5

data/README.md

@@ -130,7 +130,7 @@ This command will generate a custom lldinit file which will be stored in the _Po
 
 The most convenient place to update the lldbinit file is in your Podfile pre_install or post_install actions. It is suggested to add the following lines
 
-````
+```
     pid = spawn("pod_builder generate_lldbinit")
     Process.detach(pid)
 ```

data/exe/pod_builder

@@ -76,8 +76,8 @@ Options:
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
           OPTIONS[:allow_warnings] = o
         end
-        opts.on("-a", "--auto-resolve-deps", "Include all pods that depend on the specified <PODNAME...>") do |o|
-          OPTIONS[:auto_resolve_dependencies] = o
+        opts.on("-r", "--parent-deps", "Include all pods that depend on the specified <PODNAME...>") do |o|
+          OPTIONS[:resolve_parent_dependencies] = true
         end
         opts.on("-s", "--no-stdin", "Never request interaction with sdtin (e.g. in CI environment)") do |o|
           OPTIONS[:no_stdin_available] = o
@@ -282,7 +282,7 @@ Usage:
         opts.banner = "
 Usage:
         
-    $ pod_builder switch [OPTIONS] PODNAME[s]
+    $ pod_builder switch [OPTIONS] <PODNAME...>
 
       Switch integration between prebuilt/development/default pod version. Multiple space separated pods can be passed
         
@@ -297,8 +297,14 @@ Options:
         opts.on("-s", "--default", "Default version specified in PodBuilder-Podfile") do |o|
           OPTIONS[:switch_mode] = "default"
         end
-        opts.on("-a", "--all", "Include dependencies") do |o|
-          OPTIONS[:switch_all] = true
+        opts.on("-c", "--child-deps", "Include dependencies of the specified <PODNAME...>") do |o|
+          OPTIONS[:resolve_child_dependencies] = true
+        end
+        opts.on("-r", "--parent-deps", "Include all pods that depend on the specified <PODNAME...>") do |o|
+          OPTIONS[:resolve_parent_dependencies] = true
+        end
+        opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update (only when passing --parent-deps") do |o|
+          OPTIONS[:update_repos] = false
         end
       end,
       :call => [        

data/lib/pod_builder/command/build.rb

@@ -72,9 +72,15 @@ module PodBuilder
         podfiles_items = [pods_to_build_debug] + [pods_to_build_release]
 
         install_using_frameworks = Podfile::install_using_frameworks(analyzer)
-
-        unless install_using_frameworks
+        if Configuration.react_native_project
+          if install_using_frameworks
+            raise "\n\nOnly static library packaging currently supported for react native projects. Please remove 'use_frameworks!' in #{PodBuilder::basepath("Podfile")}".red 
+          end  
           prepare_defines_modules_override(all_buildable_items)
+        else
+          unless install_using_frameworks
+            raise "\n\nOnly framework packaging currently supported. Please add 'use_frameworks!' at root level (not nested in targets) in #{PodBuilder::basepath("Podfile")}".red
+          end  
         end
         
         install_result = InstallResult.new
@@ -162,7 +168,7 @@ module PodBuilder
       end
 
       def self.check_not_building_development_pods(pods)
-        if (development_pods = pods.select { |x| x.is_development_pod }) && development_pods.count > 0 && (OPTIONS[:allow_warnings].nil?  && Configuration.allow_building_development_pods == false)
+        if (development_pods = pods.select { |x| x.is_development_pod }) && development_pods.count > 0 && (OPTIONS[:allow_warnings].nil?  && Configuration.allow_building_development_pods == false && Configuration.react_native_project == false)
           pod_names = development_pods.map(&:name).join(", ")
           raise "\n\nThe following pods are in development mode: `#{pod_names}`, won't proceed building.\n\nYou can ignore this error by passing the `--allow-warnings` flag to the build command\n".red
         end
@@ -199,7 +205,7 @@ module PodBuilder
         pods_to_build = buildable_items.select { |x| argument_pods.include?(x.root_name) }
         pods_to_build += other_subspecs(pods_to_build, buildable_items)
 
-        if OPTIONS[:auto_resolve_dependencies]
+        if OPTIONS[:resolve_parent_dependencies]
           dependencies = []
           buildable_items.each do |pod|
             if !(pod.dependencies(buildable_items) & pods_to_build).empty?

data/lib/pod_builder/command/init.rb

@@ -38,6 +38,7 @@ module PodBuilder
 
         if podfile_content.include?("/node_modules/react-native/")
           podfile_content = Podfile.prepare_for_react_native(podfile_content)
+          update_react_native_podspecs()
         end
 
         File.write(prebuilt_podfile_path, podfile_content)
@@ -116,6 +117,32 @@ module PodBuilder
       def self.trim_gemfile_line(line)
         return line.gsub("\"", "'").gsub(" ", "")
       end
+
+      def self.update_react_native_podspecs
+        # React-Core.podspec
+        file = "React-Core.podspec"
+        paths = Dir.glob("#{PodBuilder::git_rootpath}/node_modules/**/#{file}")
+        raise "Unexpected number of #{file} found" if paths.count != 1
+
+        content = File.read(paths[0])
+        expected_header_search_path_prefix = "s.pod_target_xcconfig    = { \"HEADER_SEARCH_PATHS\" => \""
+        raise "Expected header search path entry not found" unless content.include?(expected_header_search_path_prefix)
+
+        content.sub!(expected_header_search_path_prefix, "#{expected_header_search_path_prefix}\\\"$(PODS_ROOT)/Headers/Public/Flipper-Folly\\\" ")
+        File.write(paths[0], content)        
+
+        # React-CoreModules.podspec
+        file = "React-CoreModules.podspec"
+        paths = Dir.glob("#{PodBuilder::git_rootpath}/node_modules/**/#{file}")
+        raise "Unexpected number of #{file} found" if paths.count != 1
+
+        content = File.read(paths[0])
+        expected_header_search_path_prefix = "\"HEADER_SEARCH_PATHS\" => \""
+        raise "Expected header search path entry not found" unless content.include?(expected_header_search_path_prefix)
+
+        content.sub!(expected_header_search_path_prefix, "#{expected_header_search_path_prefix}\\\"$(PODS_ROOT)/Headers/Public/Flipper-Folly\\\" ")
+        File.write(paths[0], content)
+      end
     end
   end
 end

data/lib/pod_builder/command/switch.rb

@@ -24,8 +24,29 @@ module PodBuilder
           pod_names_to_switch.push(pod_name_to_switch)
         end
 
+        if OPTIONS[:resolve_parent_dependencies] == true
+          install_update_repo = OPTIONS.fetch(:update_repos, true)
+          installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
+  
+          all_buildable_items = Analyze.podfile_items(installer, analyzer)
+
+          pod_names_to_switch.each do |pod_name|
+            if pod = (all_buildable_items.detect { |t| t.name == pod_name } || all_buildable_items.detect { |t| t.root_name == pod_name })
+              dependencies = []
+              all_buildable_items.each do |pod|
+                if !(pod.dependency_names & pod_names_to_switch).empty?
+                  dependencies.push(pod.root_name)
+                end
+              end
+              pod_names_to_switch += dependencies
+            end
+          end
+
+          pod_names_to_switch.uniq!
+        end
+
         dep_pod_names_to_switch = []
-        if OPTIONS[:switch_all] == true
+        if OPTIONS[:resolve_child_dependencies] == true
           pod_names_to_switch.each do |pod|
             podspec_path = PodBuilder::prebuiltpath("#{pod}/#{pod}.podspec")
             unless File.exist?(podspec_path)

data/lib/pod_builder/command/update.rb

@@ -35,7 +35,7 @@ module PodBuilder
         ARGV.clear
         pods_to_update.each { |x| ARGV << x }
 
-        # OPTIONS[:auto_resolve_dependencies] = true
+        # OPTIONS[:resolve_parent_dependencies] = true
         return PodBuilder::Command::Build.call
       end              
     end

data/lib/pod_builder/configuration.rb

@@ -39,7 +39,8 @@ module PodBuilder
         "ENABLE_BITCODE": "NO"
       }
     }.freeze
-    DEFAULT_SKIP_PODS = ["GoogleMaps"]
+    DEFAULT_SKIP_PODS = ["GoogleMaps", "React-RCTFabric", "React-Core", "React-CoreModules"] # Not including React-RCTNetwork might loose some debug warnings
+
     DEFAULT_FORCE_PREBUILD_PODS = []
     DEFAULT_BUILD_SYSTEM = "Latest".freeze # either Latest (New build system) or Legacy (Standard build system)
     DEFAULT_LIBRARY_EVOLUTION_SUPPORT = false

data/lib/pod_builder/install.rb

@@ -256,11 +256,7 @@ module PodBuilder
       return data["PreferenceSpecifiers"] || []
     end
     
-    def self.copy_development_pods_source_code(podfile_content, podfile_items)
-      if Configuration.build_using_repo_paths
-        return podfile_content
-      end
-      
+    def self.copy_development_pods_source_code(podfile_content, podfile_items)      
       # Development pods are normally built/integrated without moving files from their original paths.
       # It is important that CocoaPods compiles the files under Configuration.build_path in order that 
       # DWARF debug info reference to this constant path. Doing otherwise breaks the assumptions that 
@@ -276,7 +272,9 @@ module PodBuilder
           FileUtils.cp_r("#{PodBuilder::basepath(podfile_item.path)}/.", destination_path)
         end
         
-        podfile_content.gsub!("'#{podfile_item.path}'", "'#{destination_path}'")
+        unless Configuration.build_using_repo_paths
+          podfile_content.gsub!("'#{podfile_item.path}'", "'#{destination_path}'")
+        end
       end
       
       return podfile_content

data/lib/pod_builder/podfile.rb

@@ -394,9 +394,6 @@ module PodBuilder
     def self.install_using_frameworks(analyzer)
       target_settings = analyzer.podfile.target_definition_list.map(&:uses_frameworks?).uniq
       if target_settings.count == 1
-        if target_settings.first == false && ENV["DEBUGGING"].nil?
-          raise "\n\nOnly framework packaging currently supported. Please add 'use_frameworks!' at Podfile root level (not nested in targets)".red
-        end
         return target_settings.first
       elsif target_settings.count > 1
         raise "\n\n'use_frameworks!' should be declared only once at Podfile root level (not nested in targets)".red

data/lib/pod_builder/podfile_item.rb

@@ -154,7 +154,7 @@ module PodBuilder
         @tag = checkout_options[opts_key][:tag]
         @commit = checkout_options[opts_key][:commit]
         @path = checkout_options[opts_key][:path]
-        @podspec_path = checkout_options[opts_key][:podspec]
+        @podspec_path = checkout_options[opts_key][:podspec]        
         @branch = checkout_options[opts_key][:branch]
         @is_external = true
       else
@@ -213,6 +213,12 @@ module PodBuilder
       @is_static = spec.root.attributes_hash["static_framework"] || false
       @xcconfig = spec.root.attributes_hash["xcconfig"] || {}
 
+      if spec.attributes_hash.has_key?("script_phases")
+        Configuration.skip_pods += [name, root_name]
+        Configuration.skip_pods.uniq!
+        puts "Will skip '#{root_name}' which defines script_phase in podspec".blue
+      end
+
       default_subspecs_specs ||= begin
         subspecs = all_specs.select { |t| t.name.split("/").first == @root_name }
         subspecs.select { |t| @default_subspecs.include?(t.name.split("/").last) }

data/lib/pod_builder/podspec.rb

@@ -99,6 +99,7 @@ module PodBuilder
         end
         if !item.header_dir.nil? && !install_using_frameworks
           podspec += "#{indentation}#{spec_var}.header_dir = '#{item.header_dir}'\n"
+          podspec += "#{indentation}#{spec_var}.header_mappings_dir = '#{item.root_name}/Headers/#{item.header_dir}'\n"
         end
 
         if item.xcconfig.keys.count > 0

data/lib/pod_builder/rome/post_install.rb

@@ -3,6 +3,7 @@
 require 'fourflusher'
 require 'colored'
 require 'pathname'
+require 'ruby-progressbar'
 
 module PodBuilder
   def self.build_for_iosish_platform_framework(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, build_for_apple_silicon)
@@ -20,7 +21,7 @@ module PodBuilder
     excluded_archs = ["i386"] # Fixes https://github.com/Subito-it/PodBuilder/issues/17
     excluded_archs += build_for_apple_silicon ? [] : ["arm64"]
     xcodebuild(sandbox, target_label, simulator, deployment_target, configuration, deterministic_build, excluded_archs, {})
-
+    
     spec_names = target.specs.map { |spec| [spec.root.name, spec.root.module_name] }.uniq
     spec_names.each do |root_name, module_name|
       device_base = "#{build_dir}/#{configuration}-#{device}/#{root_name}" 
@@ -66,30 +67,30 @@ module PodBuilder
       FileUtils.rm_rf(simulator_framework_lib)
     end
   end
-
+  
   def self.build_for_iosish_platform_lib(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, build_for_apple_silicon, prebuilt_root_paths)
     raise "\n\nApple silicon hardware still unsupported since it requires to migrate to xcframeworks".red if build_for_apple_silicon
-        
+    
     deployment_target = target.platform_deployment_target
     target_label = target.cocoapods_target_label
-
+    
     spec_names = target.specs.map { |spec| [spec.root.name, spec.root.module_name] }.uniq
-
+    
     xcodebuild(sandbox, target_label, device, deployment_target, configuration, deterministic_build, [], prebuilt_root_paths)
     excluded_archs = build_for_apple_silicon ? [] : ["arm64"]
     xcodebuild(sandbox, target_label, simulator, deployment_target, configuration, deterministic_build, excluded_archs, prebuilt_root_paths)
-
+    
     spec_names.each do |root_name, module_name|
       simulator_base = "#{build_dir}/#{configuration}-#{simulator}/#{root_name}"
       simulator_lib = "#{simulator_base}/lib#{root_name}.a"
-
+      
       device_base = "#{build_dir}/#{configuration}-#{device}/#{root_name}" 
       device_lib = "#{device_base}/lib#{root_name}.a"
-  
+      
       unless File.file?(device_lib) && File.file?(simulator_lib)
         next
       end
-
+      
       # Starting with Xcode 12b3 the simulator binary contains an arm64 slice as well which conflict with the one in the device_lib
       # when creating the fat library. A naive workaround is to remove the arm64 from the simulator_lib however this is wrong because 
       # we might actually need to have 2 separated arm64 slices, one for simulator and one for device each built with different
@@ -101,12 +102,12 @@ module PodBuilder
       end
       
       raise "Lipo failed on #{device_lib}" unless system("xcrun lipo -create -output #{device_lib} #{device_lib} #{simulator_lib}")
-
+      
       device_headers = Dir.glob("#{device_base}/**/*.h")
       simulator_headers = Dir.glob("#{simulator_base}/**/*.h")
       device_headers.each do |device_path|
         simulator_path = device_path.gsub(device_base, simulator_base)
-
+        
         merge_header_into(device_path, simulator_path)
       end 
       simulator_only_headers = simulator_headers - device_headers.map { |t| t.gsub(device_base, simulator_base) }
@@ -117,12 +118,12 @@ module PodBuilder
         FileUtils.mkdir_p(destination_folder)
         FileUtils.cp(path, destination_folder)
       end
-
+      
       swiftmodule_path = "#{simulator_base}/#{root_name}.swiftmodule"
       if File.directory?(swiftmodule_path)
         FileUtils.cp_r("#{swiftmodule_path}/.", "#{device_base}/#{root_name}.swiftmodule")
       end
-
+      
       if File.exist?("#{device_base}/#{root_name}.swiftmodule")
         # This is a swift pod with a swiftmodule in the root of the prebuilt folder
       else
@@ -141,11 +142,11 @@ module PodBuilder
           FileUtils.cp(path, destination_folder)
         end          
       end
-
+      
       destination_path = "#{build_dir}/#{root_name}"
       if Dir.glob("#{device_base}/**/*.{a,framework,h}").count > 0
         FileUtils.mv(device_base, destination_path)
-
+        
         module_maps = Dir.glob("#{destination_path}/**/*.modulemap")
         module_map_device_base = device_base.gsub(/^\/private/, "") + "/"
         module_maps.each do |module_map|
@@ -156,7 +157,7 @@ module PodBuilder
       end
     end
   end
-
+  
   def self.merge_header_into(device_file, simulator_file)
     unless File.exist?(device_file) || File.exist?(simulator_file)
       return
@@ -165,33 +166,33 @@ module PodBuilder
     device_content = File.file?(device_file) ? File.read(device_file) : ""
     simulator_content = File.file?(simulator_file) ? File.read(simulator_file) : ""
     merged_content = %{
-#if TARGET_OS_SIMULATOR
-// ->
-
-#{simulator_content}
-
-// ->
-#else
-// ->
-
-#{device_content}
-
-// ->
-#endif
+      #if TARGET_OS_SIMULATOR
+      // ->
+      
+      #{simulator_content}
+      
+      // ->
+      #else
+      // ->
+      
+      #{device_content}
+      
+      // ->
+      #endif
     }        
     File.write(device_file, merged_content)
   end 
-
+  
   def self.add_simulator_conditional(path)
     file_content = File.read(path)
     content = %{
-#if TARGET_OS_SIMULATOR
-#{file_content}
-#endif
+      #if TARGET_OS_SIMULATOR
+      #{file_content}
+      #endif
     }        
     File.write(path, content)
   end
-
+  
   def self.xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, configuration, deterministic_build, exclude_archs, prebuilt_root_paths)
     args = %W(-project #{sandbox.project_path.realdirpath} -scheme #{target} -configuration #{configuration} -sdk #{sdk})
     supported_platforms = { 'iphonesimulator' => 'iOS', 'appletvsimulator' => 'tvOS', 'watchsimulator' => 'watchOS' }
@@ -269,15 +270,27 @@ module PodBuilder
 end
 
 Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_context, user_options|
-  puts "Building".yellow
+  build_items_count = installer_context.umbrella_targets.map(&:specs).flatten.count
+  progressbar = ProgressBar.create(:length => 80, 
+                                   :total => build_items_count,
+                                   :title => "Building",
+                                   :format => "%t |%b>%i| %c/%C done".yellow)
 
+  progressbar_thread = Thread.new { 
+    loop do
+      built_pods = Dir.glob("#{PodBuilder::Configuration.build_path}/build/Release*/*").count
+      progressbar.progress = [[0, built_pods - 1].max, progressbar.total].min
+      sleep(5)
+    end
+  }
+  
   enable_dsym = user_options.fetch('dsym', true)
   configuration = user_options.fetch('configuration', 'Debug')
   uses_frameworks = user_options.fetch('uses_frameworks', true)
   if user_options["pre_compile"]
     user_options["pre_compile"].call(installer_context)
   end
-
+  
   prebuilt_root_paths = JSON.parse(user_options["prebuilt_root_paths"].gsub('=>', ':'))
   
   sandbox_root = Pathname(installer_context.sandbox_root)
@@ -301,72 +314,74 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
     when [:tvos, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'appletvos', 'appletvsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon, prebuilt_root_paths)
     when [:watchos, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'watchos', 'watchsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon, prebuilt_root_paths)
     else raise "\n\nUnknown platform '#{target.platform_name}'".red end
-    end  
+  end  
 
-    raise Pod::Informative, 'The build directory was not found in the expected location.' unless build_dir.directory?
+  progressbar.finish
+  progressbar_thread.exit
     
-    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} #{'items'.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
+  raise Pod::Informative, 'The build directory was not found in the expected location.' unless build_dir.directory?
+  
+  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} #{'items'.pluralize(built_count)}, copying..."
+  
+  base_destination.rmtree if base_destination.directory?
     
-    # 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|
-      unless File.directory?(path)
-        return
+  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/ }
       
-      files = Dir.glob("#{path}/*")
-      framework_files = Dir.glob("#{path}/*.framework/**/*").map { |t| File.basename(t) }
+      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|
-        filename = File.basename(file.gsub(/\.xib$/, ".nib"))
-        if framework_files.include?(filename)
-          FileUtils.rm_rf(file)
-        end
-      end
+        FileUtils.cp_r(file, destination)
+      end    
     end
-    
-    if enable_dsym
-      dsym_source = "#{build_dir}/dSYM"
-      if File.directory?(dsym_source)
-        FileUtils.mv(dsym_source, sandbox_root.parent)
-      end
-    else
-      raise "Not implemented"
+  end
+  
+  # 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|
+    unless File.directory?(path)
+      return
     end
     
-    build_dir.rmtree if build_dir.directory?
+    files = Dir.glob("#{path}/*")
+    framework_files = Dir.glob("#{path}/*.framework/**/*").map { |t| File.basename(t) }
     
-    if user_options["post_compile"]
-      user_options["post_compile"].call(installer_context)
+    files.each do |file|
+      filename = File.basename(file.gsub(/\.xib$/, ".nib"))
+      if framework_files.include?(filename)
+        FileUtils.rm_rf(file)
+      end
+    end
+  end
+  
+  if enable_dsym
+    dsym_source = "#{build_dir}/dSYM"
+    if File.directory?(dsym_source)
+      FileUtils.mv(dsym_source, sandbox_root.parent)
     end
+  else
+    raise "Not implemented"
+  end
+  
+  build_dir.rmtree if build_dir.directory?
+    
+  if user_options["post_compile"]
+    user_options["post_compile"].call(installer_context)
   end
-  
+end

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "2.0.0.beta.34"
+  VERSION = "2.0.0.beta.39"
 end
   

data/pod-builder.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'cocoapods-core', '~> 1.6'
   spec.add_runtime_dependency 'CFPropertyList'
   spec.add_runtime_dependency 'json'
+  spec.add_runtime_dependency 'ruby-progressbar', '~> 1.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.34
+  version: 2.0.0.beta.39
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
 description: Prebuild CocoaPods pods to make compiling your Xcode projects faster
 email:
 - tomas.camin@adevinta.com