pod-builder 2.0.0.beta.25 → 2.0.0.beta.30

data/lib/pod_builder/command/generate_podspec.rb

@@ -10,7 +10,9 @@ module PodBuilder
         installer, analyzer = Analyze.installer_at(PodBuilder::basepath, false)
         all_buildable_items = Analyze.podfile_items(installer, analyzer)
 
-        Podspec::generate(all_buildable_items, analyzer)
+        install_using_frameworks = Podfile::install_using_frameworks(analyzer)
+
+        Podspec::generate(all_buildable_items, analyzer, install_using_frameworks)
 
         puts "\n\n🎉 done!\n".green
         return 0

data/lib/pod_builder/command/init.rb

@@ -22,17 +22,8 @@ module PodBuilder
         FileUtils.mkdir_p("#{OPTIONS[:prebuild_path]}/.pod_builder")
         FileUtils.touch("#{OPTIONS[:prebuild_path]}/.pod_builder/pod_builder")
 
-        source_path_rel_path = "Sources"
-        development_pods_config_rel_path = Configuration.dev_pods_configuration_filename
-
-        git_ignores = ["Pods/",
-                       "*.xcworkspace",
-                       "*.xcodeproj",
-                       "Podfile.lock",
-                       source_path_rel_path,
-                       development_pods_config_rel_path]
-        
-        File.write("#{OPTIONS[:prebuild_path]}/.gitignore", git_ignores.join("\n"))
+        write_gitignore
+        write_gitattributes
 
         project_podfile_path = PodBuilder::project_path("Podfile")
         prebuilt_podfile_path = File.join(OPTIONS[:prebuild_path], "Podfile")
@@ -61,6 +52,27 @@ module PodBuilder
 
       private 
 
+      def self.write_gitignore
+        source_path_rel_path = "Sources"
+        development_pods_config_rel_path = Configuration.dev_pods_configuration_filename
+
+        git_ignores = ["Pods/",
+                       "*.xcworkspace",
+                       "*.xcodeproj",
+                       "Podfile.lock",
+                       Configuration.lldbinit_name,
+                       source_path_rel_path,
+                       development_pods_config_rel_path]
+        
+        File.write("#{OPTIONS[:prebuild_path]}/.gitignore", git_ignores.join("\n"))
+      end
+
+      def self.write_gitattributes
+        git_attributes = ["#{Configuration.prebuilt_info_filename} binary"]
+        
+        File.write("#{OPTIONS[:prebuild_path]}/.gitattributes", git_attributes.join("\n"))
+      end
+
       def self.podfile_path_transform(path)
         use_absolute_paths = false
         podfile_path = File.join(OPTIONS[:prebuild_path], "Podfile")

data/lib/pod_builder/command/install_sources.rb

@@ -22,12 +22,12 @@ module PodBuilder
         framework_files.each do |path|
           rel_path = Pathname.new(path).relative_path_from(Pathname.new(base_path)).to_s
 
-          if podfile_spec = podfile_items.detect { |x| x.prebuilt_rel_path == rel_path }
+          if podfile_spec = podfile_items.detect { |x| "#{x.root_name}/#{x.prebuilt_rel_path}" == rel_path }
             update_repo(podfile_spec)
           end
         end
 
-        Command::Clean::clean_sources(podspec_names)
+        Clean::install_sources(podfile_items)
 
         ARGV << PodBuilder::basepath("Sources")
 

data/lib/pod_builder/configuration.rb

@@ -17,13 +17,30 @@ module PodBuilder
     DEFAULT_SPEC_OVERRIDE = {
       "Google-Mobile-Ads-SDK" => {
         "module_name": "GoogleMobileAds"
+      },
+      "React-jsiexecutor" => {
+        "remove_module_maps": ["glog"]
+      }, 
+      "React-Core" => {
+        "remove_module_maps": ["glog"]
+      },
+      "React-Core/Default" => {
+        "public_headers": "React/**/*.{h}"
+      },
+      "React-jsi" => {
+        "remove_module_maps": ["glog"]
+      },
+      "React-cxxreact" => {
+        "remove_module_maps": ["glog"]
+      }, 
+      "Folly" => {
+        "remove_module_maps": ["glog"]
       }
     }.freeze
