CocoaPods / CocoaPods

77%

master: 92%

LAST BUILD ON BRANCH pods-project-edit-feature

branch: pods-project-edit-feature

CHANGE BRANCH

x

Reset

• pods-project-edit-feature
• 0.17
• 0.23.0
• 0.27.0
• 0.27.1
• 0xced/copy-user_project-build_configurations
• cocoapods-core
• dedicated-targets
• develop
• disable-ALWAYS_SEARCH_USER_PATHS
• feature-frameworks-bundles
• feature-prepare_command
• fix_dependencies
• fix_gem_install
• gf-fix-spaces
• lib-subcommand
• local_repos
• master
• pod_update
• ruby-trace-experiment
• sandbox-fix
• sandbox_reorganization_544
• show_all_failures
• spec-refactor
• t-296
• xcode-5-support

Build # 1606

Build Type

push

travis-ci

Committed by irrationalfab

Commit Message

Merge branch 'master' into pods-project-edit-feature

* master:
  [Project] Define CocoaPods build settings explicitely
  [Source] Don't load the specs in #search
  [Installer] Recreate and hide user schemes.
  [Xcodeproj] Adapt for interface change.
  [Gemfile] Use coveralls from rubygems
  [CHANGELOG] More tweaking related to Xcode 5 migration.
  [CHANGELOG] Try to reword notes related to Xcode 5.
  Depend on version 3.2 or greater of activesupport
  [Core] Add documentation_url DSL attribute to specification
  [Xcconfig] Reference vendored libraries & frameworks with a relative path
  [Fixtures] Sort the Pods project by name
  [Xcodeproj] Sort the Pods project by name
  [Bundle] udpate
  Remove stray debug puts
  New sentence works better here in the default podspec documentation.
  Fixed a typo on the word 'include' in the default podspec documentation.

Conflicts:
	lib/cocoapods/installer.rb
	lib/cocoapods/installer/user_project_integrator/target_integrator.rb
	lib/cocoapods/project.rb
	spec/cocoapods-integration-specs
	spec/unit/installer/user_project_integrator/target_integrator_spec.rb
	spec/unit/project_spec.rb

Coverage Stats

7 of 7 new or added lines in 2 files covered. (100.0%)

8835 of 11432 relevant lines covered (77.28%)

533.74 hits per line