diaspora/diaspora — Issue #2366: Bundle conflicts (omniauth, oauth2, twitter, fog, addressable)
Author: andrejpodzimek
Created: 2011-11-09 20:35:52+00:00
State: open

There were version conflicts related to `omniauth` and `oauth2`. After some trial-and-error tweaking, I managed to make it work like this:

diff --git a/Gemfile b/Gemfile
index 00255c0..0f8332f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,8 +13,8 @@ gem 'devise', '~> 1.3.1'
gem 'devise_invitable', '0.5.0'
gem 'jwt', "0.1.3"
gem 'oauth2-provider', '0.0.16'
-gem 'omniauth', '0.2.6'
-gem 'twitter', '1.5.0'
+gem 'omniauth', '0.3.2'
+gem 'twitter'

# backups

@@ -43,7 +43,7 @@ gem 'aws', '2.3.32' # upgrade to 2.4 breaks 1.8 >.<
gem 'carrierwave', '0.5.3'
gem 'excon', '0.2.4'
gem 'fastercsv', '1.5.4', :require => false
-gem 'fog', '0.3.25'
+gem 'fog'
gem 'jammit', '0.5.4'
gem 'mini_magick', '3.2'
gem 'rest-client', '1.6.1'
@@ -88,7 +88,7 @@ gem 'acts-as-taggable-on', :git => 'git://github.com/diaspora/acts-as-taggable-o

# URIs and HTTP

-gem 'addressable', '2.2.4', :require => 'addressable/uri'
+gem 'addressable', '2.2.6', :require => 'addressable/uri'
gem 'http_accept_language', :git => 'git://github.com/iain/http_accept_language.git', :ref => '0b78aa7849fc90cf9e12'

# views

Since `omniauth 1.0.0` did not work (`db:migrate` failed) and the older version was prone to conflicts with `twitter` and other components, I had to use the solution shown above.

Obviously, this is just my stupid wild guess and I may have messed it up. The pod seems to work fine, but I don't have a sufficient knowledge of the implementation details...