-    DEFAULT_SKIP_PODS = ["GoogleMaps", "Flipper", "FlipperKit", "Flipper-DoubleConversion", "Flipper-Folly", "Flipper-Glog", "Flipper-PeerTalk", "Flipper-RSocket", "React-cxxreact"]
-    DEFAULT_FORCE_PREBUILD_PODS = ["Firebase", "GoogleTagManager"]
+    DEFAULT_SKIP_PODS = ["GoogleMaps"]
+    DEFAULT_FORCE_PREBUILD_PODS = ["GoogleTagManager"]
     DEFAULT_BUILD_SYSTEM = "Legacy".freeze # either Latest (New build system) or Legacy (Standard build system)
     DEFAULT_LIBRARY_EVOLUTION_SUPPORT = false
-    MIN_LFS_SIZE_KB = 256.freeze
     DEFAULT_PLATFORMS = ["iphoneos", "iphonesimulator", "appletvos", "appletvsimulator"].freeze
     DEFAULT_BUILD_FOR_APPLE_SILICON = false
     DEFAULT_BUILD_USING_REPO_PATHS = false
@@ -31,7 +48,6 @@ module PodBuilder
     private_constant :DEFAULT_BUILD_SETTINGS
     private_constant :DEFAULT_BUILD_SYSTEM
     private_constant :DEFAULT_LIBRARY_EVOLUTION_SUPPORT
-    private_constant :MIN_LFS_SIZE_KB
     
     class <<self      
       attr_accessor :allow_building_development_pods
@@ -45,15 +61,11 @@ module PodBuilder
       attr_accessor :skip_pods
       attr_accessor :force_prebuild_pods
       attr_accessor :license_filename
-      attr_accessor :subspecs_to_split
       attr_accessor :development_pods_paths
       attr_accessor :build_base_path
       attr_accessor :build_path
       attr_accessor :configuration_filename
       attr_accessor :dev_pods_configuration_filename
-      attr_accessor :lfs_min_file_size
-      attr_accessor :lfs_update_gitattributes
-      attr_accessor :lfs_include_pods_folder
       attr_accessor :project_name
       attr_accessor :restore_enabled
       attr_accessor :prebuilt_info_filename
@@ -65,6 +77,7 @@ module PodBuilder
       attr_accessor :build_for_apple_silicon
       attr_accessor :build_using_repo_paths
       attr_accessor :react_native_project
+      attr_accessor :lldbinit_name
     end
     
     @allow_building_development_pods = false
@@ -78,20 +91,17 @@ module PodBuilder
     @skip_pods = DEFAULT_SKIP_PODS
     @force_prebuild_pods = DEFAULT_FORCE_PREBUILD_PODS
     @license_filename = "Pods-acknowledgements"
-    @subspecs_to_split = []
     @development_pods_paths = []
     @build_base_path = "/tmp/pod_builder".freeze
     @build_path = build_base_path
     @configuration_filename = "PodBuilder.json".freeze
     @dev_pods_configuration_filename = "PodBuilderDevPodsPaths.json".freeze
-    @lfs_min_file_size = MIN_LFS_SIZE_KB
-    @lfs_update_gitattributes = false
-    @lfs_include_pods_folder = false
     @project_name = ""
     @restore_enabled = true
     @prebuilt_info_filename = "PodBuilder.json"
     @lockfile_name = "PodBuilder.lock"
     @lockfile_path = "/tmp/#{lockfile_name}"
+    @lldbinit_name = "lldbinit".freeze
 
     @use_bundler = false
     @deterministic_build = false
@@ -168,21 +178,6 @@ module PodBuilder
             Configuration.license_filename = value
           end
         end
-        if value = json["subspecs_to_split"]
-          if value.is_a?(Array) && value.count > 0
-            Configuration.subspecs_to_split = value
-          end
-        end
-        if value = json["lfs_update_gitattributes"]
-          if [TrueClass, FalseClass].include?(value.class)
-            Configuration.lfs_update_gitattributes = value
-          end
-        end
-        if value = json["lfs_include_pods_folder"]
-          if [TrueClass, FalseClass].include?(value.class)
-            Configuration.lfs_include_pods_folder = value
-          end
-        end
         if value = json["project_name"]
           if value.is_a?(String) && value.length > 0
             Configuration.project_name = value
@@ -261,9 +256,6 @@ module PodBuilder
       config["build_system"] = Configuration.build_system
       config["library_evolution_support"] = Configuration.library_evolution_support
       config["license_filename"] = Configuration.license_filename
-      config["subspecs_to_split"] = Configuration.subspecs_to_split
-      config["lfs_update_gitattributes"] = Configuration.lfs_update_gitattributes
-      config["lfs_include_pods_folder"] = Configuration.lfs_include_pods_folder
       config["restore_enabled"] = Configuration.restore_enabled
       config["allow_building_development_pods"] = Configuration.allow_building_development_pods
       config["use_bundler"] = Configuration.use_bundler

data/lib/pod_builder/install.rb

@@ -10,29 +10,29 @@ require 'highline/import'
 # - https://github.com/leavez/cocoapods-binary/issues/50
 begin
   require 'cocoapods/installer/xcode/pods_project_generator/pod_target_dependency_installer.rb'
-
+  
   class Pod::Specification
     Pod::Specification.singleton_class.send(:alias_method, :swz_from_hash, :from_hash)
     Pod::Specification.singleton_class.send(:alias_method, :swz_from_string, :from_string)
-
+    
     def self.from_string(*args)
       spec = swz_from_string(*args)
-
+      
       if overrides = PodBuilder::Configuration.spec_overrides[spec.name]
         overrides.each do |k, v|
           spec.attributes_hash[k] = v
         end
       end
-
+      
       spec
     end
   end 
-
+  
   class Pod::Target
     attr_accessor :mock_dynamic_framework
-
+    
     alias_method :swz_build_type, :build_type
-
+    
     def build_type
       if mock_dynamic_framework == true
         if defined?(Pod::BuildType) # CocoaPods 1.9 and later
@@ -47,23 +47,23 @@ begin
       end
     end
   end
-
+  
   # Starting from CocoaPods 1.10.0 and later resources are no longer copied inside the .framework
   # when building static frameworks. While this is correct when using CP normally, for redistributable
   # frameworks we require resources to be shipped along the binary
   class Pod::Installer::Xcode::PodsProjectGenerator::PodTargetInstaller
     alias_method :swz_add_files_to_build_phases, :add_files_to_build_phases
-
+    
     def add_files_to_build_phases(native_target, test_native_targets, app_native_targets)
       target.mock_dynamic_framework = target.build_as_static_framework?
       swz_add_files_to_build_phases(native_target, test_native_targets, app_native_targets)
       target.mock_dynamic_framework = false
     end
   end 
-
+  
   class Pod::Installer::Xcode::PodTargetDependencyInstaller
     alias_method :swz_wire_resource_bundle_targets, :wire_resource_bundle_targets
-  
+    
     def wire_resource_bundle_targets(resource_bundle_targets, native_target, pod_target)
       pod_target.mock_dynamic_framework = pod_target.build_as_static_framework?
       res = swz_wire_resource_bundle_targets(resource_bundle_targets, native_target, pod_target)
@@ -71,142 +71,274 @@ begin
       return res
     end
   end  
