pod-builder 1.9.3 → 2.0.0.beta.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44fea048890540dd75a6b4dca94995a526c9978ad8b496b2af98bbdd97c3a7e2
-  data.tar.gz: 0efc17fe9c8ed070338f6b08e7190dde2826d14c9056c496e97e7c69b48ae72a
+  metadata.gz: 7884fca89b1f5498840e59b6e590836862749f7753f889120d7bd33bdc05a201
+  data.tar.gz: 3936b3ec07e51655f368c2c1001874b4933476d3678096d15184e0a36515be6b
 SHA512:
-  metadata.gz: dba81b8a392cfc9969a506a43cd3df30a58280946946c452fce20b3cba71535d51b65c205cca28c81825d5fdaf8588234ef8ff290f94a5ab709731f23eef087d
-  data.tar.gz: 802a0df25a2178fb3837b765456b086898d0f09f5d15c2caf50d91fdedb216973e6812fd981102c57c862c2d8daee2ee30136c803cb3e944d08b622a2dbdfb2c
+  metadata.gz: 6c0e8f13ca1a0a3c970c41722bae17a19236295fb3192cf6e5ff52a05507c831bf157363a3725b2184799451cd36a04a8c85c840ec33991f2d75bc890b2b1019
+  data.tar.gz: 5a340dc6930ec07ba988b3836a03a6caa7e2a7c9f033f6b901b5e7363353c1a4487e11ef8908adb0549a19dce1c13b1405a486baaa130f02716e85cd9857cb5c

data/.gitignore

@@ -8,3 +8,12 @@
 /tmp/
 Gemfile.lock
 .vscode/
