Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial work for sandbox reorganization #1055

Closed
wants to merge 19 commits into from

Conversation

fabiopelosin
Copy link
Member

This is the initial work for the reorganization of the sandbox. See #544.

/c @mtitolo

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 665c91f on sandbox_reorganization_544 into be7e588 on master.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 5283a9f on sandbox_reorganization_544 into c4fedc5 on master.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling a088a78 on sandbox_reorganization_544 into c4fedc5 on master.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 8372607 on sandbox_reorganization_544 into c4fedc5 on master.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling d5fc58a on sandbox_reorganization_544 into c4fedc5 on master.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling d5fc58a on sandbox_reorganization_544 into c4fedc5 on master.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling c38244a on sandbox_reorganization_544 into c4fedc5 on master.

* 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
@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling aa6a4cf on sandbox_reorganization_544 into 2fa29fb on master.

@fabiopelosin
Copy link
Member Author

The examples are broken because the migrator doesn't updates correctly the integrated project. For example the path of the xcconfigs has changed, ect.

@mtitolo
Copy link
Member

mtitolo commented Jul 1, 2013

@irrationalfab Did something with the .pch change on master? The tests are looking for Pods-prefix.pch when there appears to now be one generated per pod?

@fabiopelosin
Copy link
Member Author

Indeed, they are only generated for the Pod targets, to prevent cross pollution.

* master: (86 commits)
  Pretty podfile-info && add license note to changelog
  add licenses & tweaks for grammar
  more copy tweaks
  Fix specs
  Fix escaping
  Fix for the xcrun commands and dirs with spaces
  update new podspec help file
  Just add license as a key to get from the specification
  [Bundle] Always add simplecov as a coveralls dependency.
  Release 0.22.3
  [Bundle] Update for 0.22.3
  Add link to ticket to TODO.
  Move license info into podfile-info command
  [CHANGELOG] Cleanup.
  [xcconfig] Always exlude `USE_HEADERMAP` from the user’s project. #1216
  [CHANGELOG] Update for 0.22.3
  Add licenses command to pod cli
  Add description of STRIP_INSTALLED_PRODUCT change to the changelog.
  Update spec to pass with the addition of the STRIP_INSTALLED_PRODUCT to the generated Pods Xcode projects.
  Add the STRIP_INSTALLED_PRODUCT buld setting to the Pods project, setting it to 'NO'. This will prevent Xcode from stripping debug symbols from the Pods libraries while performing an archive build, allowing the main project targets to include pods symbols in generated dSYMs for Archive builds.
  ...

Conflicts:
	examples/AFNetworking iOS Example/AFNetworking iOS Example.xcodeproj/project.pbxproj
	spec/integration/install_add_pod/after/Pods/Pods-JSONKit-Private.xcconfig
	spec/integration/install_add_pod/after/Pods/Pods-Reachability-Private.xcconfig
	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_custom_workspace/after/Pods/Generated/Pods-SampleApp_1.xcconfig
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2.xcconfig
	spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1-Reachability-Private.xcconfig
	spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2-Reachability-Private.xcconfig
	spec/integration/install_external_source/after/Pods/Pods-PodTest-Private.xcconfig
	spec/integration/install_external_source/after/execution_output.txt
	spec/integration/install_local_source/after/Pods/Pods-Reachability-Private.xcconfig
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2.xcconfig
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods.xcconfig
	spec/integration/install_multiple_targets/after/Pods/Pods-Reachability-Private.xcconfig
	spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-JSONKit-Private.xcconfig
	spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-Reachability-Private.xcconfig
	spec/integration/install_multiple_targets/after/Pods/Pods-test-JSONKit-Private.xcconfig
	spec/integration/install_multiple_targets/after/Pods/Pods-test.xcconfig
	spec/integration/install_new/after/Pods/Generated/Pods.xcconfig
	spec/integration/install_new/after/Pods/Pods-Reachability-Private.xcconfig
	spec/integration/install_podfile_callbacks/after/Pods/Pods-Reachability-Private.xcconfig
	spec/integration/install_podspec/after/Pods/Generated/Pods.xcconfig
	spec/integration/install_podspec/after/Pods/Pods-Reachability-Private.xcconfig
	spec/integration/install_remove_pod/after/Pods/Pods-Reachability-Private.xcconfig
	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_spec_callbacks/after/Pods/Generated/Pods.xcconfig
	spec/integration/install_spec_callbacks/after/Pods/Pods-Reachability-Private.xcconfig
	spec/integration/install_spec_callbacks/after/Pods/Pods.xcconfig
	spec/integration/install_subspecs/after/Pods/Pods-OS X App-PodTest-Private.xcconfig
	spec/integration/install_subspecs/after/Pods/Pods-iOS App-PodTest-Private.xcconfig
	spec/integration/install_subspecs/after/execution_output.txt
	spec/integration/update/after/Pods/Generated/Pods.xcconfig
	spec/integration/update/after/Pods/Pods-Reachability-Private.xcconfig
	spec/integration/update/after/Pods/Pods-resources.sh
	spec/integration/update/after/Pods/Pods.xcconfig
	spec/integration/update/after/Pods/Pods.xcodeproj.yaml
	spec/unit/hooks/library_representation_spec.rb