+  
+  class Pod::Target::BuildSettings
+    alias_method :swz_save_as, :save_as
+
+    @specs_remove_module_maps = Hash.new
+
+    class << self
+      attr_accessor :specs_remove_module_maps
+    end
+
+    def save_as(path)
+      Pod::Target::BuildSettings.specs_remove_module_maps.each do |root_name, module_maps_to_remove|
+        if target.name == root_name
+          module_maps_to_remove.each do |module_map_to_remove|
+            xcconfig.attributes["OTHER_CFLAGS"] = xcconfig.attributes["OTHER_CFLAGS"].gsub(/-fmodule-map-file=\S*#{module_map_to_remove}.modulemap.*?(\s|$)/, '')
+           end
+        end
+      end
+     
+      swz_save_as(path)
+    end
+  end
 rescue LoadError
   # CocoaPods 1.6.2 or earlier
 end
 
 module PodBuilder
+  class InstallResult
+    # @return [Array<Hash>] The installed licenses
+    #
+    attr_reader :licenses
+
+    # @return [Hash] A hash containing the expected prebuilt_info filename and content
+    #
+    attr_reader :prebuilt_info
+
+    def initialize(licenses = [], prebuilt_info = Hash.new)
+      @licenses = licenses
+      @prebuilt_info = prebuilt_info
+    end
+
+    def +(obj) 
+      merged_licenses = @licenses.dup + obj.licenses
+      merged_prebuilt_info = @prebuilt_info.dup
+
+      merged_prebuilt_info.each do |key, value|
+        if obj.prebuilt_info.has_key?(key)
+          specs = merged_prebuilt_info[key]["specs"] || []
+          specs += (obj.prebuilt_info[key]["specs"] || [])
+          merged_prebuilt_info[key]["specs"] = specs.uniq
+        end
+      end
+
+      merged_prebuilt_info = obj.prebuilt_info.merge(merged_prebuilt_info)
+
+      return InstallResult.new(merged_licenses, merged_prebuilt_info) 
+    end
+
+    def write_prebuilt_info_files
+      prebuilt_info.each do |file_path, file_content|
+        File.write(file_path, JSON.pretty_generate(file_content))
+      end
+    end
+  end
+
   class Install
     # This method will generate prebuilt data by building from "/tmp/pod_builder/Podfile"
     def self.podfile(podfile_content, podfile_items, build_configuration)
       puts "Preparing build Podfile".yellow
-
+      
       PodBuilder::safe_rm_rf(Configuration.build_path)
       FileUtils.mkdir_p(Configuration.build_path)
       
       init_git(Configuration.build_path) # this is needed to be able to call safe_rm_rf
-
+      
       podfile_content = copy_development_pods_source_code(podfile_content, podfile_items)
-
+      
       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))
-
+      
       podfile_path = File.join(Configuration.build_path, "Podfile")
       File.write(podfile_path, podfile_content)
-
+      
       begin  
         lock_file = "#{Configuration.build_path}/pod_builder.lock"
         FileUtils.touch(lock_file)
+        
+        prebuilt_entries = use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items)
 
-        use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items)
-  
+        prepare_for_static_framework_workarounds(podfile_content, podfile_items)
+        
         install
+        
+        copy_prebuilt_items(podfile_items - prebuilt_entries)   
 
-        copy_prebuilt_items(podfile_items)
-        add_prebuilt_info_file(podfile_items)
-
+        prebuilt_info = prebuilt_info(podfile_items)
         licenses = license_specifiers()
-
+        
         if !OPTIONS.has_key?(:debug)
           PodBuilder::safe_rm_rf(Configuration.build_path)
         end  
-
-        return licenses
+        
+        return InstallResult.new(licenses, prebuilt_info)
       rescue Exception => e
         if File.directory?("#{Configuration.build_path}/Pods/Pods.xcodeproj")
           if ENV['DEBUGGING']
             system("xed #{Configuration.build_path}/Pods")  
-          else
+          elsif !OPTIONS.has_key?(:no_stdin_available)
             confirm = ask("\n\nOh no! Something went wrong during prebuild phase! Do you want to open the prebuild project to debug the error, you will need to add and run the Pods-Dummy scheme? [Y/N] ".red) { |yn| yn.limit = 1, yn.validate = /[yn]/i }
             if confirm.downcase == 'y'
               system("xed #{Configuration.build_path}/Pods")  
             end
           end
         end
-
+        
         raise e
       ensure        
         FileUtils.rm(lock_file) if File.exist?(lock_file)
       end
     end
 
