pod-builder 2.0.0.beta.26 → 2.0.0.beta.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 026afc87b8f1c1b60367e611927d1e958f9eab4fa8b362fe5530b8f364b73469
-  data.tar.gz: d20a47f60ffea78ad81acb3b7e015bbd62c081ac0b5e493d652a56c24ff07704
+  metadata.gz: 9a89819da12d08eb85bd23b482de2a285d2b4314a1cfc7ca81a137d8e1d01d18
+  data.tar.gz: 06ecf7b7d93951cf2cf461452f9708b86a44927c1a2bface198388b32c348f21
 SHA512:
-  metadata.gz: 9ecececb6dca35557797fade2be225d7212d2090a5b2a94883842f7f1bf0d0cb9272eaf3abb721e92f50db8e6e7384453b0c9e5e6929a26a96310ba761dc0d45
-  data.tar.gz: b0f464538c82dc152c388a3cc20ab7b8b14a0a4e28469fea60ee7f7ecc314ea4475895b7fdecd387da8e12be437b4ccea005bd7bb148a9f16458d0a2c53ecd96
+  metadata.gz: e97afae2843677a7759a7c8a0a9dc8d194fef12d7a66ec6e776d7ef69b6beca719b8b33f9abf9288b3c8fb05853ec74b23ed38ef9fe1e46598f99bf5530fc343
+  data.tar.gz: 4d23723f38a3ec05a5560003e86e3dcdb1bee06f8bf452a5c771efdf1484f139311f59369ae0de9c003a1805721cc062cadf771b0fb02ec8519de1028e927369

data/README.md

