Skip to content

Unlock/ignore dev ruby version & update CI ruby version #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 2, 2018
Merged

Unlock/ignore dev ruby version & update CI ruby version #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d340a1d
Update project a bit:
jsmestad Jan 22, 2018
974d0e9
tests: set dummy app to use native sqlite bools
Jun 30, 2018
ae386e9
lint: add frozen string literal to version file
Jun 30, 2018
c0ab164
Revert "tests: set dummy app to use native sqlite bools"
Jun 30, 2018
79c98dd
rails 4.1 segfaults on modern ruby versions so stop testing it
Jun 30, 2018
5b0e684
Merge branch 'master' into dev-ruby-version
Jul 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
/tmp/
/spec/dummy/tmp/
*.orig
.ruby-version
1 change: 0 additions & 1 deletion .ruby-version
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
language: ruby
cache: bundler
sudo: false
env:
- JSONAPI_RESOURCES_VERSION=0.9 RAILS_VERSION=4.2.0
install:
- bundle install
rvm:
- 2.4.3
- 2.3
- 2.4
- 2.5
before_install: gem install bundler -v 1.16.2
notifications:
email: false
Expand Down
2 changes: 0 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ source 'https://rubygems.org'

gemspec

gem 'sqlite3', '1.3.10'

rails_version = ENV['RAILS_VERSION'] || 'default'
jsonapi_resources_version = ENV['JSONAPI_RESOURCES_VERSION'] || 'default'

Expand Down
13 changes: 7 additions & 6 deletions jsonapi-authorization.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@ Gem::Specification.new do |spec|
spec.add_dependency "pundit", "~> 1.0"

spec.add_development_dependency "bundler", "~> 1.11"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "rake", "~> 12.0"
spec.add_development_dependency "rspec", "~> 3.0"
spec.add_development_dependency "rspec-rails", "~> 3.0"
spec.add_development_dependency "pry", "~> 0.10"
spec.add_development_dependency "pry-byebug", "~> 1.3"
spec.add_development_dependency "pry-doc", "~> 0.6"
spec.add_development_dependency "pry-rails", "~> 0.3.4"
spec.add_development_dependency "rspec-rails", "~> 3.7"
spec.add_development_dependency "pry"
spec.add_development_dependency "pry-byebug"
spec.add_development_dependency "pry-doc"
spec.add_development_dependency "pry-rails"
spec.add_development_dependency "rubocop", "~> 0.36.0"
spec.add_development_dependency "phare", "~> 0.7.1"
spec.add_development_dependency "sqlite3"
end