+    def self.prebuilt_info(podfile_items)
+      gitignored_files = PodBuilder::gitignoredfiles
+      
+      swift_version = PodBuilder::system_swift_version
+
+      write_prebuilt_info_filename_gitattributes
+      
+      ret = Hash.new
+      root_names = podfile_items.reject(&:is_prebuilt).map(&:root_name).uniq
+      root_names.each do |prebuilt_name| 
+        path = PodBuilder::prebuiltpath(prebuilt_name)
+        
+        unless File.directory?(path)
+          puts "Prebuilt items for #{prebuilt_name} not found".blue
+          next
+        end
+        
+        unless podfile_item = podfile_items.detect { |t| t.name == prebuilt_name } || podfile_items.detect { |t| t.root_name == prebuilt_name }
+          puts "Prebuilt items for #{prebuilt_name} not found #2".blue
+          next
+        end
+        
+        podbuilder_file = File.join(path, Configuration.prebuilt_info_filename)
+        entry = podfile_item.entry(true, false)
+        
+        data = {}
+        data["entry"] = entry
+        data["is_prebuilt"] = podfile_item.is_prebuilt  
+        if Dir.glob(File.join(path, "#{podfile_item.prebuilt_rel_path}/Headers/*-Swift.h")).count > 0
+          data["swift_version"] = swift_version
+        end
+        
+        specs = podfile_items.select { |x| x.module_name == podfile_item.module_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
+        data["is_static"] = podfile_item.is_static
+        data["original_compile_path"] = Pathname.new(Configuration.build_path).realpath.to_s
+        if hash = build_folder_hash(podfile_item, gitignored_files)
+          data["build_folder_hash"] = hash
+        end
+        
+        ret.merge!({ podbuilder_file => data })
+      end
+
+      return ret
+    end
     private 
 
+    def self.prepare_for_static_framework_workarounds(podfile_content, podfile_items)
+      unless podfile_content.include?("use_modular_headers!")
+        return
+      end
+
+      podfile_items.each do |podfile_item|
+        Pod::Target::BuildSettings.specs_remove_module_maps[podfile_item.root_name] = podfile_item.remove_module_maps
+      end
+    end
+    
     def self.license_specifiers
       acknowledge_file = "#{Configuration.build_path}/Pods/Target Support Files/Pods-DummyTarget/Pods-DummyTarget-acknowledgements.plist"
       unless File.exist?(acknowledge_file)
         raise "\n\nLicense file not found".red
       end
-
+      
       plist = CFPropertyList::List.new(:file => acknowledge_file)
       data = CFPropertyList.native_types(plist.value)
-        
+      
       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
-
+      
       # 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 
-      # makes  the `update_lldbinit` command work.
+      # makes  the `generate_lldbinit` command work.
       development_pods = podfile_items.select { |x| x.is_development_pod }      
       development_pods.each do |podfile_item|
         destination_path = "#{Configuration.build_path}/Pods/#{podfile_item.name}"
         FileUtils.mkdir_p(destination_path)
-
+        
         if Pathname.new(podfile_item.path).absolute?
           FileUtils.cp_r("#{podfile_item.path}/.", destination_path)
         else 
           FileUtils.cp_r("#{PodBuilder::basepath(podfile_item.path)}/.", destination_path)
         end
-
+        
         podfile_content.gsub!("'#{podfile_item.path}'", "'#{destination_path}'")
       end
-
+      
       return podfile_content
     end
-
+    
     def self.use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items)
+      podfile_content = File.read(podfile_path)
+      
+      replaced_items = []
+
       if OPTIONS.has_key?(:force_rebuild)
-        return
-      end
+        podfile_content.gsub!("%%%prebuilt_root_paths%%%", "{}")
+      else
+        download # Copy files under #{Configuration.build_path}/Pods so that we can determine build folder hashes
 
-      download # Copy files under #{Configuration.build_path}/Pods so that we can determine build folder hashes
+        gitignored_files = PodBuilder::gitignoredfiles
 
-      podfile_content = File.read(podfile_path)
+        prebuilt_root_paths = Hash.new
 
-      gitignored_files = PodBuilder::gitignoredfiles
+        # Replace prebuilt entries in Podfile for Pods that have no changes in source code which will avoid rebuilding them
+        items = podfile_items.group_by { |t| t.root_name }.map { |k, v| v.first } # Return one podfile_item per root_name
+        items.each do |item|
+          podspec_path = item.prebuilt_podspec_path
+          if last_build_folder_hash = build_folder_hash_in_prebuilt_info_file(item)
+            if last_build_folder_hash == build_folder_hash(item, gitignored_files)
+              puts "No changes detected to '#{item.root_name}', will skip rebuild".blue
+
+              replaced_items.push(item)
 
