• Fabio Pelosin's avatar
    Merge branch 'master' into sandbox_reorganization_544 · aa6a4cf6
    Fabio Pelosin authored
    * master: (67 commits)
      [Bundle] update
      Update CHANGELOG.md
      Release 0.21.0.rc1
      [Gemspec] Update Xcodeproj
      [Bundle] update
      Changelog
      [Bundle] Update
      [Fixtures] Update for release
      [Bundle] Update
      [Rakefile] Examples robustness for future versions of Xcode
      [Changelog] Add #1099
      [CHANGELOG]
      [Generator::Xcconfig] Docs
      [Bundle] Use Xcodeproj from master
      [Installer] Rename #targets to #aggregate_targets
      Add files which were creating issues with git
      Delete files creating issues with git
      Update integration test fixtures
      Case change for case-sensitive file systems
      Update tests
      ...
    
    Conflicts:
    	lib/cocoapods/installer.rb
    	lib/cocoapods/installer/target_installer.rb
    	spec/integration/install_add_pod/after/Pods/Manifest.lock
    	spec/integration/install_add_pod/after/Pods/Pods-JSONKit-prefix.pch
    	spec/integration/install_add_pod/after/Pods/Pods-Reachability-prefix.pch
    	spec/integration/install_add_pod/after/Pods/Pods-acknowledgements.markdown
    	spec/integration/install_add_pod/after/Pods/Pods-acknowledgements.plist
    	spec/integration/install_add_pod/after/Pods/Pods-resources.sh
    	spec/integration/install_add_pod/after/Pods/Pods.xcconfig
    	spec/integration/install_add_pod/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_add_pod/after/execution_output.txt
    	spec/integration/install_custom_workspace/after/Pods/Manifest.lock
    	spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1-Reachability-prefix.pch
    	spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1-resources.sh
    	spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1.xcconfig
    	spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2-Reachability-prefix.pch
    	spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2-resources.sh
    	spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2.xcconfig
    	spec/integration/install_custom_workspace/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_custom_workspace/after/execution_output.txt
    	spec/integration/install_external_source/after/Pods/Manifest.lock
    	spec/integration/install_external_source/after/Pods/Pods-PodTest-prefix.pch
    	spec/integration/install_external_source/after/Pods/Pods-acknowledgements.markdown
    	spec/integration/install_external_source/after/Pods/Pods-acknowledgements.plist
    	spec/integration/install_external_source/after/Pods/Pods-resources.sh
    	spec/integration/install_external_source/after/Pods/Pods.xcconfig
    	spec/integration/install_external_source/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_external_source/after/execution_output.txt
    	spec/integration/install_local_source/after/Pods/Manifest.lock
    	spec/integration/install_local_source/after/Pods/Pods-Reachability-prefix.pch
    	spec/integration/install_local_source/after/Pods/Pods-acknowledgements.markdown
    	spec/integration/install_local_source/after/Pods/Pods-acknowledgements.plist
    	spec/integration/install_local_source/after/Pods/Pods-resources.sh
    	spec/integration/install_local_source/after/Pods/Pods.xcconfig
    	spec/integration/install_local_source/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_local_source/after/execution_output.txt
    	spec/integration/install_multiple_targets/after/Pods/Manifest.lock
    	spec/integration/install_multiple_targets/after/Pods/Pods-Reachability-prefix.pch
    	spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-Reachability-prefix.pch
    	spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-acknowledgements.markdown
    	spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-acknowledgements.plist
    	spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-resources.sh
    	spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2.xcconfig
    	spec/integration/install_multiple_targets/after/Pods/Pods-acknowledgements.markdown
    	spec/integration/install_multiple_targets/after/Pods/Pods-acknowledgements.plist
    	spec/integration/install_multiple_targets/after/Pods/Pods-resources.sh
    	spec/integration/install_multiple_targets/after/Pods/Pods-test-JSONKit-prefix.pch
    	spec/integration/install_multiple_targets/after/Pods/Pods-test-acknowledgements.markdown
    	spec/integration/install_multiple_targets/after/Pods/Pods-test-acknowledgements.plist
    	spec/integration/install_multiple_targets/after/Pods/Pods-test-resources.sh
    	spec/integration/install_multiple_targets/after/Pods/Pods-test.xcconfig
    	spec/integration/install_multiple_targets/after/Pods/Pods.xcconfig
    	spec/integration/install_multiple_targets/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_multiple_targets/after/execution_output.txt
    	spec/integration/install_new/after/Pods/Manifest.lock
    	spec/integration/install_new/after/Pods/Pods-Reachability-prefix.pch
    	spec/integration/install_new/after/Pods/Pods-acknowledgements.markdown
    	spec/integration/install_new/after/Pods/Pods-acknowledgements.plist
    	spec/integration/install_new/after/Pods/Pods-resources.sh
    	spec/integration/install_new/after/Pods/Pods.xcconfig
    	spec/integration/install_new/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_new/after/execution_output.txt
    	spec/integration/install_podfile_callbacks/after/Pods/Manifest.lock
    	spec/integration/install_podfile_callbacks/after/Pods/Pods-Reachability-prefix.pch
    	spec/integration/install_podfile_callbacks/after/Pods/Pods-resources.sh
    	spec/integration/install_podfile_callbacks/after/Pods/Pods.xcconfig
    	spec/integration/install_podfile_callbacks/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_podfile_callbacks/after/execution_output.txt
    	spec/integration/install_podspec/after/Pods/Manifest.lock
    	spec/integration/install_podspec/after/Pods/Pods-acknowledgements.markdown
    	spec/integration/install_podspec/after/Pods/Pods-acknowledgements.plist
    	spec/integration/install_podspec/after/Pods/Pods-resources.sh
    	spec/integration/install_podspec/after/Pods/Pods.xcconfig
    	spec/integration/install_podspec/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_podspec/after/execution_output.txt
    	spec/integration/install_remove_pod/after/Pods/Manifest.lock
    	spec/integration/install_remove_pod/after/Pods/Pods-resources.sh
    	spec/integration/install_remove_pod/after/Pods/Pods.xcconfig
    	spec/integration/install_remove_pod/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_remove_pod/after/execution_output.txt
    	spec/integration/install_spec_callbacks/after/Pods/Manifest.lock
    	spec/integration/install_spec_callbacks/after/Pods/Pods-acknowledgements.markdown
    	spec/integration/install_spec_callbacks/after/Pods/Pods-acknowledgements.plist
    	spec/integration/install_spec_callbacks/after/Pods/Pods-resources.sh
    	spec/integration/install_spec_callbacks/after/Pods/Pods.xcconfig
    	spec/integration/install_spec_callbacks/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_spec_callbacks/after/execution_output.txt
    	spec/integration/install_subspecs/after/Pods/Manifest.lock
    	spec/integration/install_subspecs/after/Pods/Pods-OS X App-PodTest-prefix.pch
    	spec/integration/install_subspecs/after/Pods/Pods-OS X App-acknowledgements.markdown
    	spec/integration/install_subspecs/after/Pods/Pods-OS X App-acknowledgements.plist
    	spec/integration/install_subspecs/after/Pods/Pods-OS X App-resources.sh
    	spec/integration/install_subspecs/after/Pods/Pods-OS X App.xcconfig
    	spec/integration/install_subspecs/after/Pods/Pods-iOS App-PodTest-prefix.pch
    	spec/integration/install_subspecs/after/Pods/Pods-iOS App-acknowledgements.markdown
    	spec/integration/install_subspecs/after/Pods/Pods-iOS App-acknowledgements.plist
    	spec/integration/install_subspecs/after/Pods/Pods-iOS App-resources.sh
    	spec/integration/install_subspecs/after/Pods/Pods-iOS App.xcconfig
    	spec/integration/install_subspecs/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/install_subspecs/after/execution_output.txt
    	spec/integration/update/after/Pods/Manifest.lock
    	spec/integration/update/after/Pods/Pods-resources.sh
    	spec/integration/update/after/Pods/Pods.xcconfig
    	spec/integration/update/after/Pods/Pods.xcodeproj.yaml
    	spec/integration/update/after/execution_output.txt
    	spec/unit/installer/analyzer_spec.rb
    	spec/unit/installer/target_installer_spec.rb
    	spec/unit/sandbox_spec.rb
    aa6a4cf6
Name
Last commit
Last update
..
AFNetworking iOS Example.xcodeproj Loading commit data...
AFNetworking iOS Example.xcworkspace Loading commit data...
Classes Loading commit data...
Images Loading commit data...
AppDelegate.h Loading commit data...
AppDelegate.m Loading commit data...
Info.plist Loading commit data...
Podfile Loading commit data...
Prefix.pch Loading commit data...
main.m Loading commit data...