Merge branch 'master' of github.com:CocoaPods/CocoaPods
* 'master' of github.com:CocoaPods/CocoaPods: Make all the examples build on 1.9.3 as well. Silence warnings while loading Faraday for Octokit. See #278. Remove stray file. Update RKTwitter example. ALL EXAMPLES BUILD!
Showing
... | ... | @@ -5,13 +5,8 @@ gem "escape" |
gem "json" | ||
gem "open4" | ||
# We don't want octokit to pull in faraday 0.8.0, as it prints a warning about | ||
# the `system_timer` gem being needed, which isn't available on 1.9.x | ||
# | ||
# Once faraday 0.8.1 is released this should be resolved: | ||
# https://github.com/technoweenie/faraday/pull/147 | ||
gem "faraday", "0.7.6" | ||
gem "octokit", "<= 1.0.3" | ||
gem "faraday", ">= 0.8.1" | ||
gem "octokit" | ||
group :development do | ||
gem "xcodeproj", :git => "git://github.com/CocoaPods/Xcodeproj.git" | ||
... | ... |
... | ... | @@ -28,13 +28,8 @@ Gem::Specification.new do |s| |
s.post_install_message = "[!] If this is your first time install of CocoaPods, or if " \ | ||
"you are upgrading, first run: $ pod setup" | ||
# We don't want octokit to pull in faraday 0.8.0, as it prints a warning about | ||
# the `system_timer` gem being needed, which isn't available on 1.9.x | ||
# | ||
# Once faraday 0.8.1 is released this should be resolved: | ||
# https://github.com/technoweenie/faraday/pull/147 | ||
s.add_runtime_dependency 'faraday', '~> 0.7.6' | ||
s.add_runtime_dependency 'octokit', '<= 1.0.3' | ||
s.add_runtime_dependency 'faraday', '~> 0.8.1' | ||
s.add_runtime_dependency 'octokit', '~> 1.3.0' | ||
s.add_runtime_dependency 'colored', '~> 1.2' | ||
s.add_runtime_dependency 'escape', '~> 0.0.4' | ||
... | ... |
examples/RKTwitter/Classes/RKTStatus.h
100644 → 100755
examples/RKTwitter/Classes/RKTStatus.m
100644 → 100755
examples/RKTwitter/Classes/RKTUser.h
100644 → 100755
examples/RKTwitter/Classes/RKTUser.m
100644 → 100755
This diff is collapsed.
This diff is collapsed.
File mode changed from 100644 to 100755
examples/RKTwitter/RKTwitter_Prefix.pch
100644 → 100755
File mode changed from 100644 to 100755
examples/RKTwitter/Resources/BG.png
100644 → 100755
File mode changed from 100644 to 100755
examples/RKTwitter/Resources/BG@2x.png
100644 → 100755
File mode changed from 100644 to 100755
examples/RKTwitter/Resources/Default.png
100644 → 100755
File mode changed from 100644 to 100755
examples/RKTwitter/Resources/Default@2x.png
100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
examples/RKTwitter/Resources/listbg.png
100644 → 100755
File mode changed from 100644 to 100755
examples/RKTwitter/Resources/listbg@2x.png
100644 → 100755
File mode changed from 100644 to 100755
examples/RKTwitter/main.m
100644 → 100755
Please
register
or
sign in
to comment