pod-builder 2.0.0.beta.19 → 2.0.0.beta.21

data/lib/pod_builder/command/update.rb

@@ -1,10 +1,9 @@
 require 'pod_builder/core'
-require 'cfpropertylist'
 
 module PodBuilder
   module Command
     class Update
-      def self.call(options)          
+      def self.call
         Configuration.check_inited
         PodBuilder::prepare_basepath
 
@@ -25,10 +24,10 @@ module PodBuilder
         pods_to_update.map! { |x| x.split("/").first }.uniq!
         
         unless pods_to_update.count > 0
-          puts "Frameworks in sync!\n".green
+          puts "Prebuilt items in sync!\n".green
           return 0
         end
-        if options.has_key?(:dry_run)
+        if OPTIONS.has_key?(:dry_run)
           puts "`#{pods_to_update.join("`, `")}` need to be rebuilt!\n".red
           return -2
         end
@@ -36,8 +35,8 @@ module PodBuilder
         ARGV.clear
         pods_to_update.each { |x| ARGV << x }
 
-        # options[:auto_resolve_dependencies] = true
-        return PodBuilder::Command::Build.call(options)
+        # OPTIONS[:auto_resolve_dependencies] = true
+        return PodBuilder::Command::Build.call
       end              
     end
   end

data/lib/pod_builder/command/update_lldbinit.rb

@@ -4,9 +4,12 @@ require 'digest'
 module PodBuilder
   module Command
     class UpdateLldbInit
-      def self.call(options)
+      def self.call
         Configuration.check_inited
-        
+        if Configuration.build_using_repo_paths
+          raise "\n\nlldb shenanigans not supported when 'build_using_repo_paths' is enabled".red
+        end
+
         argument_pods = ARGV.dup
         
         unless argument_pods.count > 0 
@@ -55,10 +58,9 @@ module PodBuilder
           name = File.basename(framework_path, File.extname(framework_path)) 
           executable_path = File.join(framework_path, name)
 
-          podbuilder_plist = File.join(framework_path, Configuration.framework_plist_filename)
-
-          plist = CFPropertyList::List.new(:file => podbuilder_plist)
-          data = CFPropertyList.native_types(plist.value)
+          parent_framework_path = File.expand_path(File.joing(framework_path, ".."))
+          framework_info_path = File.join(parent_framework_path, Configuration.prebuilt_info_filename)
+          data = JSON.parse(File.read(framework_info_path))
 
           original_compile_path = data["original_compile_path"]
           is_prebuilt = data.fetch("is_prebuilt", true)
@@ -125,7 +127,7 @@ module PodBuilder
         puts "Writing #{lldbinit_path}".yellow
 
         FileUtils.touch(lldbinit_path)
-        raise "\n\nDestination file should be a file" unless File.exist?(lldbinit_path)
+        raise "\n\nDestination file should be a file".red unless File.exist?(lldbinit_path)
 
         lldbinit_lines = []
         skipNext = false
@@ -138,7 +140,7 @@ module PodBuilder
             next
           elsif line != "\n"
             if line.include?("settings set target.source-map")
-              raise "\n\n#{lldbinit_destination_path} already includes a manual `settings set target.source-map`. This is unsupported and you'll have to manually remove that entry\n"
+              raise "\n\n#{lldbinit_destination_path} already includes a manual `settings set target.source-map`. This is unsupported and you'll have to manually remove that entry\n".red
             end
             lldbinit_lines.push(line)
           end

data/lib/pod_builder/configuration.rb

@@ -19,13 +19,14 @@ module PodBuilder
         "module_name": "GoogleMobileAds"
       }
     }.freeze
-    DEFAULT_SKIP_PODS = ["GoogleMaps"]
+    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_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
     
     private_constant :DEFAULT_BUILD_SETTINGS
     private_constant :DEFAULT_BUILD_SYSTEM