@@ -300,18 +300,6 @@ PodBuilder writes a plist and markdown license files of pods specified in the Po
 }
 ```
 
-#### `subspecs_to_split`
-
-Normally when multiple subspecs are specified in a target a single framework is produced. There are rare cases where you specify different subspecs in different targets: a typical case is subspec specifically designed for app extensions, where you want to use a subspec in the main app and another one in the app extension. 
-
-**Warning**: This will work properly only for static frameworks (_static_framework = true_ specified in the podspec). See [issue](https://github.com/CocoaPods/CocoaPods/issues/5708) and [issue](https://github.com/CocoaPods/CocoaPods/issues/5643)
-
-```json
-{
-    "subspecs_to_split": ["Podname1/Subspec1", "Podname1/Subspec2", "Podname2/Subspec1", "Podname2/Subspec1"]
-}
-```
-
 #### `use_bundler`
 
 If you use bundler to pin the version of CocoaPods in your project set this to true. Default false.

data/exe/pod_builder

@@ -71,7 +71,7 @@ Options:
           OPTIONS[:update_repos] = false
         end
         opts.on("-f", "--force", "Rebuild items even when no code change is detected") do |o|
-          OPTIONS[:force_rebuild] = false
+          OPTIONS[:force_rebuild] = true
         end
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
           OPTIONS[:allow_warnings] = o
@@ -79,6 +79,9 @@ Options:
         # opts.on("-a", "--auto-resolve-deps", "Resolve pod dependencies automatically") do |o|
         #   OPTIONS[:auto_resolve_dependencies] = 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
         opts.on("-d", "--debug", "Don't clean build folder") do |o|
           OPTIONS[:debug] = o
         end
@@ -108,6 +111,9 @@ Options:
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
           OPTIONS[:allow_warnings] = 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
         opts.on("-d", "--debug", "Don't clean build folder") do |o|
           OPTIONS[:debug] = o
         end
@@ -375,7 +381,7 @@ begin
 rescue Exception => e
   error = e.to_s
 
-  if error.length < 1000
+  if error.length < 1000 || !File.directory?(PodBuilder::Configuration.build_path)
     puts "#{error.red}\n"
     puts e.backtrace.join("\n\t").red
     puts "\n\nCommand failed!".red

data/lib/pod_builder/command/build.rb

@@ -49,54 +49,50 @@ module PodBuilder
 
         restore_file_error = Podfile.restore_file_sanity_check
   
-        check_splitted_subspecs_are_static(all_buildable_items)
         check_pods_exists(argument_pods, all_buildable_items)
 
         pods_to_build = resolve_pods_to_build(argument_pods, buildable_items)
         buildable_items -= pods_to_build
 
         # We need to split pods to build in 3 groups
-        # 1. subspecs: because the resulting .framework path is treated differently when added to Configuration.subspecs_to_split
-        # 2. pods to build in release
-        # 3. pods to build in debug
+        # 1. pods to build in release
+        # 2. pods to build in debug
 
         check_not_building_development_pods(pods_to_build)
 
-        pods_to_build_subspecs = pods_to_build.select { |x| x.is_subspec && Configuration.subspecs_to_split.include?(x.name) }
-
         # Remove dependencies from pods to build
         all_dependencies_name = pods_to_build.map(&:dependency_names).flatten.uniq
         pods_to_build.select! { |x| !all_dependencies_name.include?(x.name) }
 
-        pods_to_build -= pods_to_build_subspecs
         pods_to_build_debug = pods_to_build.select { |x| x.build_configuration == "debug" }
         pods_to_build_release = pods_to_build - pods_to_build_debug
 
         check_dependencies_build_configurations(all_buildable_items)
 
-        podfiles_items = pods_to_build_subspecs.map { |x| [x] }
-        podfiles_items.push(pods_to_build_debug)
-        podfiles_items.push(pods_to_build_release)   
+        podfiles_items = [pods_to_build_debug] + [pods_to_build_release]
 
-        licenses = []
+        install_using_frameworks = Podfile::install_using_frameworks(analyzer)
         
-        podfiles_items.select { |x| x.count > 0 }.each do |podfile_items|
+        install_result = InstallResult.new
+        podfiles_items.reject { |x| x.empty? }.each do |podfile_items|
           build_configuration = podfile_items.map(&:build_configuration).uniq.first
           
           podfile_items = podfile_items.map { |t| t.recursive_dependencies(all_buildable_items) }.flatten.uniq
-          podfile_content = Podfile.from_podfile_items(podfile_items, analyzer, build_configuration)
+          podfile_content = Podfile.from_podfile_items(podfile_items, analyzer, build_configuration, install_using_frameworks)
           
-          licenses += Install.podfile(podfile_content, podfile_items, podfile_items.first.build_configuration)
+          install_result += Install.podfile(podfile_content, podfile_items, podfile_items.first.build_configuration)          
           
           # remove lockfile which gets unexplicably created
           FileUtils.rm_f(PodBuilder::basepath("Podfile.lock"))
         end
 
+        install_result.write_prebuilt_info_files
+
         Clean::prebuilt_items(all_buildable_items)
 
-        Licenses::write(licenses, all_buildable_items)
+        Licenses::write(install_result.licenses, all_buildable_items)
 
-        Podspec::generate(all_buildable_items, analyzer)
+        Podspec::generate(all_buildable_items, analyzer, install_using_frameworks)
 
         builded_pods = podfiles_items.flatten
         
@@ -139,24 +135,6 @@ module PodBuilder
         end
       end
 
-      def self.check_splitted_subspecs_are_static(all_buildable_items)
-        non_static_subspecs = all_buildable_items.select { |x| x.is_subspec && x.is_static == false }
-        non_static_subspecs_names = non_static_subspecs.map(&:name)
-
-        invalid_subspecs = Configuration.subspecs_to_split & non_static_subspecs_names # intersect
-
-        unless invalid_subspecs.count > 0
-          return
-        end
-
-        warn_message = "The following pods `#{invalid_subspecs.join(" ")}` are non static binaries which are being splitted over different targets. Beware that this is an unsafe setup as per https://github.com/CocoaPods/CocoaPods/issues/5708 and https://github.com/CocoaPods/CocoaPods/issues/5643\n\nYou can ignore this error by passing the `--allow-warnings` flag to the build command\n"
-        if OPTIONS[:allow_warnings]
-          puts "\n\n⚠️  #{warn_message}".yellow
-        else
-          raise "\n\n🚨️  #{warn_message}".red
-        end
-      end
-
       def self.check_dependencies_build_configurations(pods)
         pods.each do |pod|
           pod_dependency_names = pod.dependency_names.select { |x| !pod.has_common_spec(x) }
@@ -196,9 +174,9 @@ module PodBuilder
         if !expected_stripped.all? { |x| stripped_lines.include?(x) }
           warn_message = "PodBuilder's post install actions missing from application Podfile!\n"
           if OPTIONS[:allow_warnings]
-            puts "\n\n⚠️  #{warn_message}".yellow
+            puts "\n\n#{warn_message}".yellow
           else
-            raise "\n\n🚨️  #{warn_message}".red
+            raise "\n\n#{warn_message}".red
           end
         end
       end

data/lib/pod_builder/command/clean.rb

@@ -23,7 +23,7 @@ module PodBuilder
         puts "Cleaning prebuilt folder".yellow
 
         root_names = buildable_items.map(&:root_name).uniq
-        Dir.glob(File.join(PodBuilder::prebuiltpath, "*")).each do |path|
+        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
@@ -65,7 +65,7 @@ module PodBuilder
 
         paths_to_delete.flatten.each do |path|
           confirm = ask("#{path} unused.\nDelete it? [Y/N] ") { |yn| yn.limit = 1, yn.validate = /[yn]/i }
-          if confirm.downcase == 'y'
+          if confirm.downcase == 'y' || OPTIONS.has_key?(:no_stdin_available)
             PodBuilder::safe_rm_rf(path)
           end
         end

data/lib/pod_builder/command/generate_lldbinit.rb

@@ -43,7 +43,7 @@ module PodBuilder
         end
 
         source_map_lines = []
-        Dir.glob("#{PodBuilder::prebuiltpath}/**/Podbuilder.json").each do |path|
+        Dir.glob("#{PodBuilder::prebuiltpath}/**/#{Configuration.prebuilt_info_filename}").each do |path|
           data = JSON.parse(File.read(path))
           next if data.fetch("is_prebuilt", true)
 

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/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,10 +17,28 @@ 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
     DEFAULT_PLATFORMS = ["iphoneos", "iphonesimulator", "appletvos", "appletvsimulator"].freeze
@@ -43,7 +61,6 @@ 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
@@ -74,7 +91,6 @@ 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
@@ -162,11 +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["project_name"]
           if value.is_a?(String) && value.length > 0
             Configuration.project_name = value
@@ -245,7 +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["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

@@ -71,29 +71,26 @@ begin
       return res
     end
   end  
-
+  
   class Pod::Target::BuildSettings
-    class <<self
-      attr_accessor :patch_static_library_generation
+    alias_method :swz_save_as, :save_as
+
+    @specs_remove_module_maps = Hash.new
+
+    class << self
+      attr_accessor :specs_remove_module_maps
     end
-    
-    alias_method :swz_add_inherited_to_plural, :add_inherited_to_plural
-
-    def add_inherited_to_plural(hash)
-      # There's probably a better place to monkey patch this      
-      h = swz_add_inherited_to_plural(hash)
-      if Pod::Target::BuildSettings.patch_static_library_generation
-        # Static frameworks should NOT import underlying modules to simplify integration of the produced 
-        # artifacts. Without these build options you can integrate the static library the same way you 
-        # would do with a vanilla static library target in Xcode: you just copy the .a and set the Swift 
-        # import path to point to the module map file (which doesn't seem to be needed).
-        flags = h["OTHER_SWIFT_FLAGS"].dup
-        flags.gsub!("-import-underlying-module", "")
-        flags.gsub!("-Xcc -fmodule-map-file=\"${SRCROOT}/${MODULEMAP_FILE}\"", "")
-        h["OTHER_SWIFT_FLAGS"] = flags
-      end
 
-      return h
+    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
@@ -101,6 +98,44 @@ rescue LoadError
 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)
@@ -124,25 +159,27 @@ module PodBuilder
         lock_file = "#{Configuration.build_path}/pod_builder.lock"
         FileUtils.touch(lock_file)
         
-        use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items)
+        prebuilt_entries = 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)
-        add_prebuilt_info_file(podfile_items)
-        
+        copy_prebuilt_items(podfile_items - prebuilt_entries)   
+
+        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")  
@@ -155,8 +192,65 @@ module PodBuilder
         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"
@@ -197,34 +291,47 @@ module PodBuilder
     end
     
     def self.use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items)
-      if OPTIONS.has_key?(:force_rebuild)
-        return
-      end
-      
-      download # Copy files under #{Configuration.build_path}/Pods so that we can determine build folder hashes
-      
       podfile_content = File.read(podfile_path)
       
-      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
-            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))
+      replaced_items = []
+
+      if OPTIONS.has_key?(:force_rebuild)
+        podfile_content.gsub!("%%%prebuilt_root_paths%%%", "{}")
+      else
+        download # Copy files under #{Configuration.build_path}/Pods so that we can determine build folder hashes
+
+        gitignored_files = PodBuilder::gitignoredfiles
+
+        prebuilt_root_paths = Hash.new
+
+        # 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)
+
+              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)
+
+      return replaced_items
     end
     
     def self.install
@@ -240,8 +347,6 @@ module PodBuilder
         
         install_start_time = Time.now
 
-        monkey_patch_static_library_generation()
-
         installer.install! 
         install_time = Time.now - install_start_time
         
@@ -271,20 +376,36 @@ module PodBuilder
     
     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)
@@ -293,49 +414,6 @@ module PodBuilder
         FileUtils.cp_r(PodBuilder::buildpath_dsympath, PodBuilder::basepath)
       end
     end
-    
-    def self.add_prebuilt_info_file(podfile_items)
-      gitignored_files = PodBuilder::gitignoredfiles
-      
-      swift_version = PodBuilder::system_swift_version
-
-      write_prebuilt_info_filename_gitattributes
-      
-      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))
-      end
-    end
 
     def self.write_prebuilt_info_filename_gitattributes
       gitattributes_path = PodBuilder::basepath(".gitattributes")
@@ -390,7 +468,11 @@ module PodBuilder
       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
     
@@ -413,11 +495,5 @@ module PodBuilder
         return replace_path
       end
     end 
-    
-    def self.monkey_patch_static_library_generation()
-      podfile_path = File.join(Configuration.build_path, "Podfile")
-
-      Pod::Target::BuildSettings.patch_static_library_generation = !File.read(podfile_path).include?("use_frameworks!")
-    end
   end
 end