Gem cleanup (switching to official pre-release of will_paginate and o…

…fficial repo for activemerchant.)

Gemfile

@@ -3,12 +3,9 @@ source :gemcutter
 gem "spree", :path => File.dirname(__FILE__)
 
 # eventually these can be dropped and replaced by spree.gemspec dependencies but we need the edge versions for now
-gem "activemerchant", :require => 'active_merchant', :git => "git://github.com/railsjedi/active_merchant.git"
-gem "will_paginate", :git => "git://github.com/mislav/will_paginate.git", :branch => "rails3"
 gem 'resource_controller', :git => "git://github.com/BDQ/resource_controller.git"
-gem "authlogic", '>= 2.1.5'
-
-gem 'searchlogic', :git => 'git://github.com/romul/searchlogic.git'
+gem 'searchlogic', :git => 'git://github.com/schof/searchlogic.git'
+gem 'activemerchant', :git => 'git://github.com/Shopify/active_merchant.git'
 
 gem 'mysql'
 gem 'sqlite3-ruby'
@@ -19,7 +16,7 @@ group :test do
  gem 'shoulda', :git => "git://github.com/thoughtbot/shoulda.git"
  gem 'factory_girl_rails', '>= 1.0.0'
  gem 'spork'
- #gem 'test-unit', '~>2.0.5', :require => 'test/unit' if RUBY_VERSION.to_f >= 1.9
+ gem 'test-unit', '~>2.0.5', :require => 'test/unit' if RUBY_VERSION.to_f >= 1.9
  gem 'faker'
 end
 

core/spree-core.gemspec

@@ -27,15 +27,15 @@ Gem::Specification.new do |s|
  s.add_dependency('rails', '= 3.0.0.beta4')
  s.add_dependency('highline', '>= 1.5.1')
  s.add_dependency('authlogic', '>= 2.1.5')
- s.add_dependency('activemerchant')
  s.add_dependency('activerecord-tableless', '>= 0.1.0')
  s.add_dependency('less', '>= 1.2.20')
  s.add_dependency('stringex', '>= 1.0.3')
- s.add_dependency('will_paginate')
  s.add_dependency('state_machine', '>= 0.9.2')
  s.add_dependency('faker', '>= 0.3.1')
  s.add_dependency('paperclip', '>= 2.3.1.1')
  s.add_dependency('resource_controller')
+ #s.add_dependency('activemerchant', '>= 1.7.0')
+ s.add_dependency('will_paginate', '>= 3.0.pre')
 
  # s.add_dependency('actionpack', version)
  # s.add_dependency('mail', '~> 2.2.3')

spree.gemspec

@@ -25,19 +25,4 @@ Gem::Specification.new do |s|
  s.add_dependency('spree_dashboard', version)
  s.add_dependency('spree_sample', version)
  s.add_dependency('spree_promotions', version)
- # RAILS3 TODO - add more of the core extensions, etc.
- s.add_dependency('bundler', '>= 0.9.26')
- s.add_dependency('rails', '= 3.0.0.beta4')
- s.add_dependency('highline', '>= 1.5.1')
- s.add_dependency('authlogic', '>= 2.1.5')
- s.add_dependency('activemerchant')
- s.add_dependency('activerecord-tableless', '>= 0.1.0')
- s.add_dependency('less', '>= 1.2.20')
- s.add_dependency('stringex', '>= 1.0.3')
- s.add_dependency('will_paginate')
- s.add_dependency('state_machine', '>= 0.9.2')
- s.add_dependency('faker', '>= 0.3.1')
- s.add_dependency('paperclip', '>= 2.3.1.1')
- s.add_dependency('resource_controller')
-
 end