@@ -55,13 +56,15 @@ module PodBuilder
       attr_accessor :lfs_include_pods_folder
       attr_accessor :project_name
       attr_accessor :restore_enabled
-      attr_accessor :framework_plist_filename
+      attr_accessor :prebuilt_info_filename
       attr_accessor :lockfile_name
       attr_accessor :lockfile_path
       attr_accessor :use_bundler
       attr_accessor :deterministic_build
       attr_accessor :supported_platforms
       attr_accessor :build_for_apple_silicon
+      attr_accessor :build_using_repo_paths
+      attr_accessor :react_native_project
     end
     
     @allow_building_development_pods = false
@@ -69,7 +72,7 @@ module PodBuilder
     @build_settings_overrides = {}
     @build_system = DEFAULT_BUILD_SYSTEM
     @library_evolution_support = DEFAULT_LIBRARY_EVOLUTION_SUPPORT
-    @base_path = "Frameworks" # Not nice. This value is used only for initial initization. Once config is loaded it will be an absolute path. FIXME
+    @base_path = "PodBuilder" # Not nice. This value is used only for initial initization. Once config is loaded it will be an absolute path. FIXME
     @spec_overrides = DEFAULT_SPEC_OVERRIDE
     @skip_licenses = []
     @skip_pods = DEFAULT_SKIP_PODS
@@ -86,7 +89,7 @@ module PodBuilder
     @lfs_include_pods_folder = false
     @project_name = ""
     @restore_enabled = true
-    @framework_plist_filename = "PodBuilder.plist"
+    @prebuilt_info_filename = "PodBuilder.json"
     @lockfile_name = "PodBuilder.lock"
     @lockfile_path = "/tmp/#{lockfile_name}"
 
@@ -95,6 +98,8 @@ module PodBuilder
 
     @supported_platforms = DEFAULT_PLATFORMS
     @build_for_apple_silicon = DEFAULT_BUILD_FOR_APPLE_SILICON
+    @build_using_repo_paths = DEFAULT_BUILD_USING_REPO_PATHS
+    @react_native_project = false
     
     def self.check_inited
       raise "\n\nNot inited, run `pod_builder init`\n".red if podbuilder_path.nil?
@@ -208,12 +213,20 @@ module PodBuilder
             Configuration.build_for_apple_silicon = value
           end
         end
+        if value = json["build_using_repo_paths"]
+          if [TrueClass, FalseClass].include?(value.class)
+            Configuration.build_using_repo_paths = value
+          end
+        end
+        if value = json["react_native_project"]
+          if [TrueClass, FalseClass].include?(value.class)
+            Configuration.react_native_project = value
+          end
+        end
         
         Configuration.build_settings.freeze
 
         sanity_check()
-      else
-        write
       end
       
       dev_pods_configuration_path = File.join(Configuration.base_path, Configuration.dev_pods_configuration_filename)
@@ -251,6 +264,13 @@ module PodBuilder
       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
+      config["deterministic_build"] = Configuration.deterministic_build
+      config["build_for_apple_silicon"] = Configuration.build_for_apple_silicon
+      config["build_using_repo_paths"] = Configuration.build_using_repo_paths
+      config["react_native_project"] = Configuration.react_native_project
       
       File.write(config_path, JSON.pretty_generate(config))
     end
@@ -275,7 +295,7 @@ module PodBuilder
     
     def self.podbuilder_path
       paths = Dir.glob("#{PodBuilder::home}/**/.pod_builder")