+.DS_Store
+Example/Pods
+Example/PodBuilder/Prebuilt
+
+Example/PodBuilder/dSYM
+
+Example/PodBuilderExample.xcodeproj/xcuserdata/*.xcuserdatad
+Example/PodBuilderExample.xcworkspace/xcuserdata
+Example/Pods

data/README.md

@@ -12,18 +12,38 @@ Unless you're using a Ruby version manager you should generally install using `s
 
     $ sudo gem install pod-builder
 
+# Quick start
+
 You can the initialize your project to use the tool using the `init` command
 
     $ cd path-to-your-repo;
     $ pod_builder init
 
- This will add a _Frameworks_ folder which will contain all files needed and generated by the PodBuilder.
+ This will add a _PodBuilder_ folder which will contain all files needed and generated by the PodBuilder.
+
+ To prebuild all dependencies run
+
+    $ pod_builder build_all
+
+ To prebuild just one or more specific dependencies run
+
+    $ pod_builder build Pod1 Pod2
+
+This will generate the pod frameworks which can be committed to your repo for a much faster compilation.
+
+Should PodBuilder not work the way you expect you can get rid of it by running
+
+    $ pod_builder deintegrate
+
+Which will restore all changes that PodBUilder applied to the project (the PodBuilder folder and the changes to the Podfile).
+
+# Usage
 
 ## Podfile
 
 The workflow is very similar to the one you're used to with CocoaPods. The most significant difference is that PodBuilder relies on 3 Podfiles:
 
-### 1. Frameworks/Podfile (aka PodBuilder-Podfile)
+### 1. PodBuilder/Podfile (aka PodBuilder-Podfile)
 
 This is your original Podfile and remains your **master Podfile** that you will update as needed. It is used by PodBuilder to determine which versions and dependencies need to be compiled when prebuilding.
 
@@ -31,7 +51,7 @@ This is your original Podfile and remains your **master Podfile** that you will
 
 Based on the one above but will replace precompiled frameworks with references to the local PodBuilder podspec. **It is autogenerated and shouldn't be manually changed**
 
-### 3. Frameworks/Podfile.restore (aka Restore-Podfile)
+### 3. PodBuilder/Podfile.restore (aka Restore-Podfile)
 
 This acts as a sort of lockfile and reflects the current state of what is installed in the application, pinning pods to a particular tag or commit. This will be particularly useful until Swift reaches ABI stability, because when you check out an old revision of your code you won't be able to get your project running unless the Swift frameworks were compiled with a same version of Xcode you're currently using. This file is used internally by PodBuilder and shouldn't be manually changed. **It is autogenerated and shouldn't be manually changed**
 
@@ -48,7 +68,7 @@ Podbuilder comes with a set of commands:
 - `install_sources`: installs sources of pods to debug into prebuild frameworks
 - `switch`: switch between prebuilt, development or standard pod in the Application-Podfile
 - `clean`: removes unused prebuilt frameworks, dSYMs and source files added by install_sources
-- `sync_podfile`: updates the Application with all pods declared in the PodBuilder-Podfile file
+- `sync_podfile`: updates the Application-Podfile with all pods declared in the PodBuilder-Podfile file
 - `info`: outputs json-formatted information reflecting the current status of prebuilt pods
 
 Commands can be run from anywhere in your project's repo that is **required to be under git**. 
@@ -59,8 +79,8 @@ This will sets up a project to use PodBuilder.
 
 The following will happen:
 
-- Create a _Frameworks_ folder in your repo's root.
-- Copy your original Podfile to _Frameworks/Podfile_ (PodBuilder-Podfile)
+- Create a _PodBuilder_ folder in your repo's root.
+- Copy your original Podfile to _PodBuilder/Podfile_ (PodBuilder-Podfile)
 - Add an initially empty _PodBuilder.json_ configuration file
 - Modify the original Podfile (Application-Podfile) with some minor customizations
 - Create/Update your Gemfile adding the `gem 'pod-builder'` entry
@@ -75,18 +95,20 @@ Running `pod_builder build [pod name]` will precompile the pod that should be in
 
 The following will happen:
 
-- Create one or more (if there are dependencies) _.framework_ file/s under _Frameworks/Rome_ along with its corresponding _dSYM_ files (if applicable) 
+- Create one or more (if there are dependencies) _.framework_ file/s under _PodBuilder/Prebuilt_ along with its corresponding _dSYM_ files (if applicable) 
 - Update the Application-Podfile replacing the pod definition with the precompiled ones
 - Update/create the Podfile.restore (Restore-Podfile)
 - Update/create PodBuilder.podspec which is a local podspec for your prebuilt frameworks (more on this later)
 
+By default PodBuilder will only rebuild pods when changes are detected in source code. This behaviour can be overridden by passing the `--force` flag.
+
 #### `build_all` command
 
 As `build` but will prebuild all pods defined in PodBuilder-Podfile.
 
 #### `update` command
 
-If you decide not to commit the _Rome_ and _dSYM_ folders you can use this command to rebuild all those frameworks that are out-of-sync with the Restore-Podfile or that were built with a different version of the Swift compiler.
+If you decide not to commit the _Prebuilt_ and _dSYM_ folders you can use this command to rebuild all those frameworks that are out-of-sync with the Restore-Podfile or that were built with a different version of the Swift compiler.
 
 #### `restore_all` command
 
@@ -94,7 +116,7 @@ Will recompile all pods to the versions defined in the Restore-Podfile. You woul
 
 #### `install_sources` command
 
-When using PodBuilder you loose ability to directly access to the source code of a pod. To overcome this limitation you can use this command which downloads the pod's source code to _Frameworks/Sources_ and with some [tricks](https://medium.com/@t.camin/debugging-prebuilt-frameworks-c9f52d42600b) restores the ability to use the debugger and step into the code of your prebuilt dependencies. This can be very helpful to catch the exact location of a crash when it occurs (showing something more useful than assembly code). It is however advisable to switch to the original pod when doing any advanced debugging during development of code that involves a pod.
+When using PodBuilder you loose ability to directly access to the source code of a pod. To overcome this limitation you can use this command which downloads the pod's source code to _PodBuilder/Sources_ and with some [tricks](https://medium.com/@t.camin/debugging-prebuilt-frameworks-c9f52d42600b) restores the ability to use the debugger and step into the code of your prebuilt dependencies. This can be very helpful to catch the exact location of a crash when it occurs (showing something more useful than assembly code). It is however advisable to switch to the original pod when doing any advanced debugging during development of code that involves a pod.
 
 #### `update_lldbinit` command
 
@@ -117,7 +139,7 @@ Using the switch command you can choose to integrate it:
 - development. The _Development Pod_ used by CocoaPods
 - prebuilt. Use the prebuilt pod
 
-To support development pods you should specify the path(s) that contain the pods sources in _Frameworks/PodBuilderDevPodsPaths.json_ as follows
+To support development pods you should specify the path(s) that contain the pods sources in _PodBuilder/PodBuilderDevPodsPaths.json_ as follows
 
 ```json
 [
@@ -248,6 +270,10 @@ Like `build_settings` but per pod. Pod name can also refer to subspec.
 
 Specify which build system to use to compile frameworks. Either `Legacy` (standard build system) or `Latest` (new build system). Default value: `Legacy`.
 
+#### `library_evolution_support`
+
+Specify if Swift frameworks should be compiled with library evolution support (BUILD_LIBRARY_FOR_DISTRIBUTION).
+
 #### `license_filename`
 
 PodBuilder will create two license files a plist and a markdown file which contains the licenses of each pod specified in the PodBuilder-Podfile. Defailt value: `Pods-acknowledgements`(plist|md).
@@ -284,7 +310,7 @@ Normally when multiple subspecs are specified in a target a single framework is
 
 #### `lfs_update_gitattributes` 
 
-Adds a _.gitattributes_ to _Frameworks/Rome_ and _Frameworks/dSYM_ to exclude large files. If `lfs_include_pods_folder` is true it will add a the same _.gitattributes_ to the application's _Pods_ folder as well.
+Adds a _.gitattributes_ to _PodBuilder/Prebuilt_ and _PodBuilder/dSYM_ to exclude large files. If `lfs_include_pods_folder` is true it will add a the same _.gitattributes_ to the application's _Pods_ folder as well.
 
 
 #### `lfs_include_pods_folder`
@@ -292,9 +318,18 @@ Adds a _.gitattributes_ to _Frameworks/Rome_ and _Frameworks/dSYM_ to exclude la
 See [`lfs_update_gitattributes`](#lfs_update_gitattributes).
 
 
+#### `use_bundler`
+
+If you use bundler to pin the version of CocoaPods in your project set this to true. Default false.
+
+#### `build_for_apple_silicon`
+
+If set to true built frameworks will include iPhone simulator slices for Apple silicon based hardware. Default false.
+
+
 # Behind the scenes
 
-PodBuilder leverages CocoaPods code and [cocoapods-rome plugin](https://github.com/CocoaPods/Rome) to compile pods into frameworks. Every compiled framework will be boxed (by adding it as a `vendored_framework`) as a subspec of a local podspec. When needed additional settings will be automatically ported from the original podspec, like for example xcconfig settings.
+PodBuilder leverages CocoaPods code and [cocoapods-rome plugin](https://github.com/CocoaPods/Prebuilt) to compile pods into frameworks. Every compiled framework will be boxed (by adding it as a `vendored_framework`) as a subspec of a local podspec. When needed additional settings will be automatically ported from the original podspec, like for example xcconfig settings.
 
 # FAQ
 
@@ -330,7 +365,7 @@ Relaunch the build command passing `-d`, this won't delete the temporary _/tmp/p
 
 ### **Do I need to commit compiled frameworks?**
 
-No. If the size of compiled frameworks in your repo is a concern (and for whatever reason you can't use [Git-LFS](#git-lfs)) you can choose add the _Rome_ and _dSYM_ folder to .gitignore and run `pod_builder update` to rebuild all frameworks that need to be recompiled.
+No. If the size of compiled frameworks in your repo is a concern (and for whatever reason you can't use [Git-LFS](#git-lfs)) you can choose add the _Prebuilt_ and _dSYM_ folder to .gitignore and run `pod_builder update` to rebuild all frameworks that need to be recompiled.
 
 
 ### **I get an _'attempt to read non existent folder `/private/tmp/pod_builder/Pods/ podname'_ when building**
@@ -358,10 +393,12 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/Subito
 
 
 # Caveats
+
 Code isn't probably the cleanest I ever wrote but given the usefulness of the tool I decided to publish it nevertheless.
 
 
 # Authors
+
 [Tomas Camin](https://github.com/tcamin) ([@tomascamin](https://twitter.com/tomascamin))
 
 # License

data/exe/pod_builder

@@ -36,15 +36,15 @@ Command:
     + deintegrate                    Deintegrate prebuild folders
     + build                          Build a specific pod declared in the PodBuilder-Podfile
     + build_all                      Build all pods declared in the PodBuilder-Podfile
-    + update                         Rebuild frameworks that are outdated
+    + update                         Rebuild items that are outdated
     + restore_all                    Rebuild all pods declared in the Restore-Podfile
-    + install_sources                Install sources of pods to debug into prebuilt frameworks
-    + update_lldbinit                Generate an lldbinit file with setting target.source-map to debug prebuilt frameworks
+    + install_sources                Install sources of pods to debug into prebuilt items
+    + update_lldbinit                Generate an lldbinit file with setting target.source-map to debug prebuilt items
     + clear_lldbinit                 Clear an lldbinit file from PodBuilder's customizations
     + switch                         Switch between prebuilt/development/standard pod in the Application-Podfile
-    + clean                          Remove prebuild frameworks, dSYMs and source files added by `install_sources` command that are no longer in the PodBuilder-Podfile
+    + clean                          Remove prebuild items, dSYMs and source files added by `install_sources` command that are no longer in the PodBuilder-Podfile
     + sync_podfile                   Update your Application-Podfile with all pods declared in the PodBuilder-Podfile
-    + info                           Print json-formatted informations about prebuilt frameworks
+    + info                           Print json-formatted informations about prebuilt items
 
 Options:
 "
@@ -71,12 +71,15 @@ Options:
         opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
           OPTIONS[:update_repos] = false
         end
+        opts.on("-f", "--force", "Rebuild items even when no code change is detected") do |o|
+          OPTIONS[:force_rebuild] = false
+        end
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
           OPTIONS[:allow_warnings] = o
         end
-        opts.on("-a", "--auto-resolve-deps", "Resolve pod dependencies automatically") do |o|
-          OPTIONS[:auto_resolve_dependencies] = o
-        end
+        # opts.on("-a", "--auto-resolve-deps", "Resolve pod dependencies automatically") do |o|
+        #   OPTIONS[:auto_resolve_dependencies] = o
+        # end
         opts.on("-d", "--debug", "Don't clean build folder") do |o|
           OPTIONS[:debug] = o
         end
@@ -100,6 +103,9 @@ Options:
         opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
           OPTIONS[:update_repos] = false
         end
+        opts.on("-f", "--force", "Rebuild items even when no code change is detected") do |o|
+          OPTIONS[:force_rebuild] = false
+        end
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
           OPTIONS[:allow_warnings] = o
         end
@@ -119,7 +125,7 @@ Usage:
         
     $ pod_builder update [OPTIONS]
 
-      Rebuild frameworks that are outdated
+      Rebuild items that are outdated
         
 Options:
 "        
@@ -129,7 +135,7 @@ Options:
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
           OPTIONS[:allow_warnings] = o
         end
-        opts.on("-r", "--dry", "Determine which frameworks need update") do |o|
+        opts.on("-r", "--dry", "Determine which items need to be updated") do |o|
           OPTIONS[:dry_run] = o
         end
         opts.on("-d", "--debug", "Don't clean build folder") do |o|
@@ -224,10 +230,13 @@ Usage:
         
     $ pod_builder clean
 
-      Remove unused framework, dSYM and source folders.
+      Remove unused prebuild data, dSYM and source folders.
         
 Options:
-"           
+"         
+        opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
+          OPTIONS[:update_repos] = false
+        end
       end,
       :call => [        
         PodBuilder::Command::Clean
@@ -241,7 +250,7 @@ Usage:
         
     $ pod_builder install_sources
 
-      Install source of prebuilt pods to be able to step into and debug framework's code.
+      Install source of prebuilt pods to be able to step into and debug prebuilt's code.
 
 "         
       end,
@@ -258,9 +267,9 @@ Usage:
     $ pod_builder update_lldbinit <LLDBINIT_PATH> <PATH>
 
       Update LLDBINIT_PATH setting target.source-map in order to be able to step into 
-      and debug prebuilt framework's code.
+      and debug prebuilt prebuilt's code.
 
-      Specify the PATH of the folder containing the source code of prebuilt frameworks. PATH can be relative to PodBuilder's Framework folder.
+      Specify the PATH of the folder containing the source code of prebuilt items. PATH can be relative to PodBuilder's Prebuilt folder.
 
 "         
       end,
@@ -289,9 +298,9 @@ Usage:
         opts.banner = "
 Usage:
         
-    $ pod_builder switch PODNAME [OPTIONS]
+    $ pod_builder switch [OPTIONS] PODNAME[s]
 
-      Switch integration between prebuilt/development/default pod version.
+      Switch integration between prebuilt/development/default pod version. Multiple space separated pods can be passed
         
 Options:
 "        
@@ -304,6 +313,9 @@ Options:
         opts.on("-s", "--default", "Default version specified in PodBuilder-Podfile") do |o|
           OPTIONS[:switch_mode] = "default"
         end
+        opts.on("-a", "--all", "Include dependencies") do |o|
+          OPTIONS[:switch_all] = true
+        end
       end,
       :call => [        
         PodBuilder::Command::Switch
@@ -321,7 +333,12 @@ Usage:
       You may want to run this command when you add a new pod to the PodBuilder-Podfile 
       and you want to integrate it in the project without rebuilding it.
         
-"      end,
+Options:
+"       
+        opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
+          OPTIONS[:update_repos] = false
+        end
+      end,
       :call => [        
         PodBuilder::Command::SyncPodfile
       ]
@@ -357,9 +374,11 @@ Usage:
   else
     PodBuilder::Configuration.load
 
+    PodBuilder::add_lockfile
+
     subcommand[:opts].order!    
     subcommand[:call].each do |k|
-      if (ret = k.call(OPTIONS)) && ret == -1
+      if (ret = k.call) && ret == -1
         puts subcommand[:opts].help
       end
     end
@@ -374,8 +393,6 @@ begin
     raise "\n\nFor safety do not run this as root\n".red
   end
 
-  PodBuilder::add_lock_file
-  valid_lock_file = true
   command_ret = parse_commandline
 rescue Exception => e
   error = e.to_s
@@ -392,14 +409,8 @@ rescue Exception => e
 ensure
   if command_ret == 0
     PodBuilder::clean_basepath
-    
-    if !OPTIONS.has_key?(:debug)
-      PodBuilder::safe_rm_rf(PodBuilder::Configuration.build_path)
-    end    
-  end
-  if valid_lock_file
-    PodBuilder::remove_lock_file
   end
+  PodBuilder::remove_lockfile
 
   exit(command_ret)
 end

data/lib/pod_builder/analyze.rb

@@ -1,4 +1,6 @@
-require 'pod_builder/cocoapods/specification'
+require 'rubygems/specification'
+require 'pod_builder/rome/pre_install.rb'
+require 'pod_builder/rome/post_install.rb'
 
 module PodBuilder
   class Analyze
@@ -6,6 +8,14 @@ module PodBuilder
     #
     def self.installer_at(path, repo_update = false)
       CLAide::Command::PluginManager.load_plugins("cocoapods")
+      
+      # Manually load inline podbuilder-rome plugin
+      pluginspec = Gem::Specification.new("podbuilder-rome", PodBuilder::VERSION)
+      pluginspec.activate
+
+      if !CLAide::Command::PluginManager.loaded_plugins["cocoapods"].map(&:name).include?(pluginspec.name)
+        CLAide::Command::PluginManager.loaded_plugins["cocoapods"].push(pluginspec)
+      end
 
       current_dir = Dir.pwd
       Dir.chdir(path)
@@ -40,15 +50,30 @@ module PodBuilder
       checkout_options.merge!(analyzer.sandbox.checkout_sources)
       
       all_specs = analysis_result.specifications
+      
+      supported_platforms = analyzer.instance_variable_get("@result").targets.map { |t| t.platform.safe_string_name.downcase }
+      all_podfile_items = all_specs.map { |spec| PodfileItem.new(spec, all_specs, checkout_options, supported_platforms) }
 
-      all_podfile_specs = all_specs.select { |x| all_podfile_pods.map(&:name).include?(x.name) }
+      names = analyzer.explicit_pods().map(&:name)
 
-      deps_names = all_podfile_specs.map { |x| x.recursive_dep_names(all_specs) }.flatten.uniq
+      podfile_pods = []
+      last_count = -1 
+      while podfile_pods.count != last_count do
+        last_count = podfile_pods.count
 
-      all_podfile_specs += all_specs.select { |x| deps_names.include?(x.name) }
-      all_podfile_specs.uniq!
-      
-      return all_podfile_specs.map { |spec| PodfileItem.new(spec, all_specs, checkout_options) }
+        updated_names = []
+        names.each do |name|
+          if pod = all_podfile_items.detect { |t| t.name == name }
+            podfile_pods.push(pod)
+            updated_names += pod.dependency_names
+          end
+        end
+        
+        names = updated_names.uniq
+        podfile_pods.uniq!
+      end
+
+      return podfile_pods.sort_by(&:name)
     end
   end
 end

data/lib/pod_builder/analyzer.rb

@@ -0,0 +1,16 @@
+require 'cocoapods/installer/analyzer.rb'
+
+module Pod
+  class Installer
+    class Analyzer
+        def explicit_pods
+            pods = []
+            podfile.root_target_definitions[0].children.each do |children|
+                pods += children.dependencies
+            end
+
+            pods.flatten.uniq.sort
+        end
+    end
+  end
+end

data/lib/pod_builder/command/build.rb

@@ -3,7 +3,7 @@ require 'pod_builder/core'
 module PodBuilder
   module Command
     class Build
-      def self.call(options)          
+      def self.call 
         Configuration.check_inited
         PodBuilder::prepare_basepath
 
@@ -13,20 +13,28 @@ module PodBuilder
           return -1
         end
 
-        raise "\n\nPlease rename your Xcode installation path removing spaces, current `#{`xcode-select -p`.strip()}`\n" if `xcode-select -p`.strip().include?(" ")
+        raise "\n\nPlease rename your Xcode installation path removing spaces, current `#{`xcode-select -p`.strip()}`\n".red if `xcode-select -p`.strip().include?(" ")
 
         Podfile.sanity_check()
         check_not_building_subspecs(argument_pods)
 
-        install_update_repo = options.fetch(:update_repos, true)
+        puts "Loading Podfile".yellow
+
+        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)
         prebuilt_items = all_buildable_items.select { |x| x.is_prebuilt }
         buildable_items = all_buildable_items - prebuilt_items
 
-        if argument_pods.first == "*"
-          argument_pods = buildable_items.map(&:root_name)
+        build_all = argument_pods.first == "*"
+        if build_all
+          argument_pods = all_buildable_items.map(&:root_name).uniq
+        else
+          argument_pods = Podfile::resolve_pod_names(argument_pods, all_buildable_items)
+          deps = all_buildable_items.select { |t| argument_pods.include?(t.root_name) }.map(&:dependency_names).flatten.map { |t| t.split("/").first }
+          argument_pods += deps
+          argument_pods.uniq!
         end
 
         available_argument_pods = argument_pods.select { |x| all_buildable_items.map(&:root_name).include?(x) }     
@@ -41,10 +49,10 @@ module PodBuilder
 
         restore_file_error = Podfile.restore_file_sanity_check
   
-        check_splitted_subspecs_are_static(all_buildable_items, options)
+        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, options)
+        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
@@ -52,7 +60,7 @@ module PodBuilder
         # 2. pods to build in release
         # 3. pods to build in debug
 
-        check_not_building_development_pods(pods_to_build, options)
+        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) }
 
@@ -73,34 +81,37 @@ module PodBuilder
         licenses = []
         
         podfiles_items.select { |x| x.count > 0 }.each do |podfile_items|
-          podfile_items = add_dependencies(podfile_items, all_buildable_items)
-          podfile_content = Podfile.from_podfile_items(podfile_items, analyzer)
+          build_configuration = podfile_items.map(&:build_configuration).uniq.first
           
-          Install.podfile(podfile_content, podfile_items, podfile_items.first.build_configuration)
-
-          licenses += license_specifiers
+          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)
+          
+          licenses += 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
 
-        clean_frameworks_folder(all_buildable_items)
+        Clean::prebuilt_items(all_buildable_items)
 
         Licenses::write(licenses, all_buildable_items)
 
-        GenerateLFS::call(nil)
+        GenerateLFS::call()
         Podspec::generate(all_buildable_items, analyzer)
 
         builded_pods = podfiles_items.flatten
-        builded_pods_and_deps = add_dependencies(builded_pods, all_buildable_items).select { |x| !x.is_prebuilt }
+        
+        builded_pods_and_deps = podfiles_items.flatten.map { |t| t.recursive_dependencies(all_buildable_items) }.flatten.uniq
+        builded_pods_and_deps.select! { |x| !x.is_prebuilt }
+        
         Podfile::write_restorable(builded_pods_and_deps + prebuilt_pods_to_install, all_buildable_items, analyzer)     
-        if !options.has_key?(:skip_prebuild_update)   
+        if !OPTIONS.has_key?(:skip_prebuild_update)   
           Podfile::write_prebuilt(all_buildable_items, analyzer)
         end
 
         Podfile::install
 
-        sanity_checks(options)
+        sanity_checks
 
         if (restore_file_error = restore_file_error) && Configuration.restore_enabled
           puts "\n\n⚠️ Podfile.restore was found invalid and was overwritten. Error:\n #{restore_file_error}".red
@@ -112,88 +123,6 @@ module PodBuilder
 
       private
 
-      def self.license_specifiers
-        acknowledge_files = Dir.glob("#{PodBuilder::Configuration.build_path}/Pods/**/*acknowledgements.plist")
-        raise "Too many ackwnoledge files found" if acknowledge_files.count > 1
-
-        if acknowledge_file = acknowledge_files.first
-          plist = CFPropertyList::List.new(:file => acknowledge_file)
-          data = CFPropertyList.native_types(plist.value)
-          
-          return data["PreferenceSpecifiers"]
-        end
-
-        return []
-      end
-
-      def self.add_dependencies(pods, buildable_items)
-        pods.dup.each do |pod|
-          build_configuration = pods.first.build_configuration
-
-          dependencies = pod.dependencies(buildable_items).select { |x| !pods.include?(x) && !pod.has_common_spec(x.name) }
-          dependencies.each { |x| x.build_configuration = build_configuration }
-          pods = dependencies + pods # dependencies should come first
-        end
-        
-        return pods
-      end
-
-      def self.expected_common_dependencies(pods_to_build, buildable_items, options)
-        warned_expected_pod_list = []
-        expected_pod_list = []
-        errors = []
-
-        pods_to_build.each do |pod_to_build|
-          pod_to_build.dependency_names.each do |dependency|
-            unless buildable_items.detect { |x| x.root_name == dependency || x.name == dependency } != nil
-              next
-            end
-
-            buildable_items.each do |buildable_pod|
-              unless !pod_to_build.dependency_names.include?(buildable_pod.name)
-                next
-              end
-
-              if buildable_pod.dependency_names.include?(dependency) && !buildable_pod.has_subspec(dependency) && !buildable_pod.has_common_spec(dependency) then
-                expected_pod_list += pods_to_build.map(&:root_name) + [buildable_pod.root_name]
-                expected_pod_list.uniq!
-
-                expected_list = expected_pod_list.join(" ")
-                if !warned_expected_pod_list.include?(expected_list)
-                  errors.push("Can't build #{pod_to_build.name} because it has common dependencies (#{dependency}) with #{buildable_pod.name}.\n\nUse `pod_builder build #{expected_list}` instead or use `pod_builder build -a #{pod_to_build.name}` to automatically resolve missing dependencies\n\n")
-                  errors.uniq!
-                  warned_expected_pod_list.push(expected_list)
-
-                  if options.has_key?(:auto_resolve_dependencies)
-                    puts "`#{pod_to_build.name}` has the following dependencies:\n`#{pod_to_build.dependency_names.join("`, `")}`\nWhich are in common with `#{buildable_pod.name}` and requires it to be recompiled\n\n".yellow
-                  end
-                end
-              end
-            end
-          end
-        end
-
-        return expected_pod_list, errors
-      end
-
-      def self.expected_parent_dependencies(pods_to_build, buildable_items, options)
-        expected_pod_list = []
-        errors = []
-
-        buildable_items_dependencies = buildable_items.map(&:dependency_names).flatten.uniq
-        pods_to_build.each do |pod_to_build|
-          if buildable_items_dependencies.include?(pod_to_build.name)
-            parent = buildable_items.detect { |x| x.dependency_names.include?(pod_to_build.name) }
-
-            expected_pod_list += (pods_to_build + [parent]).map(&:root_name)
-            expected_pod_list.uniq!
-            errors.push("Can't build #{pod_to_build.name} because it is a dependency of #{parent.name}.\n\nUse `pod_builder build #{expected_pod_list.join(" ")}` instead\n\n")
-          end
-        end
-
-        return expected_pod_list, errors
-      end
-
       def self.check_not_building_subspecs(pods_to_build)
         pods_to_build.each do |pod_to_build|
           if pod_to_build.include?("/")