* master: (41 commits)
  [Changelog]
  [Changelog]
  [CHANGELOG] Small cleanups.
  [CHANGELOG] Expand on hooks deprecation.
  [CHANGELOG] Slight formatting change.
  Release 0.23.0.rc1
  [Rakefile] Allow to release with changes in the Gemfile.lock file
  [RakeFile] Add note about the examples
  [Gemfile] Require cocoapods-core:master
  [Gemfile] Require cocoapods-core from the feature-prepare_command branch
  [Gemfile] Require cocoapods-core from the master branch
  [Gemspec] Bump dependencies version
  [Specification::DSL] Add prepare_command
  [Changelog]
  [Specification::DSL] frameworks_bundles -> vendored_frameworks; library_files -> vendored_libraries
  [Installer] Move target dependency logic to Xcodeproj 2
  [Changelog]
  [Installer] Move target dependency logic to Xcodeproj
  [Specification] Add support for resource bundles
  [Changelog]
  ...

Conflicts:
	spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 45b4c29 on sandbox_reorganization_544 into 488a7cc on master.

* 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
@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling cedc0bf on sandbox_reorganization_544 into fe3d6a5 on master.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling cedc0bf on sandbox_reorganization_544 into fe3d6a5 on master.

@fabiopelosin
Copy link
Member Author

To complete this patch the following features are missing:

  • Move files from existing installations.
  • Change the files references of the xcconfigs in already integrated projects.
  • Change the paths of the scripts (copy resources & manifest check) in already integrated projects.
  • Remove the reference to the old Pods project from the workspace.
  • Further rationalize the file structure of the support files.

@mtitolo
Copy link
Member

mtitolo commented Aug 21, 2013

@irrationalfab would you be able to rebase this branch against master?

* master: (46 commits)
  [Command::Init] Update specs for recent changes
  [Command::Init] Add dependencies of the normal targets inside the target block
  [Command::Init] Add note about the configuration files to the description
  Update CHANGELOG for #1294
  [rake] Welcome to the real world, where envs don’t automagically work.
  [Installer] Add all the user's build configurations to the Pods project.
  [Analyzer] Resolve all user build configurations.
  Misc small changes.
  Rebuild integration specs.
  Update Xcodeproj to the latest master revision
  Use the build configurations from the Podfile for the Pods project
  Add test for STRIP_INSTALLED_PRODUCT = NO at project level
  Fix all callers of Pod::Project.new()
  Handle the build_configurations parameter in Xcodeproj::Project subclasses
  Pass the user build configurations to the Pods project
  Add link to Gemfile regarding local repos.
  Add that this is the MIT license.
  [CONTRIBUTING] Update CocoaPods.
  [Xcodeproj] Use Pod::UI for warnings and messages
  [Changelog]
  ...

Conflicts:
	spec/cocoapods-integration-specs
@fabiopelosin
Copy link
Member Author

@mtitolo Done! To simplify things a bit I think that we should implement #1246 before. With that patch we could implement the logic to detect the file references of CocoaPods generated files in the user project and then editing and moving them would be trivial.

jzapater pushed a commit to jzapater/CocoaPods that referenced this pull request Sep 17, 2013
Updated GoogleAnalyitics-iOS to be compatible with cocoapods 0.16.x
@fabiopelosin fabiopelosin self-assigned this Mar 29, 2014
@@ -32,7 +32,7 @@ def initialize(argv)
#
# @return [void]
#
def run_install_with_update(update)
def run_install_with_update(update)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems unintentional.

@fabiopelosin
Copy link
Member Author

Superseded by #2410

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
t1:enhancement Enhancements that have not been picked up yet. Please comment if you plan to work on it
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants