• Fabio Pelosin's avatar
    Merge branch 'master' into sandbox_reorganization_544 · 7f8f29ae
    Fabio Pelosin authored
    * master:
      Reference the integration spec files from a submodule pointing to CocoaPods/cocoapods-integration-specs
      Remove integration specs files
    
    Conflicts:
    	spec/integration/install_add_pod/after/Podfile.lock
    	spec/integration/install_add_pod/after/Pods/BuildHeaders/Reachability/Reachability.h
    	spec/integration/install_add_pod/after/Pods/Generated/Manifest.lock
    	spec/integration/install_add_pod/after/Pods/Generated/Pods-JSONKit-dummy.m
    	spec/integration/install_add_pod/after/Pods/Generated/Pods-JSONKit-prefix.pch
    	spec/integration/install_add_pod/after/Pods/Generated/Pods-Reachability-dummy.m
    	spec/integration/install_add_pod/after/Pods/Generated/Pods-Reachability-prefix.pch
    	spec/integration/install_add_pod/after/Pods/Generated/Pods-Reachability.xcconfig
    	spec/integration/install_add_pod/after/Pods/Generated/Pods-acknowledgements.markdown
    	spec/integration/install_add_pod/after/Pods/Generated/Pods-acknowledgements.plist
    	spec/integration/install_add_pod/after/Pods/Generated/Pods-dummy.m
    	spec/integration/install_add_pod/after/Pods/Generated/Pods-environment.h
    	spec/integration/install_add_pod/after/Pods/Generated/Pods-resources.sh
    	spec/integration/install_add_pod/after/Pods/Generated/Sources/JSONKit/JSONKit.h
    	spec/integration/install_add_pod/after/Pods/Generated/Sources/JSONKit/JSONKit.m
    	spec/integration/install_add_pod/after/Pods/Generated/Sources/JSONKit/README.md
    	spec/integration/install_add_pod/after/Pods/Generated/Sources/Reachability/README.md
    	spec/integration/install_add_pod/after/Pods/Generated/Sources/Reachability/Reachability.h
    	spec/integration/install_add_pod/after/Pods/Generated/Sources/Reachability/Reachability.m
    	spec/integration/install_add_pod/after/Pods/Headers/Reachability/Reachability.h
    	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/SampleApp.xcworkspace/contents.xcworkspacedata
    	spec/integration/install_add_pod/after/execution_output.txt
    	spec/integration/install_custom_workspace/after/Podfile.lock
    	spec/integration/install_custom_workspace/after/Pods/Generated/Manifest.lock
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-Reachability-dummy.m
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-Reachability-prefix.pch
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-Reachability.xcconfig
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-acknowledgements.markdown
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-acknowledgements.plist
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-dummy.m
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-environment.h
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-resources.sh
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-Reachability-dummy.m
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-Reachability-prefix.pch
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-Reachability.xcconfig
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-acknowledgements.markdown
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-acknowledgements.plist
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-dummy.m
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-environment.h
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-resources.sh
    	spec/integration/install_custom_workspace/after/Pods/Generated/Pods.xcodeproj.yaml
    	spec/integration/install_custom_workspace/after/Pods/Generated/Sources/Reachability/README.md
    	spec/integration/install_custom_workspace/after/Pods/Generated/Sources/Reachability/Reachability.h
    	spec/integration/install_custom_workspace/after/Pods/Generated/Sources/Reachability/Reachability.m
    	spec/integration/install_custom_workspace/after/Workspace.xcworkspace/contents.xcworkspacedata
    	spec/integration/install_custom_workspace/after/execution_output.txt
    	spec/integration/install_external_source/after/Podfile.lock
    	spec/integration/install_external_source/after/Pods/Generated/Local Podspecs/PodTest.podspec
    	spec/integration/install_external_source/after/Pods/Generated/Manifest.lock
    	spec/integration/install_external_source/after/Pods/Generated/Pods-PodTest-dummy.m
    	spec/integration/install_external_source/after/Pods/Generated/Pods-PodTest-prefix.pch
    	spec/integration/install_external_source/after/Pods/Generated/Pods-acknowledgements.markdown
    	spec/integration/install_external_source/after/Pods/Generated/Pods-acknowledgements.plist
    	spec/integration/install_external_source/after/Pods/Generated/Pods-dummy.m
    	spec/integration/install_external_source/after/Pods/Generated/Pods-environment.h
    	spec/integration/install_external_source/after/Pods/Generated/Pods-resources.sh
    	spec/integration/install_external_source/after/Pods/Generated/Pods.xcodeproj.yaml
    	spec/integration/install_external_source/after/SampleApp.xcworkspace/contents.xcworkspacedata
    	spec/integration/install_external_source/after/execution_output.txt
    	spec/integration/install_local_source/after/Podfile.lock
    	spec/integration/install_local_source/after/Pods/Generated/Local Podspecs/Reachability.podspec
    	spec/integration/install_local_source/after/Pods/Generated/Manifest.lock
    	spec/integration/install_local_source/after/Pods/Generated/Pods-Reachability-dummy.m
    	spec/integration/install_local_source/after/Pods/Generated/Pods-Reachability-prefix.pch
    	spec/integration/install_local_source/after/Pods/Generated/Pods-Reachability.xcconfig
    	spec/integration/install_local_source/after/Pods/Generated/Pods-acknowledgements.markdown
    	spec/integration/install_local_source/after/Pods/Generated/Pods-acknowledgements.plist
    	spec/integration/install_local_source/after/Pods/Generated/Pods-dummy.m
    	spec/integration/install_local_source/after/Pods/Generated/Pods-environment.h
    	spec/integration/install_local_source/after/Pods/Generated/Pods-resources.sh
    	spec/integration/install_local_source/after/Pods/Generated/Pods.xcodeproj.yaml
    	spec/integration/install_local_source/after/SampleApp.xcworkspace/contents.xcworkspacedata
    	spec/integration/install_local_source/after/execution_output.txt
    	spec/integration/install_multiple_targets/after/Podfile.lock
    	spec/integration/install_multiple_targets/after/Pods/Generated/Manifest.lock
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-Reachability-dummy.m
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-Reachability-prefix.pch
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-Reachability.xcconfig
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-JSONKit-dummy.m
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-JSONKit-prefix.pch
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-Reachability-dummy.m
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-Reachability-prefix.pch
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-Reachability.xcconfig
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-acknowledgements.markdown
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-acknowledgements.plist
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-dummy.m
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-environment.h
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-resources.sh
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-acknowledgements.markdown
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-acknowledgements.plist
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-dummy.m
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-environment.h
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-resources.sh
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-test-JSONKit-dummy.m
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-test-JSONKit-prefix.pch
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-test-acknowledgements.markdown
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-test-acknowledgements.plist
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-test-dummy.m
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-test-environment.h
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-test-resources.sh
    	spec/integration/install_multiple_targets/after/Pods/Generated/Pods.xcodeproj.yaml
    	spec/integration/install_multiple_targets/after/Pods/Generated/Sources/JSONKit/JSONKit.h
    	spec/integration/install_multiple_targets/after/Pods/Generated/Sources/JSONKit/JSONKit.m
    	spec/integration/install_multiple_targets/after/Pods/Generated/Sources/JSONKit/README.md
    	spec/integration/install_multiple_targets/after/Pods/Generated/Sources/Reachability/README.md
    	spec/integration/install_multiple_targets/after/Pods/Generated/Sources/Reachability/Reachability.h
    	spec/integration/install_multiple_targets/after/Pods/Generated/Sources/Reachability/Reachability.m
    	spec/integration/install_multiple_targets/after/SampleApp.xcworkspace/contents.xcworkspacedata
    	spec/integration/install_multiple_targets/after/execution_output.txt
    	spec/integration/install_new/after/Podfile.lock
    	spec/integration/install_new/after/Pods/Generated/Manifest.lock
    	spec/integration/install_new/after/Pods/Generated/Pods-Reachability-dummy.m
    	spec/integration/install_new/after/Pods/Generated/Pods-Reachability-prefix.pch
    	spec/integration/install_new/after/Pods/Generated/Pods-Reachability.xcconfig
    	spec/integration/install_new/after/Pods/Generated/Pods-acknowledgements.markdown
    	spec/integration/install_new/after/Pods/Generated/Pods-acknowledgements.plist
    	spec/integration/install_new/after/Pods/Generated/Pods-dummy.m
    	spec/integration/install_new/after/Pods/Generated/Pods-environment.h
    	spec/integration/install_new/after/Pods/Generated/Pods-resources.sh
    	spec/integration/install_new/after/Pods/Generated/Pods.xcodeproj.yaml
    	spec/integration/install_new/after/Pods/Generated/Sources/Reachability/README.md
    	spec/integration/install_new/after/Pods/Generated/Sources/Reachability/Reachability.h
    	spec/integration/install_new/after/Pods/Generated/Sources/Reachability/Reachability.m
    	spec/integration/install_new/after/SampleApp.xcworkspace/contents.xcworkspacedata
    	spec/integration/install_new/after/execution_output.txt
    	spec/integration/install_podfile_callbacks/after/Podfile.lock
    	spec/integration/install_podfile_callbacks/after/Pods/Generated/Manifest.lock
    	spec/integration/install_podfile_callbacks/after/Pods/Generated/Pods-Reachability-dummy.m
    	spec/integration/install_podfile_callbacks/after/Pods/Generated/Pods-Reachability-prefix.pch
    	spec/integration/install_podfile_callbacks/after/Pods/Generated/Pods-Reachability.xcconfig
    	spec/integration/install_podfile_callbacks/after/Pods/Generated/Pods-dummy.m
    	spec/integration/install_podfile_callbacks/after/Pods/Generated/Pods-environment.h
    	spec/integration/install_podfile_callbacks/after/Pods/Generated/Pods-resources.sh
    	spec/integration/install_podfile_callbacks/after/Pods/Generated/Pods.xcodeproj.yaml
    	spec/integration/install_podfile_callbacks/after/Pods/Generated/Sources/Reachability/README.md
    	spec/integration/install_podfile_callbacks/after/Pods/Generated/Sources/Reachability/Reachability.h
    	spec/integration/install_podfile_callbacks/after/Pods/Generated/Sources/Reachability/Reachability.m
    	spec/integration/install_podfile_callbacks/after/SampleApp.xcworkspace/contents.xcworkspacedata
    	spec/integration/install_podfile_callbacks/after/execution_output.txt
    	spec/integration/install_podspec/after/Podfile.lock
    	spec/integration/install_podspec/after/Pods/Generated/Local Podspecs/Reachability.podspec
    	spec/integration/install_podspec/after/Pods/Generated/Manifest.lock
    	spec/integration/install_podspec/after/Pods/Generated/Pods-Reachability-dummy.m
    	spec/integration/install_podspec/after/Pods/Generated/Pods-Reachability-prefix.pch
    	spec/integration/install_podspec/after/Pods/Generated/Pods-Reachability.xcconfig
    	spec/integration/install_podspec/after/Pods/Generated/Pods-acknowledgements.markdown
    	spec/integration/install_podspec/after/Pods/Generated/Pods-acknowledgements.plist
    	spec/integration/install_podspec/after/Pods/Generated/Pods-dummy.m
    	spec/integration/install_podspec/after/Pods/Generated/Pods-environment.h
    	spec/integration/install_podspec/after/Pods/Generated/Pods-resources.sh
    	spec/integration/install_podspec/after/Pods/Generated/Pods.xcodeproj.yaml
    	spec/integration/install_podspec/after/Pods/Generated/Sources/Reachability/README.md
    	spec/integration/install_podspec/after/SampleApp.xcworkspace/contents.xcworkspacedata
    	spec/integration/install_podspec/after/execution_output.txt
    	spec/integration/install_remove_pod/after/Podfile.lock
    	spec/integration/install_remove_pod/after/Pods/BuildHeaders/Reachability/Reachability.h
    	spec/integration/install_remove_pod/after/Pods/Generated/Manifest.lock
    	spec/integration/install_remove_pod/after/Pods/Generated/Pods-Reachability-dummy.m
    	spec/integration/install_remove_pod/after/Pods/Generated/Pods-Reachability-prefix.pch
    	spec/integration/install_remove_pod/after/Pods/Generated/Pods-Reachability.xcconfig
    	spec/integration/install_remove_pod/after/Pods/Generated/Pods-dummy.m
    	spec/integration/install_remove_pod/after/Pods/Generated/Pods-environment.h
    	spec/integration/install_remove_pod/after/Pods/Headers/Reachability/Reachability.h
    	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/SampleApp.xcworkspace/contents.xcworkspacedata
    	spec/integration/install_remove_pod/after/execution_output.txt
    	spec/integration/install_spec_callbacks/after/Podfile.lock
    	spec/integration/install_spec_callbacks/after/Pods/Generated/Local Podspecs/Reachability.podspec
    	spec/integration/install_spec_callbacks/after/Pods/Generated/Manifest.lock
    	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods-Reachability-dummy.m
    	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods-Reachability-prefix.pch
    	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods-Reachability.xcconfig
    	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods-acknowledgements.markdown
    	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods-acknowledgements.plist
    	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods-dummy.m
    	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods-environment.h
    	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods.xcodeproj.yaml
    	spec/integration/install_spec_callbacks/after/Pods/Generated/Sources/Reachability/Reachability.h
    	spec/integration/install_spec_callbacks/after/Pods/Generated/Sources/Reachability/Reachability.m
    	spec/integration/install_spec_callbacks/after/Pods/Generated/Sources/Reachability/TestClass.h
    	spec/integration/install_spec_callbacks/after/Pods/Generated/Sources/Reachability/TestClass.m
    	spec/integration/install_spec_callbacks/after/SampleApp.xcworkspace/contents.xcworkspacedata
    	spec/integration/install_spec_callbacks/after/execution_output.txt
    	spec/integration/install_subspecs/after/Podfile.lock
    	spec/integration/install_subspecs/after/Pods/Generated/Local Podspecs/PodTest.podspec
    	spec/integration/install_subspecs/after/Pods/Generated/Manifest.lock
    	spec/integration/install_subspecs/after/Pods/Generated/Pods-OS X App-PodTest-dummy.m
    	spec/integration/install_subspecs/after/Pods/Generated/Pods-OS X App-PodTest-prefix.pch
    	spec/integration/install_subspecs/after/Pods/Generated/Pods-OS X App-acknowledgements.markdown
    	spec/integration/install_subspecs/after/Pods/Generated/Pods-OS X App-acknowledgements.plist
    	spec/integration/install_subspecs/after/Pods/Generated/Pods-OS X App-dummy.m
    	spec/integration/install_subspecs/after/Pods/Generated/Pods-OS X App-environment.h
    	spec/integration/install_subspecs/after/Pods/Generated/Pods-OS X App-resources.sh
    	spec/integration/install_subspecs/after/Pods/Generated/Pods-iOS App-PodTest-dummy.m
    	spec/integration/install_subspecs/after/Pods/Generated/Pods-iOS App-PodTest-prefix.pch
    	spec/integration/install_subspecs/after/Pods/Generated/Pods-iOS App-acknowledgements.markdown
    	spec/integration/install_subspecs/after/Pods/Generated/Pods-iOS App-acknowledgements.plist
    	spec/integration/install_subspecs/after/Pods/Generated/Pods-iOS App-dummy.m
    	spec/integration/install_subspecs/after/Pods/Generated/Pods-iOS App-environment.h
    	spec/integration/install_subspecs/after/Pods/Generated/Pods-iOS App-resources.sh
    	spec/integration/install_subspecs/after/Pods/Generated/Pods.xcodeproj.yaml
    	spec/integration/install_subspecs/after/SampleApp.xcworkspace/contents.xcworkspacedata
    	spec/integration/install_subspecs/after/execution_output.txt
    	spec/integration/update/after/Podfile.lock
    	spec/integration/update/after/Pods/Generated/Manifest.lock
    	spec/integration/update/after/Pods/Generated/Pods-Reachability-dummy.m
    	spec/integration/update/after/Pods/Generated/Pods-Reachability-prefix.pch
    	spec/integration/update/after/Pods/Generated/Pods-Reachability.xcconfig
    	spec/integration/update/after/Pods/Generated/Pods-dummy.m
    	spec/integration/update/after/Pods/Generated/Pods-environment.h
    	spec/integration/update/after/Pods/Pods-Acknowledgements.markdown
    	spec/integration/update/after/Pods/Pods-Acknowledgements.plist
    	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/Pods/Reachability/README.md
    	spec/integration/update/after/Pods/Reachability/Reachability.h
    	spec/integration/update/after/Pods/Reachability/Reachability.m
    	spec/integration/update/after/SampleApp.xcworkspace/contents.xcworkspacedata
    	spec/integration/update/after/execution_output.txt
    7f8f29ae
Name
Last commit
Last update
..
cocoapods-integration-specs @ 44b03f0a
fixtures Loading commit data...
functional Loading commit data...
spec_helper Loading commit data...
unit Loading commit data...
integration.rb Loading commit data...
spec_helper.rb Loading commit data...