@@ -203,7 +132,7 @@ module PodBuilder
       end
 
       def self.check_pods_exists(pods, buildable_items)
-        raise "Empty Podfile?" if buildable_items.nil?
+        raise "\n\nEmpty Podfile?".red if buildable_items.nil?
 
         buildable_items = buildable_items.map(&:root_name)
         pods.each do |pod|
@@ -211,7 +140,7 @@ module PodBuilder
         end
       end
 
-      def self.check_splitted_subspecs_are_static(all_buildable_items, options)
+      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)
 
@@ -221,11 +150,11 @@ module PodBuilder
           return
         end
 
-        warn_message = "The following pods `#{invalid_subspecs.join(" ")}` are non static frameworks 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]
+        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}".yellow
+          raise "\n\n🚨️  #{warn_message}".red
         end
       end
 
@@ -239,14 +168,14 @@ module PodBuilder
           pods_with_unaligned_build_configuration = pods_with_common_deps.select { |x| x.build_configuration != pod.build_configuration }
           pods_with_unaligned_build_configuration.map!(&:name)
 
-          raise "Dependencies of `#{pod.name}` don't have the same build configuration (#{pod.build_configuration}) of `#{pods_with_unaligned_build_configuration.join(",")}`'s dependencies" if pods_with_unaligned_build_configuration.count > 0
+          raise "\n\nDependencies of `#{pod.name}` don't have the same build configuration (#{pod.build_configuration}) of `#{pods_with_unaligned_build_configuration.join(",")}`'s dependencies".red if pods_with_unaligned_build_configuration.count > 0
         end
       end
 