-      paths.reject! { |t| t.match(/pod-builder-.*\/Example\/Frameworks\/\.pod_builder$/i) }
+      paths.reject! { |t| t.match(/pod-builder-.*\/Example\/#{File.basename(Configuration.base_path)}\/\.pod_builder$/i) }
       raise "\n\nToo many .pod_builder found `#{paths.join("\n")}`\n".red if paths.count > 1
       
       return paths.count > 0 ? File.dirname(paths.first) : nil

data/lib/pod_builder/core.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 require 'colored'
 
 require 'pod_builder/podfile'
+require 'pod_builder/podfile_cp'
 require 'pod_builder/podfile_item'
 require 'pod_builder/analyze'
 require 'pod_builder/analyzer'
@@ -15,6 +16,9 @@ require 'pod_builder/licenses'
 require 'core_ext/string'
 
 module PodBuilder  
+  @@xcodeproj_path = nil
+  @@xcodeworkspace_path = nil
+
   def self.safe_rm_rf(path)
     unless File.exist?(path)
       return
@@ -55,7 +59,7 @@ module PodBuilder
       return nil
     end
 
-    path = basepath("Rome")
+    path = basepath("Prebuilt")
     if child.length > 0
       path += "/#{child}"
     end
@@ -68,7 +72,20 @@ module PodBuilder
       return nil
     end
 
-    path = "#{Configuration.build_path}/Rome"
+    path = "#{Configuration.build_path}/Prebuilt"
+    if child.length > 0
+      path += "/#{child}"
+    end
+
+    return path
+  end
+
+  def self.buildpath_dsympath(child = "")
+    if child.nil?
+      return nil
+    end
+
+    path = "#{Configuration.build_path}/dSYM"
     if child.length > 0
       path += "/#{child}"
     end
@@ -96,27 +113,36 @@ module PodBuilder
   end
 
   def self.find_xcodeproj
+    unless @@xcodeproj_path.nil?
+      return @@xcodeproj_path
+    end
     project_name = File.basename(find_xcodeworkspace, ".*")
 
     xcodeprojects = Dir.glob("#{home}/**/#{project_name}.xcodeproj").select { |x| 
       folder_in_home = x.gsub(home, "")
       !folder_in_home.include?("/Pods/") && !x.include?(PodBuilder::basepath("Sources")) && !x.include?(basepath) 
     }
-    raise "xcodeproj not found!".red if xcodeprojects.count == 0
-    raise "Found multiple xcodeproj:\n#{xcodeprojects.join("\n")}".red if xcodeprojects.count > 1
+    raise "\n\nxcodeproj not found!".red if xcodeprojects.count == 0
+    raise "\n\nFound multiple xcodeproj:\n#{xcodeprojects.join("\n")}".red if xcodeprojects.count > 1
 
-    return xcodeprojects.first
+    @@xcodeproj_path = xcodeprojects.first
+    return @@xcodeproj_path
   end
 
   def self.find_xcodeworkspace
+    unless @@xcodeworkspace_path.nil?
+      return @@xcodeworkspace_path
+    end
+
     xcworkspaces = Dir.glob("#{home}/**/#{Configuration.project_name}*.xcworkspace").select { |x| 
       folder_in_home = x.gsub(home, "")
       !folder_in_home.include?("/Pods/") && !x.include?(PodBuilder::basepath("Sources")) && !x.include?(basepath) && !x.include?(".xcodeproj/")
     }
-    raise "xcworkspace not found!".red if xcworkspaces.count == 0
-    raise "Found multiple xcworkspaces:\n#{xcworkspaces.join("\n")}".red if xcworkspaces.count > 1
+    raise "\n\nxcworkspace not found!".red if xcworkspaces.count == 0
+    raise "\n\nFound multiple xcworkspaces:\n#{xcworkspaces.join("\n")}".red if xcworkspaces.count > 1
 
-    return xcworkspaces.first
+    @@xcodeworkspace_path = xcworkspaces.first
+    return @@xcodeworkspace_path
   end
 
   def self.prepare_basepath
@@ -143,7 +169,7 @@ module PodBuilder
 
   def self.system_swift_version
     swift_version = `swiftc --version | grep -o 'swiftlang-.*\s'`.strip()
-    raise "Unsupported swift compiler version, expecting `swiftlang` keyword in `swiftc --version`" if swift_version.length == 0
+    raise "\n\nUnsupported swift compiler version, expecting `swiftlang` keyword in `swiftc --version`".red if swift_version.length == 0
     return swift_version
   end
 

data/lib/pod_builder/info.rb

@@ -1,4 +1,4 @@
-require 'cfpropertylist'
+require 'json'
 
 module PodBuilder
   class Info
@@ -7,10 +7,8 @@ module PodBuilder
       result = {}
       name = nil
 
-      Dir.glob(PodBuilder::prebuiltpath("**/*.framework")).each do |path|
-        plist_path = File.join(path, Configuration.framework_plist_filename)
-
-        name, prebuilt_info = prebuilt_info(plist_path)
+      Dir.glob(PodBuilder::prebuiltpath("**/#{Configuration.prebuilt_info_filename}")).each do |json_path|         
+        name, prebuilt_info = prebuilt_info(json_path)
         result[name] = prebuilt_info
       end
 
@@ -56,9 +54,13 @@ module PodBuilder
       elsif (matches = line&.match(/pod '(.*)', :path => '(.*)'/)) && matches.size == 3
         pod_name = matches[1]
         
+        return { "repo": "local" }
+      elsif (matches = line&.match(/pod '(.*)', :podspec => '(.*)'/)) && matches.size == 3
+        pod_name = matches[1]
+        
         return { "repo": "local" }
       else
-        raise "Failed extracting version from line:\n#{line}\n\n"
+        raise "\n\nFailed extracting version from line:\n#{line}\n\n".red
       end
     end
 
@@ -66,10 +68,9 @@ module PodBuilder
       unless File.exist?(path)
         return {}
       end
-      
-      plist = CFPropertyList::List.new(:file => path)
-      data = CFPropertyList.native_types(plist.value)
-      
+
+      data = JSON.load(File.read(path))
+            
       result = {}
       if swift_version = data["swift_version"]
         result.merge!({ "swift_version": swift_version})
@@ -78,7 +79,6 @@ module PodBuilder
       pod_version = version_info_from_entry(data["entry"])
       pod_name = pod_name_from_entry(data["entry"])
 
-      
       result.merge!({ "version": pod_version })
       result.merge!({ "specs": (data["specs"] || []) })
       result.merge!({ "is_static": (data["is_static"] || false) })

data/lib/pod_builder/install.rb

@@ -1,6 +1,8 @@
-require 'cfpropertylist'
 require 'digest'
 require 'colored'
+require 'highline/import'
+
+# The following begin/end clause contains a set of monkey patches of the original CP implementation
 
 # The Pod::Target and Pod::Installer::Xcode::PodTargetDependencyInstaller swizzles patch
 # the following issues: 
@@ -38,7 +40,7 @@ begin
         elsif defined?(Pod::Target::BuildType) # CocoaPods 1.7, 1.8
           Pod::Target::BuildType.new(linkage: :dynamic, packaging: :framework)
         else
-          raise "BuildType not found. Open an issue reporting your CocoaPods version"
+          raise "\n\nBuildType not found. Open an issue reporting your CocoaPods version".red
         end
       else
         swz_build_type()
@@ -75,89 +77,131 @@ end
 
 module PodBuilder
   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)
-
-      # Copy the repo to extract license (and potentially other files in the future)
-      podfile_items.select { |x| x.is_development_pod }.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
-
-        # It is important that CocoaPods compiles the files under Configuration.build_path in order that DWARF
-        # debug info reference to this path. Doing otherwise breaks the assumptions that makes the `update_lldbinit`
-        # command work
-        podfile_content.gsub!("'#{podfile_item.path}'", "'#{destination_path}'")
-        
-        license_files = Dir.glob("#{destination_path}/**/*acknowledgements.plist").each { |f| File.delete(f) }
-      end
       
       init_git(Configuration.build_path) # this is needed to be able to call safe_rm_rf
 
-      podfile_path = "#{Configuration.build_path}/Podfile"
+      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)
-      Podfile.update_path_entires(podfile_path, true)
-      Podfile.update_project_entries(podfile_path, true)
 
       begin  
         lock_file = "#{Configuration.build_path}/pod_builder.lock"
         FileUtils.touch(lock_file)
 
