Skip to content

Commit

Permalink
Merge pull request #2090 from cbrunsdon/remove_responder_from_core
Browse files Browse the repository at this point in the history
Remove responders dependency from core
  • Loading branch information
tvdeyen authored Jul 21, 2017
2 parents 4bd670a + 1850853 commit 5f404db
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions api/lib/spree/api.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
require 'spree/core'

require 'rabl'
require 'responders'

module Spree
module Api
Expand Down
1 change: 1 addition & 0 deletions api/solidus_api.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ Gem::Specification.new do |gem|
gem.add_dependency 'solidus_core', gem.version
gem.add_dependency 'rabl', '0.13.0' # FIXME: update for proper rails 5 support
gem.add_dependency 'versioncake', '~> 3.0'
gem.add_dependency 'responders'
end
1 change: 0 additions & 1 deletion core/lib/spree/core.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
require 'paranoia'
require 'ransack'
require 'state_machines-activerecord'
require 'responders'

# This is required because ActiveModel::Validations#invalid? conflicts with the
# invalid state of a Payment. In the future this should be removed.
Expand Down
1 change: 0 additions & 1 deletion core/solidus_core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ Gem::Specification.new do |s|
s.add_dependency 'paranoia', '~> 2.3'
s.add_dependency 'rails', '~> 5.1.0'
s.add_dependency 'ransack', '~> 1.8'
s.add_dependency 'responders'
s.add_dependency 'state_machines-activerecord', '~> 0.4'
s.add_dependency 'stringex', '~> 1.5.1'
s.add_dependency 'twitter_cldr', '>= 3.0', '< 5'
Expand Down

2 comments on commit 5f404db

@kainio
Copy link

@kainio kainio commented on 5f404db Aug 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s.required_ruby_version is duplicated.

@mamhoff
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kainio That's true, but outside the scope of this commit. Would you mind opening a PR that fixes this issues?

Please sign in to comment.