-      def self.check_not_building_development_pods(pods, options)
-        if (development_pods = pods.select { |x| x.is_development_pod }) && development_pods.count > 0 && (options[:allow_warnings].nil?  && Configuration.allow_building_development_pods == false)
+      def self.check_not_building_development_pods(pods)
+        if (development_pods = pods.select { |x| x.is_development_pod }) && development_pods.count > 0 && (OPTIONS[:allow_warnings].nil?  && Configuration.allow_building_development_pods == false)
           pod_names = development_pods.map(&:name).join(", ")
-          raise "The following pods are in development mode: `#{pod_names}`, won't proceed building.\n\nYou can ignore this error by passing the `--allow-warnings` flag to the build command\n"
+          raise "\n\nThe following pods are in development mode: `#{pod_names}`, won't proceed building.\n\nYou can ignore this error by passing the `--allow-warnings` flag to the build command\n".red
         end
       end
 
@@ -259,7 +188,7 @@ module PodBuilder
         return buildable_subspecs - pods_to_build
       end
 
-      def self.sanity_checks(options)
+      def self.sanity_checks
         lines = File.read(PodBuilder::project_path("Podfile")).split("\n")
         stripped_lines = lines.map { |x| Podfile.strip_line(x) }.select { |x| !x.start_with?("#")}
 
