Skip to content

Commit

Permalink
Merge pull request #42 from dsalahutdinov/master
Browse files Browse the repository at this point in the history
Allow Rails from 5.0
  • Loading branch information
dsalahutdinov committed Nov 15, 2018
2 parents ae4e85a + 6f1e765 commit 0fc4ed3
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -17,3 +17,4 @@
coverage
Gemfile.lock
spec/dummy/db/*.sqlite3
/gemfiles/*
1 change: 1 addition & 0 deletions .rubocop.yml
Expand Up @@ -6,6 +6,7 @@ AllCops:
Exclude:
- 'spec/dummy/db/**/*.rb'
- 'vendor/**/*'
- 'gemfiles/*'
TargetRubyVersion: 2.4

Metrics/BlockLength:
Expand Down
9 changes: 9 additions & 0 deletions .travis.yml
Expand Up @@ -2,4 +2,13 @@ sudo: false
language: ruby
rvm:
- 2.4.2

before_install: gem install bundler -v 1.16.0

before_script:
- bundle install
- bundle exec appraisal

script:
- bundle exec appraisal rspec
- bundle exec rubocop
13 changes: 13 additions & 0 deletions Appraisals
@@ -0,0 +1,13 @@
# frozen_string_literal: true

appraise '5.0' do
gem 'activerecord', '~> 5.0'
end

appraise '5.1' do
gem 'activerecord', '~> 5.1'
end

appraise '5.2' do
gem 'activerecord', '~> 5.2'
end
3 changes: 2 additions & 1 deletion logux_rails.gemspec
Expand Up @@ -26,8 +26,9 @@ Gem::Specification.new do |spec|
spec.add_dependency 'configurations'
spec.add_dependency 'hashie'
spec.add_dependency 'nanoid'
spec.add_dependency 'rails', '~> 5'
spec.add_dependency 'rails', '>= 5.0'
spec.add_dependency 'rest-client'
spec.add_development_dependency 'appraisal', '~> 2.2'
spec.add_development_dependency 'bundler', '~> 1.16'
spec.add_development_dependency 'combustion', '~> 1.0.0'
spec.add_development_dependency 'coveralls'
Expand Down

0 comments on commit 0fc4ed3

Please sign in to comment.