-      # Replace prebuilt entries in Podfile for Pods that have no changes in source code which will avoid rebuilding them
-      items = podfile_items.group_by { |t| t.root_name }.map { |k, v| v.first } # Return one podfile_item per root_name
-      items.each do |item|
-        podspec_path = item.prebuilt_podspec_path
-        if last_build_folder_hash = build_folder_hash_in_prebuilt_info_file(item)
-          if last_build_folder_hash == build_folder_hash(item, gitignored_files)
-            puts "No changes detected to '#{item.root_name}', will skip rebuild".blue
-            podfile_items.select { |t| t.root_name == item.root_name }.each do |replace_item|
-              replace_regex = "pod '#{Regexp.quote(replace_item.name)}', .*"
-              replace_line_found = podfile_content =~ /#{replace_regex}/i
-              raise "\n\nFailed finding pod entry for '#{replace_item.name}'".red unless replace_line_found
-              podfile_content.gsub!(/#{replace_regex}/, replace_item.prebuilt_entry(true, true))
+              podfile_items.select { |t| t.root_name == item.root_name }.each do |replace_item|
+                replace_regex = "pod '#{Regexp.quote(replace_item.name)}', .*"
+                replace_line_found = podfile_content =~ /#{replace_regex}/i
+                raise "\n\nFailed finding pod entry for '#{replace_item.name}'".red unless replace_line_found
+                podfile_content.gsub!(/#{replace_regex}/, replace_item.prebuilt_entry(true, true))
+
+                prebuilt_root_paths[replace_item.root_name] = PodBuilder::prebuiltpath
+              end
             end
           end
         end
+
+        podfile_content.gsub!("%%%prebuilt_root_paths%%%", prebuilt_root_paths.to_s)
       end
 
       File.write(podfile_path, podfile_content)
-    end
 
+      return replaced_items
+    end
+    
     def self.install
       puts "Prebuilding items".yellow
-
+      
       CLAide::Command::PluginManager.load_plugins("cocoapods")
-
+      
       Dir.chdir(Configuration.build_path) do
         config = Pod::Config.new()
         installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
@@ -214,21 +346,22 @@ module PodBuilder
         installer.update = false
         
         install_start_time = Time.now
+
         installer.install! 
         install_time = Time.now - install_start_time
-
+        
         puts "Build completed in #{install_time.to_i} seconds".blue
       end
     end
-
+    
     def self.download
       puts "Downloading Pods source code".yellow
-
+      
       CLAide::Command::PluginManager.load_plugins("cocoapods")
-
+      
       Dir.chdir(Configuration.build_path) do
         Pod::UserInterface::config.silent = true
-
+        
         config = Pod::Config.new()
         installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
         installer.repo_update = false
@@ -236,29 +369,45 @@ module PodBuilder
         installer.prepare
         installer.resolve_dependencies
         installer.download_dependencies
-
+        
         Pod::UserInterface::config.silent = false
       end
     end
-
+    
     def self.copy_prebuilt_items(podfile_items)
       FileUtils.mkdir_p(PodBuilder::prebuiltpath)
 
-      root_names = podfile_items.reject(&:is_prebuilt).map(&:root_name).uniq
-      root_names.each do |prebuilt_name|        
-        source_path = PodBuilder::buildpath_prebuiltpath(prebuilt_name)
+      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
+      } 
+
+      pod_names.each do |pod_name|   
+        root_name = pod_name.split("/").first
+
+        items_to_delete = Dir.glob("#{PodBuilder::prebuiltpath(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)
+
         unless File.directory?(source_path)
-          puts "Prebuilt items for #{prebuilt_name} not found".blue
+          puts "Prebuilt items for #{pod_name} not found".blue
           next
         end
-        if Dir.empty?(source_path)
-          next # When using prebuilt items we end up with empty folders
-        end
 
-        PodBuilder::safe_rm_rf(PodBuilder::prebuiltpath(prebuilt_name))
-        FileUtils.cp_r(source_path, PodBuilder::prebuiltpath)
+        destination_folder = PodBuilder::prebuiltpath(root_name)
+        FileUtils.mkdir_p(destination_folder)
+        FileUtils.cp_r("#{source_path}/.", destination_folder)  
       end
-
+      
       # Folder won't exist if no dSYM were generated (all static libs)
       if File.directory?(PodBuilder::buildpath_dsympath)
         FileUtils.mkdir_p(PodBuilder::dsympath)
@@ -266,58 +415,25 @@ module PodBuilder
       end
     end
 
-    def self.add_prebuilt_info_file(podfile_items)
-      gitignored_files = PodBuilder::gitignoredfiles
-
-      swift_version = PodBuilder::system_swift_version
-
-      root_names = podfile_items.reject(&:is_prebuilt).map(&:root_name).uniq
-      root_names.each do |prebuilt_name|        
-        path = PodBuilder::prebuiltpath(prebuilt_name)
-
-        unless File.directory?(path)
-          puts "Prebuilt items for #{prebuilt_name} not found".blue
-          next
-        end
-
-        unless podfile_item = podfile_items.detect { |t| t.name == prebuilt_name } || podfile_items.detect { |t| t.root_name == prebuilt_name }
-          puts "Prebuilt items for #{prebuilt_name} not found #2".blue
-          next
-        end
-
-        podbuilder_file = File.join(path, Configuration.prebuilt_info_filename)
-        entry = podfile_item.entry(true, false)
-
-        data = {}
-        data['entry'] = entry
-        data['is_prebuilt'] = podfile_item.is_prebuilt  
-        if Dir.glob(File.join(path, "#{podfile_item.prebuilt_rel_path}/Headers/*-Swift.h")).count > 0
-          data['swift_version'] = swift_version
-        end
-        
-        specs = podfile_items.select { |x| x.module_name == podfile_item.module_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
-        data['is_static'] = podfile_item.is_static
-        data['original_compile_path'] = Pathname.new(Configuration.build_path).realpath.to_s
-        data['build_folder_hash'] = build_folder_hash(podfile_item, gitignored_files)
-
-        File.write(podbuilder_file, JSON.pretty_generate(data))
+    def self.write_prebuilt_info_filename_gitattributes
+      gitattributes_path = PodBuilder::basepath(".gitattributes")
+      expected_attributes = ["#{Configuration.configuration_filename} binary"].join
+      unless File.exists?(gitattributes_path) && File.read(gitattributes_path).include?(expected_attributes)
+        File.write(gitattributes_path, expected_attributes, mode: 'a')
       end
     end
-
+    
     def self.init_git(path)
       current_dir = Dir.pwd
-
+      
       Dir.chdir(path)
       system("git init")
       Dir.chdir(current_dir)
     end
-
+    
     def self.build_folder_hash_in_prebuilt_info_file(podfile_item)
       prebuilt_info_path = PodBuilder::prebuiltpath(File.join(podfile_item.root_name, Configuration.prebuilt_info_filename))
-
+      
       if File.exist?(prebuilt_info_path)
         data = JSON.parse(File.read(prebuilt_info_path))
         return data['build_folder_hash']  
@@ -325,7 +441,7 @@ module PodBuilder
         return nil
       end
     end
-
+    
     def self.build_folder_hash(podfile_item, exclude_files)
       if podfile_item.is_development_pod
         if Pathname.new(podfile_item.path).absolute?
@@ -333,7 +449,7 @@ module PodBuilder
         else 
           item_path = PodBuilder::basepath(podfile_item.path)
         end
-
+        
         rootpath = PodBuilder::git_rootpath
         file_hashes = []
         Dir.glob("#{item_path}/**/*", File::FNM_DOTMATCH) do |path|
@@ -347,12 +463,16 @@ module PodBuilder
             file_hashes.push(Digest::MD5.hexdigest(File.read(path)))
           end
         end
-
+        
         return Digest::MD5.hexdigest(file_hashes.join)
       else
         # Pod folder might be under .gitignore
         item_path = "#{Configuration.build_path}/Pods/#{podfile_item.root_name}"
-        return `find '#{item_path}' -type f -print0 | sort -z | xargs -0 shasum | shasum | cut -d' ' -f1`.strip()
+        if File.directory?(item_path)
+          return `find '#{item_path}' -type f -print0 | sort -z | xargs -0 shasum | shasum | cut -d' ' -f1`.strip()
+        else
+          return nil
+        end
       end
     end
     
@@ -363,17 +483,17 @@ module PodBuilder
         use_absolute_paths = true
         podfile_path = File.join(Configuration.build_path, "Podfile")
         original_basepath = PodBuilder::basepath
-  
+        
         podfile_base_path = Pathname.new(File.dirname(podfile_path))
-  
+        
         original_path = Pathname.new(File.join(original_basepath, path))
         replace_path = original_path.relative_path_from(podfile_base_path)
         if use_absolute_paths
           replace_path = replace_path.expand_path(podfile_base_path)
         end
-  
+        
         return replace_path
       end
-    end  
+    end 
   end
 end