@@ -267,7 +196,7 @@ 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]
+          if OPTIONS[:allow_warnings]
             puts "\n\n⚠️  #{warn_message}".yellow
           else
             raise "\n\n🚨️  #{warn_message}".red
@@ -275,60 +204,14 @@ module PodBuilder
         end
       end
 
-      def self.resolve_pods_to_build(argument_pods, buildable_items, options)
+      def self.resolve_pods_to_build(argument_pods, buildable_items)
         pods_to_build = []
         
-        fns = [method(:expected_common_dependencies), method(:expected_parent_dependencies)]
-        fns.each do |fn|
-          loop do
-            pods_to_build = buildable_items.select { |x| argument_pods.include?(x.root_name) }
-            pods_to_build += other_subspecs(pods_to_build, buildable_items)
-            tmp_buildable_items = buildable_items - pods_to_build
-
-            expected_pods, errors = fn.call(pods_to_build, tmp_buildable_items, options)
-            if expected_pods.count > 0
-              if !options.has_key?(:auto_resolve_dependencies) && expected_pods.count > 0
-                raise "\n\n#{errors.join("\n")}".red
-              else
-                argument_pods = expected_pods.uniq
-              end  
-            end
-            
-            if !options.has_key?(:auto_resolve_dependencies) || expected_pods.count == 0
-              break
-            end
-          end  
-        end
+        pods_to_build = buildable_items.select { |x| argument_pods.include?(x.root_name) }
+        pods_to_build += other_subspecs(pods_to_build, buildable_items)
 
         return pods_to_build
