Skip to content

Commit

Permalink
Add support for Rails 5.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
holidayworking committed Jul 3, 2016
1 parent 7e3b4f9 commit 6b436d3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
global:
- JRUBY_OPTS='-J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Djruby.compile.mode=OFF -J-Djruby.compile.invokedynamic=false'
gemfile:
- gemfiles/Gemfile.actionpack5.0.0.beta4
- gemfiles/Gemfile.actionpack5.0.0
- gemfiles/Gemfile.actionpack4.0
- Gemfile
script: bundle install --jobs=3 --retry=3 && bundle exec rake
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ source 'https://rubygems.org'
gemspec path: '..'

group :test do
gem 'activerecord', '5.0.0.rc2'
gem 'actionpack', '5.0.0.rc2'
gem 'activerecord', '5.0.0'
gem 'actionpack', '5.0.0'

# logstash does not release any gems on rubygems, but they have two gemspecs within their repo.
# Using the tag is an attempt of having a stable version to test against where we can ensure that
Expand Down
6 changes: 3 additions & 3 deletions lograge.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rspec'
s.add_development_dependency 'rubocop', '0.37.2'

s.add_runtime_dependency 'activesupport', '>= 4', '<= 5.0.0.rc2'
s.add_runtime_dependency 'actionpack', '>= 4', '<= 5.0.0.rc2'
s.add_runtime_dependency 'railties', '>= 4', '<= 5.0.0.rc2'
s.add_runtime_dependency 'activesupport', '>= 4', '<= 5.0.0'
s.add_runtime_dependency 'actionpack', '>= 4', '<= 5.0.0'
s.add_runtime_dependency 'railties', '>= 4', '<= 5.0.0'
end

1 comment on commit 6b436d3

@gaffneyc
Copy link

@gaffneyc gaffneyc commented on 6b436d3 Jul 4, 2016

Choose a reason for hiding this comment

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

The dependencies for Rails 5 are too strict. This is going to require a new release of Lograge when 5.0.1 is released even though it's unlikely to break lograge. If anything I would suggest just specifying >= 4 similar to how it was specified in 0.3.6.

Please # to comment.