Commit 6986f18b authored by Paul Williamson's avatar Paul Williamson Committed by Kevin Lord

Fixes an issue where XCTest is missing in Xcode 6

The XCTest.framework bundle has changed location in Xcode 6. This PR
fixes this [#2296](https://github.com/CocoaPods/CocoaPods/issues/2296)

Conflicts:
	CHANGELOG.md
parent ca5ce2d5
...@@ -12,7 +12,7 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides ...@@ -12,7 +12,7 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
[#2060](https://github.com/CocoaPods/CocoaPods/issues/2060) [#2060](https://github.com/CocoaPods/CocoaPods/issues/2060)
* Fixed `pod outdated` to not include subspecs. * Fixed `pod outdated` to not include subspecs.
[Ash Furrow](ashfurrow] [Ash Furrow](ashfurrow)
[#2136](https://github.com/CocoaPods/CocoaPods/issues/2136) [#2136](https://github.com/CocoaPods/CocoaPods/issues/2136)
* Always evaluate podspecs from the original podspec directory. This fixes * Always evaluate podspecs from the original podspec directory. This fixes
...@@ -25,6 +25,10 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides ...@@ -25,6 +25,10 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
[Fabio Pelosin][irrationalfab] [Fabio Pelosin][irrationalfab]
[Core#132](https://github.com/CocoaPods/Core/issues/132) [Core#132](https://github.com/CocoaPods/Core/issues/132)
* Fixed missing XCTest framework in Xcode 6
[Paul Williamson](squarefrog)
[#2296](https://github.com/CocoaPods/CocoaPods/issues/2296)
## 0.33.1 ## 0.33.1
......
...@@ -111,6 +111,8 @@ module Pod ...@@ -111,6 +111,8 @@ module Pod
else else
search_paths_to_add << '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"' search_paths_to_add << '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
end end
frameworks_path = '"$(PLATFORM_DIR)/Developer/Library/Frameworks"'
search_paths_to_add << frameworks_path
search_paths_to_add.each do |search_path| search_paths_to_add.each do |search_path|
unless search_paths.include?(search_path) unless search_paths.include?(search_path)
search_paths << ' ' unless search_paths.empty? search_paths << ' ' unless search_paths.empty?
......
...@@ -188,6 +188,8 @@ module Pod ...@@ -188,6 +188,8 @@ module Pod
frameworks_search_paths = xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'] frameworks_search_paths = xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS']
frameworks_search_paths.should.include?('$(inherited)') frameworks_search_paths.should.include?('$(inherited)')
frameworks_search_paths.should.include?('"$(SDKROOT)/Developer/Library/Frameworks"') frameworks_search_paths.should.include?('"$(SDKROOT)/Developer/Library/Frameworks"')
frameworks_path = '"$(PLATFORM_DIR)/Developer/Library/Frameworks"'
frameworks_search_paths.should.include?(frameworks_path)
frameworks_search_paths.should.not.include?('"$(DEVELOPER_LIBRARY_DIR)/Frameworks"') frameworks_search_paths.should.not.include?('"$(DEVELOPER_LIBRARY_DIR)/Frameworks"')
end end
......
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