Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: CocoaPods/CocoaPods
...
head fork: CocoaPods/CocoaPods
Checking mergeability… Don't worry, you can still create the pull request.
  • 16 commits
  • 67 files changed
  • 0 commit comments
  • 2 contributors
Showing with 724 additions and 1,193 deletions.
  1. +2 −0  .gitignore
  2. +31 −1 CHANGELOG.md
  3. +1 −1  Gemfile
  4. +9 −9 Gemfile.lock
  5. +2 −2 Rakefile
  6. +1 −1  cocoapods.gemspec
  7. +385 −967 examples/AFNetworking iOS Example/AFNetworking iOS Example.xcodeproj/project.pbxproj
  8. +1 −1  lib/cocoapods/gem_version.rb
  9. +6 −2 lib/cocoapods/generator/xcconfig.rb
  10. +7 −15 lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
  11. +61 −10 lib/cocoapods/generator/xcconfig/private_pod_xcconfig.rb
  12. +4 −11 lib/cocoapods/installer.rb
  13. +4 −4 lib/cocoapods/installer/target_installer/pod_target_installer.rb
  14. +2 −1  lib/cocoapods/project.rb
  15. +2 −2 lib/cocoapods/validator.rb
  16. +1 −1  spec/integration/install_add_pod/after/Podfile.lock
  17. +1 −1  spec/integration/install_add_pod/after/Pods/Manifest.lock
  18. +1 −3 spec/integration/install_add_pod/after/Pods/Pods.xcconfig
  19. +1 −1  spec/integration/install_custom_workspace/after/Podfile.lock
  20. +1 −1  spec/integration/install_custom_workspace/after/Pods/Manifest.lock
  21. +1 −2  spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1.xcconfig
  22. +1 −2  spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2.xcconfig
  23. +1 −1  spec/integration/install_external_source/after/Podfile.lock
  24. +1 −1  spec/integration/install_external_source/after/Pods/Manifest.lock
  25. +0 −1  spec/integration/install_external_source/after/Pods/Pods.xcconfig
  26. +2 −2 spec/integration/install_external_source/after/SampleApp.xcodeproj.yaml
  27. +1 −1  spec/integration/install_local_source/after/Podfile.lock
  28. +1 −1  spec/integration/install_local_source/after/Pods/Manifest.lock
  29. +1 −2  spec/integration/install_local_source/after/Pods/Pods.xcconfig
  30. +2 −2 spec/integration/install_local_source/after/SampleApp.xcodeproj.yaml
  31. +1 −1  spec/integration/install_multiple_targets/after/Podfile.lock
  32. +1 −1  spec/integration/install_multiple_targets/after/Pods/Manifest.lock
  33. +1 −3 spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2.xcconfig
  34. +0 −1  spec/integration/install_multiple_targets/after/Pods/Pods-test.xcconfig
  35. +1 −2  spec/integration/install_multiple_targets/after/Pods/Pods.xcconfig
  36. +2 −2 spec/integration/install_multiple_targets/after/SampleApp.xcodeproj.yaml
  37. +2 −1  spec/integration/install_multiple_targets/after/execution_output.txt
  38. +1 −1  spec/integration/install_new/after/Podfile.lock
  39. +1 −1  spec/integration/install_new/after/Pods/Manifest.lock
  40. +1 −2  spec/integration/install_new/after/Pods/Pods.xcconfig
  41. +1 −1  spec/integration/install_podfile_callbacks/after/Podfile.lock
  42. +1 −1  spec/integration/install_podfile_callbacks/after/Pods/Manifest.lock
  43. +1 −2  spec/integration/install_podfile_callbacks/after/Pods/Pods.xcconfig
  44. +1 −1  spec/integration/install_podspec/after/Podfile.lock
  45. +1 −1  spec/integration/install_podspec/after/Pods/Manifest.lock
  46. +1 −2  spec/integration/install_podspec/after/Pods/Pods.xcconfig
  47. +1 −1  spec/integration/install_remove_pod/after/Podfile.lock
  48. +1 −1  spec/integration/install_remove_pod/after/Pods/Manifest.lock
  49. +1 −2  spec/integration/install_remove_pod/after/Pods/Pods.xcconfig
  50. +1 −1  spec/integration/install_spec_callbacks/after/Podfile.lock
  51. +1 −1  spec/integration/install_spec_callbacks/after/Pods/Manifest.lock
  52. +1 −2  spec/integration/install_spec_callbacks/after/Pods/Pods.xcconfig
  53. +1 −1  spec/integration/install_subspecs/after/Podfile.lock
  54. +1 −1  spec/integration/install_subspecs/after/Pods/Manifest.lock
  55. +0 −1  spec/integration/install_subspecs/after/Pods/Pods-OS X App.xcconfig
  56. +0 −1  spec/integration/install_subspecs/after/Pods/Pods-iOS App.xcconfig
  57. +2 −2 spec/integration/install_subspecs/after/SampleApp.xcodeproj.yaml
  58. +1 −1  spec/integration/update/after/Podfile.lock
  59. +1 −1  spec/integration/update/after/Pods/Manifest.lock
  60. +1 −2  spec/integration/update/after/Pods/Pods.xcconfig
  61. +0 −9 spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb
  62. +111 −57 spec/unit/generator/xcconfig/private_pod_xcconfig_spec.rb
  63. +0 −15 spec/unit/installer/target_installer/aggregate_target_installer_spec.rb
  64. +1 −16 spec/unit/installer/target_installer/pod_target_installer_spec.rb
  65. +39 −0 spec/unit/installer/target_installer_spec.rb
  66. +4 −4 spec/unit/installer_spec.rb
  67. +5 −2 spec/unit/validator_spec.rb
