• Fabio Pelosin's avatar
    Merge branch 'master' into dedicated-targets · 0304d9d6
    Fabio Pelosin authored
    * master: (46 commits)
      Use Kicker from master
      [Changelog] Fixed crash due to Podfile.lock containing multiple version requirements.
      [Integration] Update fixtures
      * Truncating the resources-to-copy.txt file if it already exists.
      [Travis] Attempt to fix 1.9.3 Issues
      Remove Rake dependency
      [Specs] Remove old uneeded integration spec
      [Core] Update for recent changes
      [Bundler] Add Gemfile.lock to source control and update Bundler on release
      Remove Octokit dep 2
      [WIP] Remove Octokit dep
      Fix missing space in output.
      english fix for 'Podfile does not contain any dependency'
      Release 0.20.2
      [Sandbox] Allow sandbox-pod to execute any tool inside a rbenv prefix.
      Bump to 0.20.2
      [CHANGELOG] Cleanup.
      [Spec] Update integrations specs for 0.20.2
      [CHANGELOG] Update for 0.20.2
      [Sandbox] Allow any tool inside the Xcode.app bundle to be executed.
      ...
    
    Conflicts:
    	spec/integration/install_add_pod/after/Pods/Pods-resources.sh
    	spec/integration/install_custom_workspace/after/Podfile.lock
    	spec/integration/install_custom_workspace/after/Pods/Manifest.lock
    	spec/integration/install_external_source/after/Pods/Pods-resources.sh
    	spec/integration/install_local_source/after/Pods/Pods-resources.sh
    	spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-resources.sh
    	spec/integration/install_multiple_targets/after/Pods/Pods-resources.sh
    	spec/integration/install_multiple_targets/after/Pods/Pods-test-resources.sh
    	spec/integration/install_new/after/Pods/Pods-resources.sh
    	spec/integration/install_podfile_callbacks/after/Pods/Pods-resources.sh
    	spec/integration/install_podspec/after/Pods/Pods-resources.sh
    	spec/integration/install_remove_pod/after/Pods/Pods-resources.sh
    	spec/integration/install_spec_callbacks/after/Pods/Pods-resources.sh
    	spec/integration/install_subspecs/after/Podfile.lock
    	spec/integration/install_subspecs/after/Pods/Manifest.lock
    	spec/integration/update/after/Pods/Pods-resources.sh
    	spec/integration_spec.rb
    	spec/unit/installer_spec.rb
    0304d9d6
Name
Last commit
Last update
..
command Loading commit data...
generator Loading commit data...
hooks Loading commit data...
installer Loading commit data...
sandbox Loading commit data...
target Loading commit data...
user_interface Loading commit data...
command.rb Loading commit data...
config.rb Loading commit data...
downloader.rb Loading commit data...
executable.rb Loading commit data...
external_sources.rb Loading commit data...
gem_version.rb Loading commit data...
installer.rb Loading commit data...
open_uri.rb Loading commit data...
project.rb Loading commit data...
resolver.rb Loading commit data...
sandbox.rb Loading commit data...
sources_manager.rb Loading commit data...
target.rb Loading commit data...
user_interface.rb Loading commit data...
validator.rb Loading commit data...