-        framework_build_hashes = Hash.new
-        if !OPTIONS.has_key?(:force_rebuild)
-          download # Copy files under #{Configuration.build_path}/Pods so that we can determine build folder hashes
-
-          # 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|
-            framework_path = File.join(PodBuilder::prebuiltpath, "#{item.module_name}.framework")
-            podspec_path = File.join(PodBuilder::prebuiltpath, "#{item.root_name}.podspec")
-            if (last_build_folder_hash = build_folder_hash_in_framework_plist_info(framework_path)) && File.exist?(podspec_path)
-              if last_build_folder_hash == build_folder_hash(item)
-                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 "Failed finding pod entry for '#{replace_item.name}'" unless replace_line_found
-                  podfile_content.gsub!(/#{replace_regex}/, replace_item.prebuilt_entry(true, true))
-                end
-              end
-            end
-          end
-
-          File.write(podfile_path, podfile_content)          
-        end  
+        use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items)
   
         install
 
-        add_framework_plist_info(podfile_items)
-        cleanup_frameworks(podfile_items)        
-        copy_frameworks(podfile_items)
-        copy_libraries(podfile_items)
-        copy_dsyms(podfile_items)
-      rescue Exception => e
-        raise e
-      ensure
-        FileUtils.rm(lock_file)
+        copy_prebuilt_items(podfile_items)
+        add_prebuilt_info_file(podfile_items)
+
+        licenses = license_specifiers()
 
         if !OPTIONS.has_key?(:debug)
           PodBuilder::safe_rm_rf(Configuration.build_path)
         end  
+
+        return licenses
+      rescue Exception => e
+        if File.directory?("#{Configuration.build_path}/Pods/Pods.xcodeproj")
+          if ENV['DEBUGGING']
+            system("xed #{Configuration.build_path}/Pods")  
+          else
+            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
 
     private 
 
+    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.
+      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)
+      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)
+
+      # 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)
+            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))
+            end
+          end
+        end
+      end
+
+      File.write(podfile_path, podfile_content)
+    end
+
     def self.install
-      puts "Building frameworks".yellow
+      puts "Prebuilding items".yellow
 
       CLAide::Command::PluginManager.load_plugins("cocoapods")
 
@@ -195,135 +239,67 @@ module PodBuilder
       end
     end
 
-    def self.rel_path(path, podfile_items)
-      name = File.basename(path)
-      name_no_ext = File.basename(name, File.extname(name))
-      if podfile_item = podfile_items.detect { |x| x.module_name == name_no_ext && Configuration.subspecs_to_split.include?(x.name) }
-        return "#{podfile_item.prebuilt_rel_path}"
-      else
-        return name
-      end
-    end
+    def self.copy_prebuilt_items(podfile_items)
+      FileUtils.mkdir_p(PodBuilder::prebuiltpath)
 
-    def self.add_framework_plist_info(podfile_items)
-      swift_version = PodBuilder::system_swift_version
-      Dir.glob(PodBuilder::buildpath_prebuiltpath("*.framework")) do |framework_path|
-        filename_ext = File.basename(framework_path)
-        filename = File.basename(framework_path, ".*")
-
-        specs = podfile_items.select { |x| x.module_name == filename }
-        specs += podfile_items.select { |x| x.vendored_frameworks.map { |x| File.basename(x) }.include?(filename_ext) }
-        if podfile_item = specs.first
-          podbuilder_file = File.join(framework_path, Configuration.framework_plist_filename)
-          entry = podfile_item.entry(true, false)
-
-          plist = CFPropertyList::List.new
-          plist_data = {}
-          plist_data['entry'] = entry
-          plist_data['is_prebuilt'] = podfile_item.is_prebuilt  
-          if Dir.glob(File.join(framework_path, "Headers/*-Swift.h")).count > 0
-            plist_data['swift_version'] = swift_version
-          end
-          subspecs_deps = specs.map(&:dependency_names).flatten
-          subspec_self_deps = subspecs_deps.select { |x| x.start_with?("#{podfile_item.root_name}/") }
-          plist_data['specs'] = (specs.map(&:name) + subspec_self_deps).uniq
-          plist_data['is_static'] = podfile_item.is_static
-          plist_data['original_compile_path'] = Pathname.new(Configuration.build_path).realpath.to_s
-          plist_data['build_folder_hash'] = build_folder_hash(podfile_item)
-
-          plist.value = CFPropertyList.guess(plist_data)
-          plist.save(podbuilder_file, CFPropertyList::List::FORMAT_BINARY)
-        else
-          raise "Unable to detect item for framework #{filename}.framework. Please open a bug report!"
+      root_names = podfile_items.reject(&:is_prebuilt).map(&:root_name).uniq
+      root_names.each do |prebuilt_name|        
+        source_path = PodBuilder::buildpath_prebuiltpath(prebuilt_name)
+        unless File.directory?(source_path)
+          puts "Prebuilt items for #{prebuilt_name} not found".blue
+          next
+        end
+        if Dir.empty?(source_path)
+          next # When using prebuilt items we end up with empty folders
         end
