Commit 0c018b35 authored by Fabio Pelosin's avatar Fabio Pelosin

[Xcodeproj] Improve support for user build configurations

Closes #1462
parent 92fbcc54
...@@ -2,6 +2,18 @@ ...@@ -2,6 +2,18 @@
To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html). To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
## Master
###### Bug Fixes
* Fixed a crash related to CocoaPods being unable to resolve an unique build
setting of an user target with custom build configurations.
[Fabio Pelosin](https://github.com/irrationalfab)
[#1462](https://github.com/CocoaPods/CocoaPods/issues/1462)
[#1463](https://github.com/CocoaPods/CocoaPods/issues/1463)
[#1457](https://github.com/CocoaPods/CocoaPods/issues/1457)
## 0.26.2 ## 0.26.2
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.26.1...0.26.2) [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.26.1...0.26.2)
[cocoapods-core](https://github.com/CocoaPods/Core/compare/0.26.1...0.26.2) [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.26.1...0.26.2)
......
...@@ -17,10 +17,10 @@ GIT ...@@ -17,10 +17,10 @@ GIT
GIT GIT
remote: https://github.com/CocoaPods/Xcodeproj.git remote: https://github.com/CocoaPods/Xcodeproj.git
revision: 970f4a4ac2f75b6887ef4564b3e3f3e55040f496 revision: 8459cc35d512f061f6741a82ab708ec93df3fae3
branch: master branch: master
specs: specs:
xcodeproj (0.13.0) xcodeproj (0.13.1)
activesupport (~> 3.0) activesupport (~> 3.0)
colored (~> 1.2) colored (~> 1.2)
...@@ -59,7 +59,7 @@ PATH ...@@ -59,7 +59,7 @@ PATH
escape (~> 0.0.4) escape (~> 0.0.4)
json (~> 1.8) json (~> 1.8)
open4 (~> 1.3) open4 (~> 1.3)
xcodeproj (~> 0.13.0) xcodeproj (~> 0.13.1)
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
......
...@@ -30,7 +30,7 @@ s.files = Dir["lib/**/*.rb"] + %w{ bin/pod bin/sandbox-pod README.md LICENSE CHA ...@@ -30,7 +30,7 @@ s.files = Dir["lib/**/*.rb"] + %w{ bin/pod bin/sandbox-pod README.md LICENSE CHA
s.add_runtime_dependency 'cocoapods-core', "= #{Pod::VERSION}" s.add_runtime_dependency 'cocoapods-core', "= #{Pod::VERSION}"
s.add_runtime_dependency 'claide', '~> 0.3.2' s.add_runtime_dependency 'claide', '~> 0.3.2'
s.add_runtime_dependency 'cocoapods-downloader', '~> 0.2.0' s.add_runtime_dependency 'cocoapods-downloader', '~> 0.2.0'
s.add_runtime_dependency 'xcodeproj', '~> 0.13.0' s.add_runtime_dependency 'xcodeproj', '~> 0.13.1'
s.add_runtime_dependency 'colored', '~> 1.2' s.add_runtime_dependency 'colored', '~> 1.2'
s.add_runtime_dependency 'escape', '~> 0.0.4' s.add_runtime_dependency 'escape', '~> 0.0.4'
......
Subproject commit 77e3d95e130ecffcf0f42ebf71b6b1060c1786f9 Subproject commit ecb441780888f49aa769bc93edade2e9683ecacf
...@@ -347,6 +347,10 @@ describe "Integration" do ...@@ -347,6 +347,10 @@ describe "Integration" do
check "install --no-repo-update", "install_custom_workspace" check "install --no-repo-update", "install_custom_workspace"
end end
describe "Integrates a target with custom build settings" do
check "install --no-repo-update", "install_custom_build_configuration"
end
# @todo add tests for all the hooks API # @todo add tests for all the hooks API
# #
describe "Runs the Podfile callbacks" do describe "Runs the Podfile callbacks" do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment