pod-builder 1.9.3 → 2.0.0.beta.22

data/lib/pod_builder/command/none.rb

@@ -3,8 +3,8 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class None
-      def self.call(options)
-        unless !options.has_key?(:version)
+      def self.call
+        unless !OPTIONS.has_key?(:version)
           puts VERSION
           return 0
         end

data/lib/pod_builder/command/restore_all.rb

@@ -3,9 +3,9 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class RestoreAll
-      def self.call(options)
+      def self.call
         unless Configuration.restore_enabled
-          raise "Restore not enabled!".red
+          raise "\n\nRestore not enabled!".red
         end
   
         Configuration.check_inited
@@ -16,8 +16,8 @@ module PodBuilder
           File.rename(PodBuilder::basepath("Podfile.restore"), PodBuilder::basepath("Podfile"))
 
           ARGV << "*"
-          options[:skip_prebuild_update] = true
-          return Command::Build::call(options)
+          OPTIONS[:skip_prebuild_update] = true
+          return Command::Build::call
         rescue Exception => e
           raise e
         ensure

data/lib/pod_builder/command/switch.rb

@@ -3,7 +3,7 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class Switch
-      def self.call(options)
+      def self.call
         Configuration.check_inited
         PodBuilder::prepare_basepath
         
@@ -12,108 +12,176 @@ module PodBuilder
         unless argument_pods.count > 0 
           return -1
         end
-        unless argument_pods.count == 1
-          raise "\n\nSpecify a single pod to switch\n\n".red 
-        end
-        
-        pod_name_to_switch = argument_pods.first
-        
-        check_not_building_subspec(pod_name_to_switch)
 
-        installer, analyzer = Analyze.installer_at(PodBuilder::basepath, false)
-        all_buildable_items = Analyze.podfile_items(installer, analyzer)
+        pod_names_to_switch = []
+        argument_pods.each do |pod|
+          pod_name_to_switch = pod
+          pod_name_to_switch = Podfile::resolve_pod_names_from_podfile([pod_name_to_switch]).first
+          raise "\n\nDid not find pod '#{pod}'".red if pod_name_to_switch.nil?
+          
+          check_not_building_subspec(pod_name_to_switch)  
 
-        raise "\n\nPod `#{pod_name_to_switch}` wasn't found in Podfile" unless all_buildable_items.map(&:root_name).include?(pod_name_to_switch)
-        
-        unless options.has_key?(:switch_mode)
-          podfile_item = all_buildable_items.detect { |x| x.root_name == pod_name_to_switch }
-          options[:switch_mode] = request_switch_mode(pod_name_to_switch, podfile_item)
-
-          if options[:switch_mode].nil?
-            return 0
-          end
+          pod_names_to_switch.push(pod_name_to_switch)
         end
 
-        if options[:switch_mode] == "prebuilt"
-          check_prebuilded(pod_name_to_switch)
-        end
+        dep_pod_names_to_switch = []
+        if OPTIONS[:switch_all] == true
+          pod_names_to_switch.each do |pod|
+            podspec_path = PodBuilder::prebuiltpath("#{pod}/#{pod}.podspec")
+            unless File.exist?(podspec_path)
+              next
+            end
 
-        podfile_path = PodBuilder::project_path("Podfile")
-        podfile_content = File.read(podfile_path)
+            podspec_content = File.read(podspec_path)
 
-        pod_lines = []
-        podfile_content.each_line do |line|
-          if pod_name = Podfile.pod_definition_in(line, false)
-            if pod_name.start_with?("PodBuilder/")
-              pod_name = pod_name.split("PodBuilder/").last.gsub("_", "/")
-            end
+            regex = "p\\d\\.dependency '(.*)'"
 
-            unless pod_name.split("/").first == pod_name_to_switch
-              pod_lines.push(line)
-              next
+            podspec_content.each_line do |line|
+              matches = line.match(/#{regex}/)
+      
+              if matches&.size == 2
+                dep_pod_names_to_switch.push(matches[1].split("/").first)
+              end
             end
+          end
 
-            if pod_name.include?("/")
-              podfile_items = all_buildable_items.select { |x| x.name == pod_name }
-            else
-              podfile_items = all_buildable_items.select { |x| x.root_name == pod_name }
+          dep_pod_names_to_switch.uniq!
+          dep_pod_names_to_switch.reverse.each do |dep_name|
+            podspec_path = PodBuilder::prebuiltpath("#{dep_name}/#{dep_name}.podspec")
+            if File.exist?(podspec_path)
+              if pod = Podfile::resolve_pod_names_from_podfile([dep_name]).first
+                pod_names_to_switch.push(pod)
+                next
+              end    
             end
-
-            unless podfile_items.count > 0
-              raise "\n\nPod `#{pod_name_to_switch}` wasn't found in Podfile\n".red
+            
+            dep_pod_names_to_switch.delete(dep_name)
+          end
+          pod_names_to_switch = pod_names_to_switch.map { |t| t.split("/").first }.uniq
+          dep_pod_names_to_switch.reject { |t| pod_names_to_switch.include?(t) } 
+        end
+        
+        pod_names_to_switch.each do |pod_name_to_switch|
+          development_path = ""
+          default_entries = Hash.new
+
+          case OPTIONS[:switch_mode]
+          when "development"
+            development_path = find_podspec(pod_name_to_switch)               
+          when "prebuilt"
+            podfile_path = PodBuilder::basepath("Podfile.restore")
+            content = File.read(podfile_path)
+            if !content.include?("pod '#{pod_name_to_switch}")
+              raise "\n\n'#{pod_name_to_switch}' does not seem to be prebuit!".red
+            end
+          when "default"
+            podfile_path = PodBuilder::basepath("Podfile")
+            content = File.read(podfile_path)
+              
+            current_section = ""
+            content.each_line do |line|
+              stripped_line = line.strip
+              if stripped_line.start_with?("def ") || stripped_line.start_with?("target ")
+                current_section = line.split(" ")[1]
+                next
+              end
+    
+              matches = line.gsub("\"", "'").match(/pod '(.*?)',(.*)/)
+              if matches&.size == 3
+                if matches[1].split("/").first == pod_name_to_switch
+                  default_entries[current_section] = line
+                end  
+              end
             end
+    
+            raise "\n\n'#{pod_name_to_switch}' not found in #{podfile_path}".red if default_entries.keys.count == 0
+          end
 
-            matches = line.match(/(#\s*pb<)(.*?)(>)/)
-            if matches&.size == 4
-              default_pod_name = matches[2]
+          if development_path.nil? 
+            if dep_pod_names_to_switch.include?(pod_name_to_switch)
+              next
             else
-              puts "⚠️ Did not found pb<> entry, assigning default pod name #{pod_name}"
-              default_pod_name = pod_name
+              raise "\n\nCouln't find `#{pod_name_to_switch}` sources in the following specified development pod paths:\n#{Configuration.development_pods_paths.join("\n")}\n".red
             end
+          end
 
-            unless podfile_item = all_buildable_items.detect { |x| x.name == default_pod_name }
-              raise "\n\nPod `#{default_pod_name}` wasn't found in Podfile\n".red
+          podfile_path = PodBuilder::project_path("Podfile")
+          content = File.read(podfile_path)
+          
+          lines = []
+          current_section = ""
+          content.each_line do |line|
+            stripped_line = line.strip
+            if stripped_line.start_with?("def ") || stripped_line.start_with?("target ")
+              current_section = line.split(" ")[1]
             end
-            podfile_item = podfile_item.dup
-
-            indentation = line.detect_indentation
-
-            case options[:switch_mode]
-            when "prebuilt"
-              line = indentation + podfile_item.prebuilt_entry + "\n"
-            when "development"
-              podfile_item.path = find_podspec(podfile_item)
-              podfile_item.is_external = true
 
-              line = indentation + podfile_item.entry + "\n"
-            when "default"
-              line = indentation + podfile_item.entry + "\n"
-            else
-              break
+            matches = line.gsub("\"", "'").match(/pod '(.*?)',(.*)/)
+            if matches&.size == 3
+              if matches[1].split("/").first == pod_name_to_switch
+                case OPTIONS[:switch_mode]
+                when "prebuilt"
+                  indentation = line.split("pod '").first
+                  podspec_path = File.dirname(PodBuilder::prebuiltpath("#{pod_name_to_switch}/#{pod_name_to_switch}.podspec"))
+                  rel_path = Pathname.new(podspec_path).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
+                  prebuilt_line = "#{indentation}pod '#{matches[1]}', :path => '#{rel_path}'\n"
+                  if line.include?("# pb<") && marker = line.split("# pb<").last
+                    prebuilt_line = prebuilt_line.chomp("\n") + " # pb<#{marker}"
+                  end
+                  lines.append(prebuilt_line)
+                  next
+                when "development"
+                  indentation = line.split("pod '").first
+                  rel_path = Pathname.new(development_path).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
+                  development_line = "#{indentation}pod '#{matches[1]}', :path => '#{rel_path}'\n"
+                  if line.include?("# pb<") && marker = line.split("# pb<").last
+                    development_line = development_line.chomp("\n") + " # pb<#{marker}"
+                  end
+
+                  lines.append(development_line)
+                  next
+                when "default"
+                  if default_line = default_entries[current_section]
+                    if line.include?("# pb<") && marker = line.split("# pb<").last
+                      default_line = default_line.chomp("\n") + " # pb<#{marker}"
+                    end
+                    lines.append(default_line)
+                    next
+                  elsif
+                    raise "\n\nLine for pod '#{matches[1]}' in section '#{current_section}' not found in PodBuilder's Podfile".red
+                  end
+                else
+                  raise "\n\nUnsupported mode '#{OPTIONS[:switch_mode]}'".red
+                end
+              end  
             end
+
+            lines.append(line)
           end
 
-          pod_lines.push(line)
+          File.write(podfile_path, lines.join)
         end
         
-        File.write(podfile_path, pod_lines.join)
-        
         Dir.chdir(PodBuilder::project_path)
-        system("pod install")
+        bundler_prefix = Configuration.use_bundler ? "bundle exec " : ""
+        system("#{bundler_prefix}pod install;")
 
         return 0
       end
       
       private     
 
-      def self.find_podspec(podfile_item)
+      def self.find_podspec(podname)
         unless Configuration.development_pods_paths.count > 0
           raise "\n\nPlease add the development pods path(s) in #{Configuration.dev_pods_configuration_filename} as per documentation\n".red
         end
 
         podspec_path = nil
         Configuration.development_pods_paths.each do |path|
-          podspec = Dir.glob(File.expand_path("#{path}/**/#{podfile_item.root_name}*.podspec*"))
+          if Pathname.new(path).relative?
+            path = PodBuilder::basepath(path)
+          end
+          podspec = Dir.glob(File.expand_path("#{path}/**/#{podname}*.podspec*"))
           podspec.select! { |x| !x.include?("/Local Podspecs/") }
           podspec.select! { |x| Dir.glob(File.join(File.dirname(x), "*")).count > 1 } # exclude podspec folder (which has one file per folder)
           if podspec.count > 0
@@ -122,40 +190,14 @@ module PodBuilder
           end
         end
 
-        if podspec_path.nil?
-          raise "\n\nCouln't find `#{podfile_item.root_name}` sources in the following specified development pod paths: #{Configuration.development_pods_paths.join("\n")}\n".red
-        end
-
         return podspec_path
       end
-      
-      def self.request_switch_mode(pod_name, podfile_item)
-        matches = podfile_item.entry.match(/(pod '.*?',)(.*)('.*')/)
-        unless matches&.size == 4
-          raise "\n\nFailed matching pod name\n".red
-        end
-
-        default_entry = matches[3].strip
-
-        modes = ["prebuilt", "development", "default"]
-        mode_indx = ask("\n\nSwitch #{pod_name} to:\n1) Prebuilt\n2) Development pod\n3) Default (#{default_entry})\n\n") { |x| x.limit = 1, x.validate = /[1-3]/ }
-        
-        return modes[mode_indx.to_i - 1]
-      end
-      
+            
       def self.check_not_building_subspec(pod_to_switch)
         if pod_to_switch.include?("/")
           raise "\n\nCan't switch subspec #{pod_to_switch} refer to podspec name.\n\nUse `pod_builder switch #{pod_to_switch.split("/").first}` instead\n\n".red
         end
       end
-
-      private
-
-      def self.check_prebuilded(pod_name)
-        if !Podspec.include?(pod_name)
-          raise "\n\n#{pod_name} is not prebuilt.\n\nRun 'pod_builder build #{pod_name}'\n".red
-        end
-      end
     end
   end    
 end

data/lib/pod_builder/command/sync_podfile.rb

@@ -3,11 +3,11 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class SyncPodfile
-      def self.call(options)
+      def self.call
         Configuration.check_inited
         PodBuilder::prepare_basepath
         
-        install_update_repo = options.fetch(:update_repos, true)
+        install_update_repo = OPTIONS.fetch(:update_repos, true)
         installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
 
         all_buildable_items = Analyze.podfile_items(installer, analyzer)
@@ -21,9 +21,11 @@ module PodBuilder
         Licenses::write([], all_buildable_items)
 
         if previous_podfile_content != updated_podfile_content
-          system("pod install")
+          bundler_prefix = Configuration.use_bundler ? "bundle exec " : ""
+          system("#{bundler_prefix}pod install;")
         end
         
+        puts "\n\n🎉 done!\n".green
         return 0
       end
     end

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 
@@ -22,7 +25,7 @@ module PodBuilder
         app_podfile_content = File.read(PodBuilder::project_path("Podfile"))
 
         lldbinit_path = File.expand_path(argument_pods[0])
-        lldbinit_content = File.exists?(lldbinit_path) ? File.read(lldbinit_path) : ""
+        lldbinit_content = File.exist?(lldbinit_path) ? File.read(lldbinit_path) : ""
         status_hash = podfiles_status_hash(app_podfile_content, podfile_restore_content)
         if lldbinit_content.include?("# <pb_md5:#{base_path}:#{status_hash}")
           puts "\n\n🎉 already in sync!\n".green
@@ -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.exists?(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,18 @@ 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
+    private_constant :DEFAULT_LIBRARY_EVOLUTION_SUPPORT
     private_constant :MIN_LFS_SIZE_KB
     
     class <<self      
@@ -33,6 +38,7 @@ module PodBuilder
       attr_accessor :build_settings
       attr_accessor :build_settings_overrides
       attr_accessor :build_system
+      attr_accessor :library_evolution_support
       attr_accessor :base_path
       attr_accessor :spec_overrides      
       attr_accessor :skip_licenses
@@ -50,15 +56,23 @@ module PodBuilder
       attr_accessor :lfs_include_pods_folder
       attr_accessor :project_name
       attr_accessor :restore_enabled
-      attr_accessor :framework_plist_filename
-      attr_accessor :lock_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
     @build_settings = DEFAULT_BUILD_SETTINGS
     @build_settings_overrides = {}
     @build_system = DEFAULT_BUILD_SYSTEM
-    @base_path = "Frameworks" # Not nice. This value is used only for initial initization. Once config is loaded it will be an absolute path. FIXME
+    @library_evolution_support = DEFAULT_LIBRARY_EVOLUTION_SUPPORT
+    @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
@@ -66,8 +80,8 @@ module PodBuilder
     @license_filename = "Pods-acknowledgements"
     @subspecs_to_split = []
     @development_pods_paths = []
-    @build_base_path = "/tmp/pod_builder_".freeze
-    @build_path = "#{build_base_path}#{(Time.now.to_f * 1000).to_i}".freeze
+    @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
@@ -75,8 +89,17 @@ module PodBuilder
     @lfs_include_pods_folder = false
     @project_name = ""
     @restore_enabled = true
-    @framework_plist_filename = "PodBuilder.plist"
-    @lock_filename = "PodBuilder.lock"
+    @prebuilt_info_filename = "PodBuilder.json"
+    @lockfile_name = "PodBuilder.lock"
+    @lockfile_path = "/tmp/#{lockfile_name}"
+
+    @use_bundler = false
+    @deterministic_build = false
+
+    @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?
@@ -106,17 +129,17 @@ module PodBuilder
           end
         end
         if value = json["skip_licenses"]
-          if value.is_a?(Array) && value.count > 0
+          if value.is_a?(Array)
             Configuration.skip_licenses = value
           end
         end
         if value = json["skip_pods"]
-          if value.is_a?(Array) && value.count > 0
+          if value.is_a?(Array)
             Configuration.skip_pods = value
           end
         end
         if value = json["force_prebuild_pods"]
-          if value.is_a?(Array) && value.count > 0
+          if value.is_a?(Array)
             Configuration.force_prebuild_pods = value
           end
         end
@@ -135,6 +158,11 @@ module PodBuilder
             Configuration.build_system = value
           end
         end
+        if value = json["library_evolution_support"]
+          if [TrueClass, FalseClass].include?(value.class)
+            Configuration.library_evolution_support = value
+          end
+        end
         if value = json["license_filename"]
           if value.is_a?(String) && value.length > 0
             Configuration.license_filename = value
@@ -170,10 +198,35 @@ module PodBuilder
             Configuration.allow_building_development_pods = value
           end
         end
+        if value = json["use_bundler"]
+          if [TrueClass, FalseClass].include?(value.class)
+            Configuration.use_bundler = value
+          end
+        end
+        if value = json["deterministic_build"]
+          if [TrueClass, FalseClass].include?(value.class)
+            Configuration.deterministic_build = value
+          end
+        end
+        if value = json["build_for_apple_silicon"]
+          if [TrueClass, FalseClass].include?(value.class)
+            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
-      else
-        write
+
+        sanity_check()
       end
       
       dev_pods_configuration_path = File.join(Configuration.base_path, Configuration.dev_pods_configuration_filename)
@@ -188,6 +241,11 @@ module PodBuilder
         Configuration.development_pods_paths = json || []
         Configuration.development_pods_paths.freeze
       end
+
+      if !deterministic_build
+        build_path = "#{build_base_path}#{(Time.now.to_f * 1000).to_i}"
+        lockfile_path = File.join(PodBuilder::home, lockfile_name)
+      end
     end
     
     def self.write
@@ -201,15 +259,31 @@ module PodBuilder
       config["build_settings"] = Configuration.build_settings
       config["build_settings_overrides"] = Configuration.build_settings_overrides
       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
+      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
     
     private 
+
+    def self.sanity_check
+      Configuration.skip_pods.each do |pod|
+        if Configuration.force_prebuild_pods.include?(pod)
+          puts "PodBuilder.json contains '#{pod}' both in `force_prebuild_pods` and `skip_pods`. Will force prebuilding.".yellow
+        end
+      end
+    end
     
     def self.config_path
       unless path = podbuilder_path
@@ -221,6 +295,7 @@ module PodBuilder
     
     def self.podbuilder_path
       paths = Dir.glob("#{PodBuilder::home}/**/.pod_builder")
+      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