View
2  .gitignore
@@ -29,3 +29,5 @@ examples/**/Pods
examples/RelativePathProject/RelativePathProject/RelativePathProject.xcodeproj
coverage/
.coveralls.yml
+
+*.xccheckout
View
32 CHANGELOG.md
@@ -2,6 +2,35 @@
To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
+
+## 0.22.2
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.1...0.22.2)
+• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.22.1...0.22.2)
+• [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.8.0...0.8.1)
+
+###### Enhancements
+
+* The build settings of the Pods project and of its target have been updated to
+ be in line with the new defaults of the future versions of Xcode.
+
+###### Bug fixes
+
+* Specifications defining build setting with the `[*]` syntax are now properly
+ handled.
+ [#1171](https://github.com/CocoaPods/CocoaPods/issues/1171)
+
+* The name of the files references are now properly set fixing a minor
+ regression introduced by CocoaPods 0.22.1 and matching more closely Xcode
+ behaviour.
+
+* The validator now builds the Pods target instead of the first target actually
+ performing the validation.
+
+* Build settings defined through the `xcconfig` attribute of a `podspec` are now
+ stripped of duplicate values when merged in an aggregate target.
+ [#1189](https://github.com/CocoaPods/CocoaPods/issues/1189)
+
+
## 0.22.1
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.22.0...0.22.1)
• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.22.0...0.22.1)
@@ -26,7 +55,8 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
[#850](https://github.com/CocoaPods/CocoaPods/issues/850)
* Added the `pod lib lint` subcommand which allows to lint the Pod stored
- in the working directory (a pod spec in the root is needed).
+ in the working directory (a pod spec in the root is needed). This subcommand
+ is equivalent to the deprecated `pod spec lint --local`.
[#850](https://github.com/CocoaPods/CocoaPods/issues/850)
* The dependencies of the targets of the Pods project are now made explicit.
View
2  Gemfile
@@ -31,7 +31,7 @@ end
group :documentation do
gem 'yard'
- gem 'redcarpet'
+ gem 'redcarpet', '< 3.0.0' # Not compatible with MRI 1.8.7
gem 'github-markup'
gem 'pygments.rb'
end
View
18 Gemfile.lock
@@ -7,20 +7,20 @@ GIT
GIT
remote: https://github.com/CocoaPods/Core.git
- revision: 743a53d70e138fff2759405b9dd5b78f6db47ca5
+ revision: 439e133196592250cabe97fc01cdbacda862f9c7
branch: master
specs:
- cocoapods-core (0.22.1)
+ cocoapods-core (0.22.2)
activesupport (~> 3.2.13)
json (~> 1.8.0)
nap (~> 0.5.1)
GIT
remote: https://github.com/CocoaPods/Xcodeproj.git
- revision: c070e5acb8caa55c98da06e699639579ead8f739
+ revision: da60c7e415f150846d3120e9e3b7310d534446ff
branch: master
specs:
- xcodeproj (0.8.0)
+ xcodeproj (0.8.1)
activesupport (~> 3.2.13)
colored (~> 1.2)
@@ -41,7 +41,7 @@ GIT
GIT
remote: https://github.com/irrationalfab/PrettyBacon.git
- revision: c42de649708149bbfb5fb5beefa65440855cf876
+ revision: 0da7e231bf597005aaa4efb4c2cd837336a6b42b
branch: master
specs:
prettybacon (0.0.1)
@@ -61,16 +61,16 @@ GIT
PATH
remote: .
specs:
- cocoapods (0.22.1)
+ cocoapods (0.22.2)
activesupport (~> 3.2.13)
claide (~> 0.3.2)
- cocoapods-core (= 0.22.1)
+ cocoapods-core (= 0.22.2)
cocoapods-downloader (~> 0.1.1)
colored (~> 1.2)
escape (~> 0.0.4)
json (~> 1.8.0)
open4 (~> 1.3.0)
- xcodeproj (~> 0.8.0)
+ xcodeproj (~> 0.8.1)
GEM
remote: http://rubygems.org/
@@ -153,7 +153,7 @@ DEPENDENCIES
pygments.rb
rake
rb-fsevent
- redcarpet
+ redcarpet (< 3.0.0)
ruby-prof
xcodeproj!
yard
View
4 Rakefile
@@ -323,12 +323,12 @@ namespace :examples do
desc "Build all examples"
task :build do
- execute_command "rm -rf ~/Library/Developer/Shared/Documentation/DocSets/org.cocoapods.*"
examples.entries.each do |example|
puts "Building example: #{example}"
Dir.chdir(example.to_s) do
execute_command "rm -rf Pods DerivedData"
- execute_command "#{'../../bin/' unless ENV['FROM_GEM']}sandbox-pod install --verbose --no-repo-update"
+ # execute_command "#{'../../bin/' unless ENV['FROM_GEM']}sandbox-pod install --verbose --no-repo-update"
+ execute_command "#{'../../bin/' unless ENV['FROM_GEM']}pod install --verbose --no-repo-update"
command = "xcodebuild -workspace '#{example.basename}.xcworkspace' -scheme '#{example.basename}'"
if (example + 'Podfile').read.include?('platform :ios')
# Specifically build against the simulator SDK so we don't have to deal with code signing.
View
2  cocoapods.gemspec
@@ -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 'claide', '~> 0.3.2'
s.add_runtime_dependency 'cocoapods-downloader', '~> 0.1.1'
- s.add_runtime_dependency 'xcodeproj', '~> 0.8.0'
+ s.add_runtime_dependency 'xcodeproj', '~> 0.8.1'
s.add_runtime_dependency 'colored', '~> 1.2'
s.add_runtime_dependency 'escape', '~> 0.0.4'
View
1,352 examples/AFNetworking iOS Example/AFNetworking iOS Example.xcodeproj/project.pbxproj
@@ -1,967 +1,385 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>archiveVersion</key>
- <string>1</string>
- <key>classes</key>
- <dict/>
- <key>objectVersion</key>
- <string>46</string>
- <key>objects</key>
- <dict>
- <key>0BBDA6CDB42C48EFB1B980BC</key>
- <dict>
- <key>explicitFileType</key>
- <string>archive.ar</string>
- <key>includeInIndex</key>
- <string>0</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>name</key>
- <string>libPods.a</string>
- <key>path</key>
- <string>libPods.a</string>
- <key>sourceTree</key>
- <string>BUILT_PRODUCTS_DIR</string>
- </dict>
- <key>242C9E9348A44970B9ECDCF5</key>
- <dict>
- <key>explicitFileType</key>
- <string>archive.ar</string>
- <key>includeInIndex</key>
- <string>0</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>path</key>
- <string>libPods.a</string>
- <key>sourceTree</key>
- <string>BUILT_PRODUCTS_DIR</string>
- </dict>
- <key>391552C2BD5947DF9FEB5975</key>
- <dict>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>text.xcconfig</string>
- <key>name</key>
- <string>Pods.xcconfig</string>
- <key>path</key>
- <string>Pods/Pods.xcconfig</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>46CF19E6210948BCAA4F152C</key>
- <dict>
- <key>fileRef</key>
- <string>242C9E9348A44970B9ECDCF5</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>89DE83CBA1B145CEB0C1180C</key>
- <dict>
- <key>fileRef</key>
- <string>0BBDA6CDB42C48EFB1B980BC</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- <key>settings</key>
- <dict/>
- </dict>
- <key>8A3A8D61FF1041A3B3AA9C55</key>
- <dict>
- <key>buildActionMask</key>
- <string>2147483647</string>
- <key>files</key>
- <array/>
- <key>inputPaths</key>
- <array/>
- <key>isa</key>
- <string>PBXShellScriptBuildPhase</string>
- <key>name</key>
- <string>Copy Pods Resources</string>
- <key>outputPaths</key>
- <array/>
- <key>runOnlyForDeploymentPostprocessing</key>
- <string>0</string>
- <key>shellPath</key>
- <string>/bin/sh</string>
- <key>shellScript</key>
- <string>"${SRCROOT}/Pods/Pods-resources.sh"
-</string>
- </dict>
- <key>C8C94222118242C297ED4081</key>
- <dict>
- <key>includeInIndex</key>
- <string>1</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>text.xcconfig</string>
- <key>name</key>
- <string>Pods.xcconfig</string>
- <key>path</key>
- <string>Pods/Pods.xcconfig</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>DD5E268688D543178A339BEB</key>
- <dict>
- <key>buildActionMask</key>
- <string>2147483647</string>
- <key>files</key>
- <array/>
- <key>inputPaths</key>
- <array/>
- <key>isa</key>
- <string>PBXShellScriptBuildPhase</string>
- <key>name</key>
- <string>Copy Pods Resources</string>
- <key>outputPaths</key>
- <array/>
- <key>runOnlyForDeploymentPostprocessing</key>
- <string>0</string>
- <key>shellPath</key>
- <string>/bin/sh</string>
- <key>shellScript</key>
- <string>"${SRCROOT}/Pods/Pods-resources.sh"
-</string>
- </dict>
- <key>F8D0701B14310F4A00653FD3</key>
- <dict>
- <key>fileRef</key>
- <string>F8E469E213957DF700DB05C8</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>F8D0701C14310F4F00653FD3</key>
- <dict>
- <key>fileRef</key>
- <string>F8E469E013957DF100DB05C8</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>F8D25D171396A9D300CF3BD6</key>
- <dict>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>image.png</string>
- <key>name</key>
- <string>placeholder-stamp.png</string>
- <key>path</key>
- <string>Images/placeholder-stamp.png</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>F8D25D181396A9D300CF3BD6</key>
- <dict>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>image.png</string>
- <key>name</key>
- <string>placeholder-stamp@2x.png</string>
- <key>path</key>
- <string>Images/placeholder-stamp@2x.png</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>F8D25D191396A9D300CF3BD6</key>
- <dict>
- <key>fileRef</key>
- <string>F8D25D171396A9D300CF3BD6</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>F8D25D1A1396A9D300CF3BD6</key>
- <dict>
- <key>fileRef</key>
- <string>F8D25D181396A9D300CF3BD6</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>F8D25D1B1396A9DE00CF3BD6</key>
- <dict>
- <key>fileEncoding</key>
- <string>4</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>sourcecode.c.h</string>
- <key>name</key>
- <string>AFGowallaAPIClient.h</string>
- <key>path</key>
- <string>Classes/AFGowallaAPIClient.h</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- <key>F8D25D1D1396A9DE00CF3BD6</key>
- <dict>
- <key>fileEncoding</key>
- <string>4</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>sourcecode.c.objc</string>
- <key>name</key>
- <string>AFGowallaAPIClient.m</string>
- <key>path</key>
- <string>Classes/AFGowallaAPIClient.m</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- <key>F8DA09C61396AB690057D0CC</key>
- <dict>
- <key>children</key>
- <array>
- <string>F8DA09C71396AB690057D0CC</string>
- <string>F8DA09C81396AB690057D0CC</string>
- </array>
- <key>isa</key>
- <string>PBXGroup</string>
- <key>name</key>
- <string>Controllers</string>
- <key>path</key>
- <string>Classes/Controllers</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>F8DA09C71396AB690057D0CC</key>
- <dict>
- <key>fileEncoding</key>
- <string>4</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>sourcecode.c.h</string>
- <key>path</key>
- <string>NearbySpotsViewController.h</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- <key>F8DA09C81396AB690057D0CC</key>
- <dict>
- <key>fileEncoding</key>
- <string>4</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>sourcecode.c.objc</string>
- <key>path</key>
- <string>NearbySpotsViewController.m</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- <key>F8DA09C91396AB690057D0CC</key>
- <dict>
- <key>children</key>
- <array>
- <string>F8DA09CA1396AB690057D0CC</string>
- <string>F8DA09CB1396AB690057D0CC</string>
- </array>
- <key>isa</key>
- <string>PBXGroup</string>
- <key>name</key>
- <string>Models</string>
- <key>path</key>
- <string>Classes/Models</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>F8DA09CA1396AB690057D0CC</key>
- <dict>
- <key>fileEncoding</key>
- <string>4</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>sourcecode.c.h</string>
- <key>path</key>
- <string>Spot.h</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- <key>F8DA09CB1396AB690057D0CC</key>
- <dict>
- <key>fileEncoding</key>
- <string>4</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>sourcecode.c.objc</string>
- <key>path</key>
- <string>Spot.m</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- <key>F8DA09CC1396AB690057D0CC</key>
- <dict>
- <key>children</key>
- <array>
- <string>F8DA09CD1396AB690057D0CC</string>
- <string>F8DA09CE1396AB690057D0CC</string>
- </array>
- <key>isa</key>
- <string>PBXGroup</string>
- <key>name</key>
- <string>Views</string>
- <key>path</key>
- <string>Classes/Views</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>F8DA09CD1396AB690057D0CC</key>
- <dict>
- <key>fileEncoding</key>
- <string>4</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>sourcecode.c.h</string>
- <key>path</key>
- <string>SpotTableViewCell.h</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- <key>F8DA09CE1396AB690057D0CC</key>
- <dict>
- <key>fileEncoding</key>
- <string>4</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>sourcecode.c.objc</string>
- <key>path</key>
- <string>SpotTableViewCell.m</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- <key>F8DA09D21396ABED0057D0CC</key>
- <dict>
- <key>fileRef</key>
- <string>F8D25D1D1396A9DE00CF3BD6</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>F8DA09D41396ABED0057D0CC</key>
- <dict>
- <key>fileRef</key>
- <string>F8DA09C81396AB690057D0CC</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>F8DA09D51396ABED0057D0CC</key>
- <dict>
- <key>fileRef</key>
- <string>F8DA09CB1396AB690057D0CC</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>F8DA09D61396ABED0057D0CC</key>
- <dict>
- <key>fileRef</key>
- <string>F8DA09CE1396AB690057D0CC</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>F8DA09E31396AC040057D0CC</key>
- <dict>
- <key>fileEncoding</key>
- <string>4</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>sourcecode.c.objc</string>
- <key>path</key>
- <string>main.m</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>F8DA09E41396AC040057D0CC</key>
- <dict>
- <key>fileRef</key>
- <string>F8DA09E31396AC040057D0CC</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>F8DA09E51396AC220057D0CC</key>
- <dict>
- <key>fileEncoding</key>
- <string>4</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>sourcecode.c.h</string>
- <key>path</key>
- <string>AppDelegate.h</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>F8DA09E61396AC220057D0CC</key>
- <dict>
- <key>fileEncoding</key>
- <string>4</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>sourcecode.c.h</string>
- <key>path</key>
- <string>Prefix.pch</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>F8DA09E71396AC220057D0CC</key>
- <dict>
- <key>fileEncoding</key>
- <string>4</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>sourcecode.c.objc</string>
- <key>path</key>
- <string>AppDelegate.m</string>
- <key>sourceTree</key>
- <string>SOURCE_ROOT</string>
- </dict>
- <key>F8DA09E81396AC220057D0CC</key>
- <dict>
- <key>fileRef</key>
- <string>F8DA09E71396AC220057D0CC</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>F8E469551395739C00DB05C8</key>
- <dict>
- <key>children</key>
- <array>
- <string>F8E469B71395759C00DB05C8</string>
- <string>F8E4696A1395739D00DB05C8</string>
- <string>F8E469ED1395812A00DB05C8</string>
- <string>F8E469631395739D00DB05C8</string>
- <string>F8E469611395739C00DB05C8</string>
- <string>391552C2BD5947DF9FEB5975</string>
- <string>C8C94222118242C297ED4081</string>
- </array>
- <key>isa</key>
- <string>PBXGroup</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- <key>F8E469571395739C00DB05C8</key>
- <dict>
- <key>attributes</key>
- <dict>
- <key>LastUpgradeCheck</key>
- <string>0420</string>
- <key>ORGANIZATIONNAME</key>
- <string>Gowalla</string>
- </dict>
- <key>buildConfigurationList</key>
- <string>F8E4695A1395739C00DB05C8</string>
- <key>compatibilityVersion</key>
- <string>Xcode 3.2</string>
- <key>developmentRegion</key>
- <string>English</string>
- <key>hasScannedForEncodings</key>
- <string>0</string>
- <key>isa</key>
- <string>PBXProject</string>
- <key>knownRegions</key>
- <array>
- <string>en</string>
- </array>
- <key>mainGroup</key>
- <string>F8E469551395739C00DB05C8</string>
- <key>productRefGroup</key>
- <string>F8E469611395739C00DB05C8</string>
- <key>projectDirPath</key>
- <string></string>
- <key>projectReferences</key>
- <array/>
- <key>projectRoot</key>
- <string></string>
- <key>targets</key>
- <array>
- <string>F8E4695F1395739C00DB05C8</string>
- </array>
- </dict>
- <key>F8E4695A1395739C00DB05C8</key>
- <dict>
- <key>buildConfigurations</key>
- <array>
- <string>F8E4697F1395739D00DB05C8</string>
- <string>F8E469801395739D00DB05C8</string>
- </array>
- <key>defaultConfigurationIsVisible</key>
- <string>0</string>
- <key>defaultConfigurationName</key>
- <string>Release</string>
- <key>isa</key>
- <string>XCConfigurationList</string>
- </dict>
- <key>F8E4695C1395739C00DB05C8</key>
- <dict>
- <key>buildActionMask</key>
- <string>2147483647</string>
- <key>files</key>
- <array>
- <string>F8DA09D21396ABED0057D0CC</string>
- <string>F8DA09D41396ABED0057D0CC</string>
- <string>F8DA09D51396ABED0057D0CC</string>
- <string>F8DA09D61396ABED0057D0CC</string>
- <string>F8DA09E41396AC040057D0CC</string>
- <string>F8DA09E81396AC220057D0CC</string>
- </array>
- <key>isa</key>
- <string>PBXSourcesBuildPhase</string>
- <key>runOnlyForDeploymentPostprocessing</key>
- <string>0</string>
- </dict>
- <key>F8E4695D1395739C00DB05C8</key>
- <dict>
- <key>buildActionMask</key>
- <string>2147483647</string>
- <key>files</key>
- <array>
- <string>F8E469651395739D00DB05C8</string>
- <string>F8E469671395739D00DB05C8</string>
- <string>F8E469691395739D00DB05C8</string>
- <string>F8E469DF13957DD500DB05C8</string>
- <string>F8D0701B14310F4A00653FD3</string>
- <string>F8D0701C14310F4F00653FD3</string>
- <string>46CF19E6210948BCAA4F152C</string>
- <string>89DE83CBA1B145CEB0C1180C</string>
- </array>
- <key>isa</key>
- <string>PBXFrameworksBuildPhase</string>
- <key>runOnlyForDeploymentPostprocessing</key>
- <string>0</string>
- </dict>
- <key>F8E4695E1395739C00DB05C8</key>
- <dict>
- <key>buildActionMask</key>
- <string>2147483647</string>
- <key>files</key>
- <array>
- <string>F8D25D191396A9D300CF3BD6</string>
- <string>F8D25D1A1396A9D300CF3BD6</string>
- </array>
- <key>isa</key>
- <string>PBXResourcesBuildPhase</string>
- <key>runOnlyForDeploymentPostprocessing</key>
- <string>0</string>
- </dict>
- <key>F8E4695F1395739C00DB05C8</key>
- <dict>
- <key>buildConfigurationList</key>
- <string>F8E469811395739D00DB05C8</string>
- <key>buildPhases</key>
- <array>
- <string>F8E4695C1395739C00DB05C8</string>
- <string>F8E4695D1395739C00DB05C8</string>
- <string>F8E4695E1395739C00DB05C8</string>
- <string>DD5E268688D543178A339BEB</string>
- <string>8A3A8D61FF1041A3B3AA9C55</string>
- </array>
- <key>buildRules</key>
- <array/>
- <key>dependencies</key>
- <array/>
- <key>isa</key>
- <string>PBXNativeTarget</string>
- <key>name</key>
- <string>AFNetworking iOS Example</string>
- <key>productName</key>
- <string>AFNetworkingExample</string>
- <key>productReference</key>
- <string>F8E469601395739C00DB05C8</string>
- <key>productType</key>
- <string>com.apple.product-type.application</string>
- </dict>
- <key>F8E469601395739C00DB05C8</key>
- <dict>
- <key>explicitFileType</key>
- <string>wrapper.application</string>
- <key>includeInIndex</key>
- <string>0</string>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>path</key>
- <string>AFNetworking iOS Example.app</string>
- <key>sourceTree</key>
- <string>BUILT_PRODUCTS_DIR</string>
- </dict>
- <key>F8E469611395739C00DB05C8</key>
- <dict>
- <key>children</key>
- <array>
- <string>F8E469601395739C00DB05C8</string>
- </array>
- <key>isa</key>
- <string>PBXGroup</string>
- <key>name</key>
- <string>Products</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- <key>F8E469631395739D00DB05C8</key>
- <dict>
- <key>children</key>
- <array>
- <string>F8E469E213957DF700DB05C8</string>
- <string>F8E469E013957DF100DB05C8</string>
- <string>F8E469DE13957DD500DB05C8</string>
- <string>F8E469641395739D00DB05C8</string>
- <string>F8E469661395739D00DB05C8</string>
- <string>F8E469681395739D00DB05C8</string>
- <string>242C9E9348A44970B9ECDCF5</string>
- <string>0BBDA6CDB42C48EFB1B980BC</string>
- </array>
- <key>isa</key>
- <string>PBXGroup</string>
- <key>name</key>
- <string>Frameworks</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- <key>F8E469641395739D00DB05C8</key>
- <dict>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>wrapper.framework</string>
- <key>name</key>
- <string>UIKit.framework</string>
- <key>path</key>
- <string>System/Library/Frameworks/UIKit.framework</string>
- <key>sourceTree</key>
- <string>SDKROOT</string>
- </dict>
- <key>F8E469651395739D00DB05C8</key>
- <dict>
- <key>fileRef</key>
- <string>F8E469641395739D00DB05C8</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>F8E469661395739D00DB05C8</key>
- <dict>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>wrapper.framework</string>
- <key>name</key>
- <string>Foundation.framework</string>
- <key>path</key>
- <string>System/Library/Frameworks/Foundation.framework</string>
- <key>sourceTree</key>
- <string>SDKROOT</string>
- </dict>
- <key>F8E469671395739D00DB05C8</key>
- <dict>
- <key>fileRef</key>
- <string>F8E469661395739D00DB05C8</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>F8E469681395739D00DB05C8</key>
- <dict>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>wrapper.framework</string>
- <key>name</key>
- <string>CoreGraphics.framework</string>
- <key>path</key>
- <string>System/Library/Frameworks/CoreGraphics.framework</string>
- <key>sourceTree</key>
- <string>SDKROOT</string>
- </dict>
- <key>F8E469691395739D00DB05C8</key>
- <dict>
- <key>fileRef</key>
- <string>F8E469681395739D00DB05C8</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>F8E4696A1395739D00DB05C8</key>
- <dict>
- <key>children</key>
- <array>
- <string>F8DA09C61396AB690057D0CC</string>
- <string>F8DA09C91396AB690057D0CC</string>
- <string>F8DA09CC1396AB690057D0CC</string>
- <string>F8E4696B1395739D00DB05C8</string>
- </array>
- <key>isa</key>
- <string>PBXGroup</string>
- <key>name</key>
- <string>Classes</string>
- <key>path</key>
- <string>AFNetworkingExample</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- <key>F8E4696B1395739D00DB05C8</key>
- <dict>
- <key>children</key>
- <array>
- <string>F8DA09E31396AC040057D0CC</string>
- <string>F8DA09E61396AC220057D0CC</string>
- <string>F8DA09E51396AC220057D0CC</string>
- <string>F8DA09E71396AC220057D0CC</string>
- <string>F8E4696C1395739D00DB05C8</string>
- </array>
- <key>isa</key>
- <string>PBXGroup</string>
- <key>name</key>
- <string>Supporting Files</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- <key>F8E4696C1395739D00DB05C8</key>
- <dict>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>text.plist.xml</string>
- <key>path</key>
- <string>Info.plist</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- <key>F8E4697F1395739D00DB05C8</key>
- <dict>
- <key>buildSettings</key>
- <dict>
- <key>ARCHS</key>
- <string>$(ARCHS_STANDARD_32_BIT)</string>
- <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key>
- <string>iPhone Developer</string>
- <key>GCC_C_LANGUAGE_STANDARD</key>
- <string>gnu99</string>
- <key>GCC_OPTIMIZATION_LEVEL</key>
- <string>0</string>
- <key>GCC_PREPROCESSOR_DEFINITIONS</key>
- <string>DEBUG</string>
- <key>GCC_SYMBOLS_PRIVATE_EXTERN</key>
- <string>NO</string>
- <key>GCC_VERSION</key>
- <string>com.apple.compilers.llvmgcc42</string>
- <key>GCC_WARN_ABOUT_RETURN_TYPE</key>
- <string>YES</string>
- <key>GCC_WARN_UNUSED_VARIABLE</key>
- <string>YES</string>
- <key>IPHONEOS_DEPLOYMENT_TARGET</key>
- <string>4.3</string>
- <key>SDKROOT</key>
- <string>iphoneos</string>
- </dict>
- <key>isa</key>
- <string>XCBuildConfiguration</string>
- <key>name</key>
- <string>Debug</string>
- </dict>
- <key>F8E469801395739D00DB05C8</key>
- <dict>
- <key>buildSettings</key>
- <dict>
- <key>ARCHS</key>
- <string>$(ARCHS_STANDARD_32_BIT)</string>
- <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key>
- <string>iPhone Developer</string>
- <key>GCC_C_LANGUAGE_STANDARD</key>
- <string>gnu99</string>
- <key>GCC_VERSION</key>
- <string>com.apple.compilers.llvmgcc42</string>
- <key>GCC_WARN_ABOUT_RETURN_TYPE</key>
- <string>YES</string>
- <key>GCC_WARN_UNUSED_VARIABLE</key>
- <string>YES</string>
- <key>IPHONEOS_DEPLOYMENT_TARGET</key>
- <string>4.3</string>
- <key>OTHER_CFLAGS</key>
- <string>-DNS_BLOCK_ASSERTIONS=1</string>
- <key>SDKROOT</key>
- <string>iphoneos</string>
- </dict>
- <key>isa</key>
- <string>XCBuildConfiguration</string>
- <key>name</key>
- <string>Release</string>
- </dict>
- <key>F8E469811395739D00DB05C8</key>
- <dict>
- <key>buildConfigurations</key>
- <array>
- <string>F8E469821395739D00DB05C8</string>
- <string>F8E469831395739D00DB05C8</string>
- </array>
- <key>defaultConfigurationIsVisible</key>
- <string>0</string>
- <key>defaultConfigurationName</key>
- <string>Release</string>
- <key>isa</key>
- <string>XCConfigurationList</string>
- </dict>
- <key>F8E469821395739D00DB05C8</key>
- <dict>
- <key>baseConfigurationReference</key>
- <string>C8C94222118242C297ED4081</string>
- <key>buildSettings</key>
- <dict>
- <key>ALWAYS_SEARCH_USER_PATHS</key>
- <string>NO</string>
- <key>COPY_PHASE_STRIP</key>
- <string>NO</string>
- <key>DSTROOT</key>
- <string>/tmp/Pods.dst</string>
- <key>GCC_DYNAMIC_NO_PIC</key>
- <string>NO</string>
- <key>GCC_PRECOMPILE_PREFIX_HEADER</key>
- <string>YES</string>
- <key>GCC_PREFIX_HEADER</key>
- <string>Prefix.pch</string>
- <key>GCC_VERSION</key>
- <string>com.apple.compilers.llvm.clang.1_0</string>
- <key>GCC_WARN_SHADOW</key>
- <string>YES</string>
- <key>GCC_WARN_SIGN_COMPARE</key>
- <string>YES</string>
- <key>GCC_WARN_UNUSED_PARAMETER</key>
- <string>NO</string>
- <key>INFOPLIST_FILE</key>
- <string>Info.plist</string>
- <key>PRODUCT_NAME</key>
- <string>$(TARGET_NAME)</string>
- <key>SKIP_INSTALL</key>
- <string>YES</string>
- <key>WRAPPER_EXTENSION</key>
- <string>app</string>
- </dict>
- <key>isa</key>
- <string>XCBuildConfiguration</string>
- <key>name</key>
- <string>Debug</string>
- </dict>
- <key>F8E469831395739D00DB05C8</key>
- <dict>
- <key>baseConfigurationReference</key>
- <string>C8C94222118242C297ED4081</string>
- <key>buildSettings</key>
- <dict>
- <key>ALWAYS_SEARCH_USER_PATHS</key>
- <string>NO</string>
- <key>COPY_PHASE_STRIP</key>
- <string>YES</string>
- <key>DSTROOT</key>
- <string>/tmp/Pods.dst</string>
- <key>GCC_PRECOMPILE_PREFIX_HEADER</key>
- <string>YES</string>
- <key>GCC_PREFIX_HEADER</key>
- <string>Prefix.pch</string>
- <key>GCC_VERSION</key>
- <string>com.apple.compilers.llvm.clang.1_0</string>
- <key>GCC_WARN_SHADOW</key>
- <string>YES</string>
- <key>GCC_WARN_SIGN_COMPARE</key>
- <string>YES</string>
- <key>GCC_WARN_UNUSED_PARAMETER</key>
- <string>NO</string>
- <key>INFOPLIST_FILE</key>
- <string>Info.plist</string>
- <key>PRODUCT_NAME</key>
- <string>$(TARGET_NAME)</string>
- <key>SKIP_INSTALL</key>
- <string>YES</string>
- <key>VALIDATE_PRODUCT</key>
- <string>YES</string>
- <key>WRAPPER_EXTENSION</key>
- <string>app</string>
- </dict>
- <key>isa</key>
- <string>XCBuildConfiguration</string>
- <key>name</key>
- <string>Release</string>
- </dict>
- <key>F8E469B71395759C00DB05C8</key>
- <dict>
- <key>children</key>
- <array>
- <string>F8D25D1B1396A9DE00CF3BD6</string>
- <string>F8D25D1D1396A9DE00CF3BD6</string>
- </array>
- <key>isa</key>
- <string>PBXGroup</string>
- <key>name</key>
- <string>Networking Extensions</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- <key>F8E469DE13957DD500DB05C8</key>
- <dict>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>wrapper.framework</string>
- <key>name</key>
- <string>CoreLocation.framework</string>
- <key>path</key>
- <string>System/Library/Frameworks/CoreLocation.framework</string>
- <key>sourceTree</key>
- <string>SDKROOT</string>
- </dict>
- <key>F8E469DF13957DD500DB05C8</key>
- <dict>
- <key>fileRef</key>
- <string>F8E469DE13957DD500DB05C8</string>
- <key>isa</key>
- <string>PBXBuildFile</string>
- </dict>
- <key>F8E469E013957DF100DB05C8</key>
- <dict>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>wrapper.framework</string>
- <key>name</key>
- <string>Security.framework</string>
- <key>path</key>
- <string>System/Library/Frameworks/Security.framework</string>
- <key>sourceTree</key>
- <string>SDKROOT</string>
- </dict>
- <key>F8E469E213957DF700DB05C8</key>
- <dict>
- <key>isa</key>
- <string>PBXFileReference</string>
- <key>lastKnownFileType</key>
- <string>wrapper.framework</string>
- <key>name</key>
- <string>SystemConfiguration.framework</string>
- <key>path</key>
- <string>System/Library/Frameworks/SystemConfiguration.framework</string>
- <key>sourceTree</key>
- <string>SDKROOT</string>
- </dict>
- <key>F8E469ED1395812A00DB05C8</key>
- <dict>
- <key>children</key>
- <array>
- <string>F8D25D171396A9D300CF3BD6</string>
- <string>F8D25D181396A9D300CF3BD6</string>
- </array>
- <key>isa</key>
- <string>PBXGroup</string>
- <key>name</key>
- <string>Images</string>
- <key>path</key>
- <string>AFNetworkingExample/Images</string>
- <key>sourceTree</key>
- <string>&lt;group&gt;</string>
- </dict>
- </dict>
- <key>rootObject</key>
- <string>F8E469571395739C00DB05C8</string>
-</dict>
-</plist>
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 46;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 46CF19E6210948BCAA4F152C /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 242C9E9348A44970B9ECDCF5 /* libPods.a */; };
+ F8D0701B14310F4A00653FD3 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8E469E213957DF700DB05C8 /* SystemConfiguration.framework */; };
+ F8D0701C14310F4F00653FD3 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8E469E013957DF100DB05C8 /* Security.framework */; };
+ F8D25D191396A9D300CF3BD6 /* placeholder-stamp.png in Resources */ = {isa = PBXBuildFile; fileRef = F8D25D171396A9D300CF3BD6 /* placeholder-stamp.png */; };
+ F8D25D1A1396A9D300CF3BD6 /* placeholder-stamp@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F8D25D181396A9D300CF3BD6 /* placeholder-stamp@2x.png */; };
+ F8DA09D21396ABED0057D0CC /* AFGowallaAPIClient.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D25D1D1396A9DE00CF3BD6 /* AFGowallaAPIClient.m */; };
+ F8DA09D41396ABED0057D0CC /* NearbySpotsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F8DA09C81396AB690057D0CC /* NearbySpotsViewController.m */; };
+ F8DA09D51396ABED0057D0CC /* Spot.m in Sources */ = {isa = PBXBuildFile; fileRef = F8DA09CB1396AB690057D0CC /* Spot.m */; };
+ F8DA09D61396ABED0057D0CC /* SpotTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F8DA09CE1396AB690057D0CC /* SpotTableViewCell.m */; };
+ F8DA09E41396AC040057D0CC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F8DA09E31396AC040057D0CC /* main.m */; };
+ F8DA09E81396AC220057D0CC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = F8DA09E71396AC220057D0CC /* AppDelegate.m */; };
+ F8E469651395739D00DB05C8 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8E469641395739D00DB05C8 /* UIKit.framework */; };
+ F8E469671395739D00DB05C8 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8E469661395739D00DB05C8 /* Foundation.framework */; };
+ F8E469691395739D00DB05C8 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8E469681395739D00DB05C8 /* CoreGraphics.framework */; };
+ F8E469DF13957DD500DB05C8 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8E469DE13957DD500DB05C8 /* CoreLocation.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+ 242C9E9348A44970B9ECDCF5 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ 391552C2BD5947DF9FEB5975 /* Pods.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = SOURCE_ROOT; };
+ F8D25D171396A9D300CF3BD6 /* placeholder-stamp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "placeholder-stamp.png"; path = "Images/placeholder-stamp.png"; sourceTree = SOURCE_ROOT; };
+ F8D25D181396A9D300CF3BD6 /* placeholder-stamp@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "placeholder-stamp@2x.png"; path = "Images/placeholder-stamp@2x.png"; sourceTree = SOURCE_ROOT; };
+ F8D25D1B1396A9DE00CF3BD6 /* AFGowallaAPIClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AFGowallaAPIClient.h; path = Classes/AFGowallaAPIClient.h; sourceTree = "<group>"; };
+ F8D25D1D1396A9DE00CF3BD6 /* AFGowallaAPIClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFGowallaAPIClient.m; path = Classes/AFGowallaAPIClient.m; sourceTree = "<group>"; };
+ F8DA09C71396AB690057D0CC /* NearbySpotsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NearbySpotsViewController.h; sourceTree = "<group>"; };
+ F8DA09C81396AB690057D0CC /* NearbySpotsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NearbySpotsViewController.m; sourceTree = "<group>"; };
+ F8DA09CA1396AB690057D0CC /* Spot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Spot.h; sourceTree = "<group>"; };
+ F8DA09CB1396AB690057D0CC /* Spot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Spot.m; sourceTree = "<group>"; };
+ F8DA09CD1396AB690057D0CC /* SpotTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpotTableViewCell.h; sourceTree = "<group>"; };
+ F8DA09CE1396AB690057D0CC /* SpotTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SpotTableViewCell.m; sourceTree = "<group>"; };
+ F8DA09E31396AC040057D0CC /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = SOURCE_ROOT; };
+ F8DA09E51396AC220057D0CC /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = SOURCE_ROOT; };
+ F8DA09E61396AC220057D0CC /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = SOURCE_ROOT; };
+ F8DA09E71396AC220057D0CC /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; };
+ F8E469601395739C00DB05C8 /* AFNetworking iOS Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "AFNetworking iOS Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+ F8E469641395739D00DB05C8 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+ F8E469661395739D00DB05C8 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+ F8E469681395739D00DB05C8 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+ F8E4696C1395739D00DB05C8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ F8E469DE13957DD500DB05C8 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
+ F8E469E013957DF100DB05C8 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+ F8E469E213957DF700DB05C8 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ F8E4695D1395739C00DB05C8 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ F8E469651395739D00DB05C8 /* UIKit.framework in Frameworks */,
+ F8E469671395739D00DB05C8 /* Foundation.framework in Frameworks */,
+ F8E469691395739D00DB05C8 /* CoreGraphics.framework in Frameworks */,
+ F8E469DF13957DD500DB05C8 /* CoreLocation.framework in Frameworks */,
+ F8D0701B14310F4A00653FD3 /* SystemConfiguration.framework in Frameworks */,
+ F8D0701C14310F4F00653FD3 /* Security.framework in Frameworks */,
+ 46CF19E6210948BCAA4F152C /* libPods.a in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ F8DA09C61396AB690057D0CC /* Controllers */ = {
+ isa = PBXGroup;
+ children = (
+ F8DA09C71396AB690057D0CC /* NearbySpotsViewController.h */,
+ F8DA09C81396AB690057D0CC /* NearbySpotsViewController.m */,
+ );
+ name = Controllers;
+ path = Classes/Controllers;
+ sourceTree = SOURCE_ROOT;
+ };
+ F8DA09C91396AB690057D0CC /* Models */ = {
+ isa = PBXGroup;
+ children = (
+ F8DA09CA1396AB690057D0CC /* Spot.h */,
+ F8DA09CB1396AB690057D0CC /* Spot.m */,
+ );
+ name = Models;
+ path = Classes/Models;
+ sourceTree = SOURCE_ROOT;
+ };
+ F8DA09CC1396AB690057D0CC /* Views */ = {
+ isa = PBXGroup;
+ children = (
+ F8DA09CD1396AB690057D0CC /* SpotTableViewCell.h */,
+ F8DA09CE1396AB690057D0CC /* SpotTableViewCell.m */,
+ );
+ name = Views;
+ path = Classes/Views;
+ sourceTree = SOURCE_ROOT;
+ };
+ F8E469551395739C00DB05C8 = {
+ isa = PBXGroup;
+ children = (
+ F8E469B71395759C00DB05C8 /* Networking Extensions */,
+ F8E4696A1395739D00DB05C8 /* Classes */,
+ F8E469ED1395812A00DB05C8 /* Images */,
+ F8E469631395739D00DB05C8 /* Frameworks */,
+ F8E469611395739C00DB05C8 /* Products */,
+ 391552C2BD5947DF9FEB5975 /* Pods.xcconfig */,
+ );
+ sourceTree = "<group>";
+ };
+ F8E469611395739C00DB05C8 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ F8E469601395739C00DB05C8 /* AFNetworking iOS Example.app */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+ F8E469631395739D00DB05C8 /* Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ F8E469E213957DF700DB05C8 /* SystemConfiguration.framework */,
+ F8E469E013957DF100DB05C8 /* Security.framework */,
+ F8E469DE13957DD500DB05C8 /* CoreLocation.framework */,
+ F8E469641395739D00DB05C8 /* UIKit.framework */,
+ F8E469661395739D00DB05C8 /* Foundation.framework */,
+ F8E469681395739D00DB05C8 /* CoreGraphics.framework */,
+ 242C9E9348A44970B9ECDCF5 /* libPods.a */,
+ );
+ name = Frameworks;
+ sourceTree = "<group>";
+ };
+ F8E4696A1395739D00DB05C8 /* Classes */ = {
+ isa = PBXGroup;
+ children = (
+ F8DA09C61396AB690057D0CC /* Controllers */,
+ F8DA09C91396AB690057D0CC /* Models */,
+ F8DA09CC1396AB690057D0CC /* Views */,
+ F8E4696B1395739D00DB05C8 /* Supporting Files */,
+ );
+ name = Classes;
+ path = AFNetworkingExample;
+ sourceTree = "<group>";
+ };
+ F8E4696B1395739D00DB05C8 /* Supporting Files */ = {
+ isa = PBXGroup;
+ children = (
+ F8DA09E31396AC040057D0CC /* main.m */,
+ F8DA09E61396AC220057D0CC /* Prefix.pch */,
+ F8DA09E51396AC220057D0CC /* AppDelegate.h */,
+ F8DA09E71396AC220057D0CC /* AppDelegate.m */,
+ F8E4696C1395739D00DB05C8 /* Info.plist */,
+ );
+ name = "Supporting Files";
+ sourceTree = "<group>";
+ };
+ F8E469B71395759C00DB05C8 /* Networking Extensions */ = {
+ isa = PBXGroup;
+ children = (
+ F8D25D1B1396A9DE00CF3BD6 /* AFGowallaAPIClient.h */,
+ F8D25D1D1396A9DE00CF3BD6 /* AFGowallaAPIClient.m */,
+ );
+ name = "Networking Extensions";
+ sourceTree = "<group>";
+ };
+ F8E469ED1395812A00DB05C8 /* Images */ = {
+ isa = PBXGroup;
+ children = (
+ F8D25D171396A9D300CF3BD6 /* placeholder-stamp.png */,
+ F8D25D181396A9D300CF3BD6 /* placeholder-stamp@2x.png */,
+ );
+ name = Images;
+ path = AFNetworkingExample/Images;
+ sourceTree = "<group>";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+ F8E4695F1395739C00DB05C8 /* AFNetworking iOS Example */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = F8E469811395739D00DB05C8 /* Build configuration list for PBXNativeTarget "AFNetworking iOS Example" */;
+ buildPhases = (
+ F8E4695C1395739C00DB05C8 /* Sources */,
+ F8E4695D1395739C00DB05C8 /* Frameworks */,
+ F8E4695E1395739C00DB05C8 /* Resources */,
+ DD5E268688D543178A339BEB /* Copy Pods Resources */,
+ 8A3A8D61FF1041A3B3AA9C55 /* Copy Pods Resources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = "AFNetworking iOS Example";
+ productName = AFNetworkingExample;
+ productReference = F8E469601395739C00DB05C8 /* AFNetworking iOS Example.app */;
+ productType = "com.apple.product-type.application";
+ };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+ F8E469571395739C00DB05C8 /* Project object */ = {
+ isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0420;
+ ORGANIZATIONNAME = Gowalla;
+ };
+ buildConfigurationList = F8E4695A1395739C00DB05C8 /* Build configuration list for PBXProject "AFNetworking iOS Example" */;
+ compatibilityVersion = "Xcode 3.2";
+ developmentRegion = English;
+ hasScannedForEncodings = 0;
+ knownRegions = (
+ en,
+ );
+ mainGroup = F8E469551395739C00DB05C8;
+ productRefGroup = F8E469611395739C00DB05C8 /* Products */;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ F8E4695F1395739C00DB05C8 /* AFNetworking iOS Example */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+ F8E4695E1395739C00DB05C8 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ F8D25D191396A9D300CF3BD6 /* placeholder-stamp.png in Resources */,
+ F8D25D1A1396A9D300CF3BD6 /* placeholder-stamp@2x.png in Resources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+ 8A3A8D61FF1041A3B3AA9C55 /* Copy Pods Resources */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Copy Pods Resources";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n";
+ };
+ DD5E268688D543178A339BEB /* Copy Pods Resources */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Copy Pods Resources";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n";
+ };
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+ F8E4695C1395739C00DB05C8 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ F8DA09D21396ABED0057D0CC /* AFGowallaAPIClient.m in Sources */,
+ F8DA09D41396ABED0057D0CC /* NearbySpotsViewController.m in Sources */,
+ F8DA09D51396ABED0057D0CC /* Spot.m in Sources */,
+ F8DA09D61396ABED0057D0CC /* SpotTableViewCell.m in Sources */,
+ F8DA09E41396AC040057D0CC /* main.m in Sources */,
+ F8DA09E81396AC220057D0CC /* AppDelegate.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+ F8E4697F1395739D00DB05C8 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ GCC_VERSION = com.apple.compilers.llvmgcc42;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+ SDKROOT = iphoneos;
+ };
+ name = Debug;
+ };
+ F8E469801395739D00DB05C8 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_VERSION = com.apple.compilers.llvmgcc42;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+ OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
+ SDKROOT = iphoneos;
+ };
+ name = Release;
+ };
+ F8E469821395739D00DB05C8 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 391552C2BD5947DF9FEB5975 /* Pods.xcconfig */;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ COPY_PHASE_STRIP = NO;
+ DSTROOT = /tmp/Pods.dst;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = Prefix.pch;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_SHADOW = YES;
+ GCC_WARN_SIGN_COMPARE = YES;
+ GCC_WARN_UNUSED_PARAMETER = NO;
+ INFOPLIST_FILE = Info.plist;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SKIP_INSTALL = YES;
+ WRAPPER_EXTENSION = app;
+ };
+ name = Debug;
+ };
+ F8E469831395739D00DB05C8 /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 391552C2BD5947DF9FEB5975 /* Pods.xcconfig */;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ COPY_PHASE_STRIP = YES;
+ DSTROOT = /tmp/Pods.dst;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = Prefix.pch;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_SHADOW = YES;
+ GCC_WARN_SIGN_COMPARE = YES;
+ GCC_WARN_UNUSED_PARAMETER = NO;
+ INFOPLIST_FILE = Info.plist;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SKIP_INSTALL = YES;
+ VALIDATE_PRODUCT = YES;
+ WRAPPER_EXTENSION = app;
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ F8E4695A1395739C00DB05C8 /* Build configuration list for PBXProject "AFNetworking iOS Example" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ F8E4697F1395739D00DB05C8 /* Debug */,
+ F8E469801395739D00DB05C8 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ F8E469811395739D00DB05C8 /* Build configuration list for PBXNativeTarget "AFNetworking iOS Example" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ F8E469821395739D00DB05C8 /* Debug */,
+ F8E469831395739D00DB05C8 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = F8E469571395739C00DB05C8 /* Project object */;
+}
View
2  lib/cocoapods/gem_version.rb
@@ -1,6 +1,6 @@
module Pod
# The version of the cocoapods command line tool.
#
- VERSION = '0.22.1' unless defined? Pod::VERSION
+ VERSION = '0.22.2' unless defined? Pod::VERSION
end
View
8 lib/cocoapods/generator/xcconfig.rb
@@ -10,13 +10,17 @@ class XCConfig
# @return [Target] the target represented by this xcconfig.
#
attr_reader :target
- attr_reader :sandbox
# @param [Target] target @see target
#
def initialize(target)
@target = target
- @sandbox = target.sandbox
+ end
+
+ # @return [Sandbox] the sandbox of this target.
+ #
+ def sandbox
+ target.sandbox
end
# @return [Xcodeproj::Config] The generated xcconfig.
View
22 lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
@@ -15,27 +15,19 @@ class AggregateXCConfig < XCConfig
# @return [Xcodeproj::Config]
#
def generate
- config = {
- 'OTHER_LDFLAGS' => default_ld_flags,
- 'HEADER_SEARCH_PATHS' => quote(sandbox.public_headers.search_paths),
- 'PODS_ROOT' => target.relative_pods_root,
- 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
- }
+ @xcconfig = Xcodeproj::Config.new({
+ 'OTHER_LDFLAGS' => default_ld_flags,
+ 'HEADER_SEARCH_PATHS' => quote(sandbox.public_headers.search_paths),
+ 'PODS_ROOT' => target.relative_pods_root,
+ 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
+ })
target.pod_targets.each do |pod_target|
- xcconfig = Xcodeproj::Config.new
pod_target.spec_consumers.each do |consumer|
- add_spec_build_settings_to_xcconfig(consumer, xcconfig)
- end
-
- xcconfig.to_hash.each do |k, v|
- prefixed_key = pod_target.xcconfig_prefix + k
- config[k] = "#{config[k]} ${#{prefixed_key}}"
+ add_spec_build_settings_to_xcconfig(consumer, @xcconfig)
end
end
- @xcconfig = Xcodeproj::Config.new(config)
- @xcconfig.includes = target.pod_targets.map(&:name)
@xcconfig
end
View
71 lib/cocoapods/generator/xcconfig/private_pod_xcconfig.rb
@@ -9,6 +9,19 @@ module Generator
#
class PrivatePodXCConfig < XCConfig
+ # @return [Xcodeproj::Config] The public xcconfig which this one will
+ # use.
+ #
+ attr_reader :public_xcconfig
+
+ # @param [Target] target @see target
+ # @param [Xcodeproj::Config] public_xcconfig @see public_xcconfig
+ #
+ def initialize(target, public_xcconfig)
+ super(target)
+ @public_xcconfig = public_xcconfig
+ end
+
# Generates the xcconfig.
#
# @return [Xcodeproj::Config]
@@ -22,19 +35,57 @@ def generate
# 'USE_HEADERMAP' => 'NO'
}
- xcconfig = Xcodeproj::Config.new
- target.spec_consumers.each do |consumer|
- add_spec_build_settings_to_xcconfig(consumer, xcconfig)
- end
+ xcconfig_hash = add_xcconfig_namespaced_keys(public_xcconfig.to_hash, config, target.xcconfig_prefix)
+ @xcconfig = Xcodeproj::Config.new(xcconfig_hash)
+ @xcconfig.includes = [target.name]
+ @xcconfig
+ end
+
+ private
+
+ #-----------------------------------------------------------------------#
- xcconfig.to_hash.each do |k, v|
- prefixed_key = target.xcconfig_prefix + k
- config[k] = "#{config[k]} ${#{prefixed_key}}"
+ # !@group Private Helpers
+
+ # Returns the hash representation of an xcconfig which inherit from the
+ # namespaced keys of a given one.
+ #
+ # @param [Hash] source_config
+ # The xcconfig whose keys need to be inherited.
+ #
+ # @param [Hash] destination_config
+ # The config which should inherit the source config keys.
+ #
+ # @return [Hash] The inheriting xcconfig.
+ #
+ def add_xcconfig_namespaced_keys(source_config, destination_config, prefix)
+ result = destination_config.dup
+ source_config.each do |key, value|
+ prefixed_key = prefix + conditional_less_key(key)
+ current_value = destination_config[key]
+ if current_value
+ result[key] = "#{current_value} ${#{prefixed_key}}"
+ else
+ result[key] = "${#{prefixed_key}}"
+ end
end
+ result
+ end
- @xcconfig = Xcodeproj::Config.new(config)
- @xcconfig.includes = [target.name]
- @xcconfig
+ # Strips the [*]-syntax from the given xcconfig key.
+ #
+ # @param [String] key
+ # The key to strip.
+ #
+ # @return [String] The stripped key.
+ #
+ def conditional_less_key(key)
+ brackets_index = key.index('[')
+ if brackets_index
+ key[0...brackets_index]
+ else
+ key
+ end
end
#-----------------------------------------------------------------------#
View
15 lib/cocoapods/installer.rb
@@ -356,21 +356,14 @@ def set_target_dependencies
#
def add_dependency(dependent_target, dependency_target)
container_proxy = pods_project.new(Xcodeproj::Project::PBXContainerItemProxy)
- # container_proxy.container_portal = '224D2C1BCDE44D8F9B674AD5'
+ container_proxy.container_portal = pods_project.root_object.uuid
container_proxy.proxy_type = '1'
- # container_proxy.remote_global_id_string = 'F8D3306CA0564CA3861B2D4E'
- # container_proxy.remote_info = 'Pods-AFHTTPRequestOperationLogger'
-
-
- # reference_proxy = pods_project.new(Xcodeproj::Project::PBXReferenceProxy)
- # reference_proxy.path =
- # reference_proxy.file_type =
- # reference_proxy.remote_ref = container_proxy
- # reference_proxy.source_tree = BUILT_PRODUCTS_DIR
+ container_proxy.remote_global_id_string = dependency_target.target.uuid
+ container_proxy.remote_info = dependency_target.target.name
dependency = pods_project.new(Xcodeproj::Project::PBXTargetDependency)
dependency.target = dependency_target.target
- # dependency.targetProxy = container_proxy
+ dependency.targetProxy = container_proxy
dependent_target.target.dependencies << dependency
end
View
8 lib/cocoapods/installer/target_installer/pod_target_installer.rb
@@ -55,16 +55,16 @@ def add_files_to_build_phases
#
def create_xcconfig_file
path = library.xcconfig_path
+ public_gen = Generator::PublicPodXCConfig.new(library)
UI.message "- Generating public xcconfig file at #{UI.path(path)}" do
- gen = Generator::PublicPodXCConfig.new(library)
- gen.save_as(path)
+ public_gen.save_as(path)
add_file_to_support_group(path)
end
path = library.xcconfig_private_path
+ private_gen = Generator::PrivatePodXCConfig.new(library, public_gen.xcconfig)
UI.message "- Generating private xcconfig file at #{UI.path(path)}" do
- gen = Generator::PrivatePodXCConfig.new(library)
- gen.save_as(path)
+ private_gen.save_as(path)
xcconfig_file_ref = add_file_to_support_group(path)
target.build_configurations.each do |c|
View
3  lib/cocoapods/project.rb
@@ -187,8 +187,9 @@ def file_reference(absolute_path)
#
def add_podfile(podfile_path)
podfile_path = Pathname.new(podfile_path)
- podfile_ref = new_file(relativize(podfile_path))
+ podfile_ref = new_file(relativize(podfile_path))
podfile_ref.xc_language_specification_identifier = 'xcode.lang.ruby'
+ podfile_ref.last_known_file_type = 'text'
podfile_ref
end
View
4 lib/cocoapods/validator.rb
@@ -211,7 +211,7 @@ def install_pod
file_accessors = installer.aggregate_targets.map do |target|
target.pod_targets.map(&:file_accessors)
end.flatten
-
+
@file_accessor = file_accessors.find { |accessor| accessor.spec.root.name == spec.root.name }
config.silent
end
@@ -344,7 +344,7 @@ def parse_xcodebuild_output(output)
# returns its output (bot STDOUT and STDERR).
#
def xcodebuild
- `xcodebuild clean build 2>&1`
+ `xcodebuild clean build -target Pods 2>&1`
end
#-------------------------------------------------------------------------#
View
2  spec/integration/install_add_pod/after/Podfile.lock
@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.22.1
+COCOAPODS: 0.22.2
View
2  spec/integration/install_add_pod/after/Pods/Manifest.lock
@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.22.1
+COCOAPODS: 0.22.2
View
4 spec/integration/install_add_pod/after/Pods/Pods.xcconfig
@@ -1,6 +1,4 @@
-#include "Pods-JSONKit.xcconfig"
-#include "Pods-Reachability.xcconfig"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/JSONKit" "${PODS_ROOT}/Headers/Reachability"
-OTHER_LDFLAGS = -ObjC ${PODS_REACHABILITY_OTHER_LDFLAGS}
+OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
PODS_ROOT = ${SRCROOT}/Pods
View
2  spec/integration/install_custom_workspace/after/Podfile.lock
@@ -8,4 +8,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.22.1
+COCOAPODS: 0.22.2
View
2  spec/integration/install_custom_workspace/after/Pods/Manifest.lock
@@ -8,4 +8,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.22.1
+COCOAPODS: 0.22.2
View
3  spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1.xcconfig
@@ -1,5 +1,4 @@
-#include "Pods-SampleApp_1-Reachability.xcconfig"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/Reachability"
-OTHER_LDFLAGS = -ObjC ${PODS_SAMPLEAPP___REACHABILITY_OTHER_LDFLAGS}
+OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
PODS_ROOT = ${SRCROOT}/Pods
View
3  spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2.xcconfig
@@ -1,5 +1,4 @@
-#include "Pods-SampleApp_2-Reachability.xcconfig"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/Reachability"
-OTHER_LDFLAGS = -ObjC ${PODS_SAMPLEAPP___REACHABILITY_OTHER_LDFLAGS}
+OTHER_LDFLAGS = -ObjC -framework SystemConfiguration
PODS_ROOT = ${SRCROOT}/Pods
View
2  spec/integration/install_external_source/after/Podfile.lock
@@ -15,4 +15,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
-COCOAPODS: 0.22.1
+COCOAPODS: 0.22.2
View
2  spec/integration/install_external_source/after/Pods/Manifest.lock
@@ -15,4 +15,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
-COCOAPODS: 0.22.1
+COCOAPODS: 0.22.2
View
1  spec/integration/install_external_source/after/Pods/Pods.xcconfig
@@ -1,4 +1,3 @@
-#include "Pods-PodTest.xcconfig"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/PodTest"
OTHER_LDFLAGS = -ObjC
View
4 spec/integration/install_external_source/after/SampleApp.xcodeproj.yaml
@@ -66,7 +66,7 @@ Targets:
WRAPPER_EXTENSION: app
FRAMEWORK_SEARCH_PATHS:
- $(inherited)
- - '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
+ - ! '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
IPHONEOS_DEPLOYMENT_TARGET: '6.1'
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
INFOPLIST_FILE: iOS App/iOS App-Info.plist
@@ -82,7 +82,7 @@ Targets:
OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
FRAMEWORK_SEARCH_PATHS:
- $(inherited)
- - '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
+ - ! '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
IPHONEOS_DEPLOYMENT_TARGET: '6.1'
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
INFOPLIST_FILE: iOS App/iOS App-Info.plist
View
2  spec/integration/install_local_source/after/Podfile.lock
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
-COCOAPODS: 0.22.1
+COCOAPODS: 0.22.2
View
2  spec/integration/install_local_source/after/Pods/Manifest.lock
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
-COCOAPODS: 0.22.1
+COCOAPODS: 0.22.2
View
3  spec/integration/install_local_source/after/Pods/Pods.xcconfig
@@ -1,5 +1,4 @@
-#include "Pods-Reachability.xcconfig"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/Reachability"
-OTHER_LDFLAGS = -ObjC ${PODS_REACHABILITY_OTHER_LDFLAGS}
+OTHER_LDFLAGS = -ObjC -framework SystemConfiguration