-      end
-
-      def self.clean_frameworks_folder(buildable_items)
-        puts "Cleaning framework folder".yellow
-
-        expected_frameworks = buildable_items.map { |x| "#{x.module_name}.framework" }
-        expected_frameworks += buildable_items.map { |x| x.vendored_items }.flatten.map { |x| File.basename(x) }
-        expected_frameworks.uniq!
-
-        existing_frameworks = Dir.glob("#{PodBuilder::basepath("Rome")}/*.framework")
-
-        existing_frameworks.each do |existing_framework|
-          existing_framework_name = File.basename(existing_framework)
-          if !expected_frameworks.include?(existing_framework_name)
-            puts "Cleanining up `#{existing_framework_name}`, no longer found among dependencies".blue
-            FileUtils.rm_rf(existing_framework)
-          end
-        end
-
-        existing_dsyms = Dir.glob("#{PodBuilder::basepath("dSYM")}/**/*.dSYM")
-        existing_dsyms.each do |existing_dsym|
-          existing_dsym_name = File.basename(existing_dsym)
-          if !expected_frameworks.include?(existing_dsym_name.gsub(".dSYM", ""))
-            puts "Cleanining up `#{existing_dsym_name}`, no longer found among dependencies".blue
-            FileUtils.rm_rf(existing_dsym)
-          end
-        end
-      end
+      end      
     end
   end
 end