-      end
-    end
 
-    def self.cleanup_frameworks(podfile_items)
-      Dir.glob(PodBuilder::buildpath_prebuiltpath("*.framework")) do |framework_path|
-        framework_rel_path = rel_path(framework_path, podfile_items)
-        dsym_path = framework_rel_path + ".dSYM"
+        PodBuilder::safe_rm_rf(PodBuilder::prebuiltpath(prebuilt_name))
+        FileUtils.cp_r(source_path, PodBuilder::prebuiltpath)
+      end
 
-        PodBuilder::safe_rm_rf(PodBuilder::prebuiltpath(framework_rel_path))
-        Configuration.supported_platforms.each do |platform|
-          PodBuilder::safe_rm_rf(PodBuilder::dsympath("#{platform}/#{dsym_path}"))
-        end
+      # Folder won't exist if no dSYM were generated (all static libs)
+      if File.directory?(PodBuilder::buildpath_dsympath)
+        FileUtils.mkdir_p(PodBuilder::dsympath)
+        FileUtils.cp_r(PodBuilder::buildpath_dsympath, PodBuilder::basepath)
       end
     end
 
-    def self.copy_frameworks(podfile_items)
-      Dir.glob(PodBuilder::buildpath_prebuiltpath("*.framework")) do |framework_path|
-        framework_rel_path = rel_path(framework_path, podfile_items)
+    def self.add_prebuilt_info_file(podfile_items)
+      swift_version = PodBuilder::system_swift_version
 
-        destination_path = PodBuilder::prebuiltpath(framework_rel_path)
-        FileUtils.mkdir_p(File.dirname(destination_path))
-        FileUtils.cp_r(framework_path, destination_path)
-      end
-    end
+      root_names = podfile_items.reject(&:is_prebuilt).map(&:root_name).uniq
+      root_names.each do |prebuilt_name|        
+        path = PodBuilder::prebuiltpath(prebuilt_name)
 
-    def self.copy_libraries(podfile_items)
-      Dir.glob(PodBuilder::buildpath_prebuiltpath("*.a")) do |library_path|
-        library_name = File.basename(library_path)
-
-        # Find vendored libraries in the build folder:
-        # This allows to determine which Pod is associated to the vendored_library
-        # because there are cases where vendored_libraries are specified with wildcards (*.a)
-        # making it impossible to determine the associated Pods when building multiple pods at once
-        search_base = "#{Configuration.build_path}/Pods/"
-        podfile_items.each do |podfile_item|
-          if podfile_item.vendored_framework_path.nil?
-            next
-          end
-          
-          podfile_item.vendored_libraries.each do |vendored_item|
-            if result = Dir.glob("#{search_base}**/#{vendored_item}").first
-              result_path = result.gsub(search_base, "")
-              module_name = result_path.split("/").first
-              if module_name == podfile_item.module_name
-                library_rel_path = rel_path(module_name, podfile_items)
-                                
-                result_path = result_path.split("/").drop(1).join("/")
-
-                destination_path = PodBuilder::prebuiltpath("#{library_rel_path}/#{result_path}")
-                FileUtils.mkdir_p(File.dirname(destination_path))
-                FileUtils.cp_r(library_path, destination_path, :remove_destination => true)
-              end
-            end
-          end
+        unless File.directory?(path)
+          puts "Prebuilt items for #{prebuilt_name} not found".blue
+          next
+        end
 
-          # A pod might depend upon a static library that is shipped with a prebuilt framework
-          # which is not added to the Rome folder and podspecs
-          # 
-          # An example is Google-Mobile-Ads-SDK which adds
-          # - vendored framework: GooleMobileAds.framework 
-          # - vendored library: libGooleMobileAds.a
-          # These might be used by another pod (e.g AppNexusSDK/GoogleAdapterThatDependsOnGooglePod)
-          podfile_item.libraries.each do |library|            
-            if result = Dir.glob("#{search_base}**/lib#{library}.a").first
-              result_path = result.gsub(search_base, "")
-
-              library_rel_path = rel_path(podfile_item.module_name, podfile_items)
-                                
-              result_path = result_path.split("/").drop(1).join("/")
-
-              destination_path = PodBuilder::prebuiltpath("#{library_rel_path}/#{result_path}")
-              FileUtils.mkdir_p(File.dirname(destination_path))
-              FileUtils.cp_r(library_path, destination_path)        
-            end
-          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
-      end
-    end
 
-    def self.copy_dsyms(podfile_items)
-      Configuration.supported_platforms.each do |platform|
-        Dir.glob("#{Configuration.build_path}/dSYM/#{platform}/**/*.dSYM") do |dsym_path|
-          framework_rel_path = rel_path(dsym_path.gsub(File.extname(dsym_path), ""), podfile_items)
-          
-          destination_path = PodBuilder::dsympath("#{platform}/#{File.dirname(framework_rel_path)}") 
-          FileUtils.mkdir_p(destination_path)
-          FileUtils.cp_r(dsym_path, destination_path)
-        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.module_name}/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)
+
+        File.write(podbuilder_file, JSON.pretty_generate(data))
       end
     end
 
@@ -335,17 +311,15 @@ module PodBuilder
       Dir.chdir(current_dir)
     end
 
-    def self.build_folder_hash_in_framework_plist_info(framework_path)
-      podbuilder_file = File.join(framework_path, Configuration.framework_plist_filename)
+    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))
 
-      unless File.exist?(podbuilder_file)
+      if File.exist?(prebuilt_info_path)
+        data = JSON.parse(File.read(prebuilt_info_path))
+        return data['build_folder_hash']  
+      else
         return nil
       end
-
-      plist = CFPropertyList::List.new(:file => podbuilder_file)
-      data = CFPropertyList.native_types(plist.value)
-
-      return data['build_folder_hash']
     end
 
     def self.build_folder_hash(podfile_item)
@@ -359,7 +333,27 @@ module PodBuilder
         item_path = "#{Configuration.build_path}/Pods/#{podfile_item.root_name}"
       end
 
-      return `find '#{item_path}' -type f -print0 | sort -z | xargs -0 sha1sum | sha1sum | cut -d' ' -f1`.strip()
+      return `find '#{item_path}' -type f -print0 | sort -z | xargs -0 shasum | shasum | cut -d' ' -f1`.strip()
     end
+    
+    def self.podfile_path_transform(path)
+      if Configuration.build_using_repo_paths
+        return File.expand_path(PodBuilder::basepath(path))
+      else
+        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