Skip to content

Commit

Permalink
Add Rails 6 support
Browse files Browse the repository at this point in the history
SQLite3 gem on ActiveRecord 6 needs to be higher than 1.3, this commit makes sure each Gemfile has its proper version
  • Loading branch information
klebervirgilio committed Dec 1, 2019
1 parent 5261990 commit b671472
Show file tree
Hide file tree
Showing 12 changed files with 227 additions and 36 deletions.
8 changes: 8 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
appraise "rails-4.2" do
gem "rails", "~> 4.2.0"
gem 'sqlite3', '~> 1.3.13'
end
appraise "rails-5.0" do
gem "rails", "~> 5.0.0"
gem 'sqlite3', '~> 1.3.13'
end
appraise "rails-5.1" do
gem "rails", "~> 5.1.0"
gem 'sqlite3', '~> 1.3.13'
end
appraise "rails-5.2" do
gem "rails", "~> 5.2.0"
gem 'sqlite3', '~> 1.3.13'
end
appraise "rails-6" do
gem "rails", "~> 6"
gem 'sqlite3', '~> 1.4'
end
8 changes: 4 additions & 4 deletions fc-vault-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "Rakefile", "README.md"]
s.test_files = Dir["spec/**/*"]

s.add_dependency "activerecord", [">= 4.2", "< 6.0"]
s.add_dependency "activerecord", ">= 4.2"
s.add_dependency "vault", "~> 0.7"

s.add_development_dependency "appraisal", "~> 2.1"
s.add_development_dependency "bundler"
s.add_development_dependency "rails", [">= 4.2", "< 6.0"]
s.add_development_dependency "rails", ">= 4.2"
s.add_development_dependency "byebug"
s.add_development_dependency "pry"
s.add_development_dependency "rake", "~> 10.0"
s.add_development_dependency "rake"
s.add_development_dependency "rspec", "~> 3.2"
s.add_development_dependency "sqlite3", "~> 1.3.6"
s.add_development_dependency "sqlite3", '~> 1.3'
end
1 change: 1 addition & 0 deletions gemfiles/rails_4.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
source "https://rubygems.org"

gem "rails", "~> 4.2.0"
gem "sqlite3", "~> 1.3.13"

gemspec path: "../"
14 changes: 6 additions & 8 deletions gemfiles/rails_4.2.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
fc-vault-rails (2.0.3)
activerecord (>= 4.2, < 6.0)
activerecord (>= 4.2)
vault (~> 0.7)

GEM
Expand Down Expand Up @@ -47,7 +47,7 @@ GEM
rake
thor (>= 0.14.0)
arel (6.0.4)
aws-eventstream (1.0.2)
aws-eventstream (1.0.3)
aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2)
builder (3.2.3)
Expand Down Expand Up @@ -128,9 +128,8 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
vault (0.12.0)
vault (0.13.0)
aws-sigv4
wwtd (1.3.0)

PLATFORMS
ruby
Expand All @@ -142,10 +141,9 @@ DEPENDENCIES
fc-vault-rails!
pry
rails (~> 4.2.0)
rake (~> 10.0)
rake
rspec (~> 3.2)
sqlite3 (~> 1.3.6)
wwtd
sqlite3 (~> 1.3.13)

BUNDLED WITH
1.17.2
1.17.3
1 change: 1 addition & 0 deletions gemfiles/rails_5.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
source "https://rubygems.org"

gem "rails", "~> 5.0.0"
gem "sqlite3", "~> 1.3.13"

gemspec path: "../"
14 changes: 6 additions & 8 deletions gemfiles/rails_5.0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
fc-vault-rails (2.0.3)
activerecord (>= 4.2, < 6.0)
activerecord (>= 4.2)
vault (~> 0.7)

GEM
Expand Down Expand Up @@ -50,7 +50,7 @@ GEM
rake
thor (>= 0.14.0)
arel (7.1.4)
aws-eventstream (1.0.2)
aws-eventstream (1.0.3)
aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2)
builder (3.2.3)
Expand Down Expand Up @@ -131,12 +131,11 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
vault (0.12.0)
vault (0.13.0)
aws-sigv4
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
wwtd (1.3.0)

PLATFORMS
ruby
Expand All @@ -148,10 +147,9 @@ DEPENDENCIES
fc-vault-rails!
pry
rails (~> 5.0.0)
rake (~> 10.0)
rake
rspec (~> 3.2)
sqlite3 (~> 1.3.6)
wwtd
sqlite3 (~> 1.3.13)

BUNDLED WITH
1.16.6
1.17.3
1 change: 1 addition & 0 deletions gemfiles/rails_5.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
source "https://rubygems.org"

gem "rails", "~> 5.1.0"
gem "sqlite3", "~> 1.3.13"

gemspec path: "../"
14 changes: 6 additions & 8 deletions gemfiles/rails_5.1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
fc-vault-rails (2.0.3)
activerecord (>= 4.2, < 6.0)
activerecord (>= 4.2)
vault (~> 0.7)

GEM
Expand Down Expand Up @@ -50,7 +50,7 @@ GEM
rake
thor (>= 0.14.0)
arel (8.0.0)
aws-eventstream (1.0.2)
aws-eventstream (1.0.3)
aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2)
builder (3.2.3)
Expand Down Expand Up @@ -131,12 +131,11 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
vault (0.12.0)
vault (0.13.0)
aws-sigv4
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
wwtd (1.3.0)

PLATFORMS
ruby
Expand All @@ -148,10 +147,9 @@ DEPENDENCIES
fc-vault-rails!
pry
rails (~> 5.1.0)
rake (~> 10.0)
rake
rspec (~> 3.2)
sqlite3 (~> 1.3.6)
wwtd
sqlite3 (~> 1.3.13)

BUNDLED WITH
1.16.6
1.17.3
1 change: 1 addition & 0 deletions gemfiles/rails_5.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
source "https://rubygems.org"

gem "rails", "~> 5.2.0"
gem "sqlite3", "~> 1.3.13"

gemspec path: "../"
14 changes: 6 additions & 8 deletions gemfiles/rails_5.2.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: ..
specs:
fc-vault-rails (2.0.3)
activerecord (>= 4.2, < 6.0)
activerecord (>= 4.2)
vault (~> 0.7)

GEM
Expand Down Expand Up @@ -54,7 +54,7 @@ GEM
rake
thor (>= 0.14.0)
arel (9.0.0)
aws-eventstream (1.0.2)
aws-eventstream (1.0.3)
aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2)
builder (3.2.3)
Expand Down Expand Up @@ -139,12 +139,11 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
vault (0.12.0)
vault (0.13.0)
aws-sigv4
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
wwtd (1.3.0)

PLATFORMS
ruby
Expand All @@ -156,10 +155,9 @@ DEPENDENCIES
fc-vault-rails!
pry
rails (~> 5.2.0)
rake (~> 10.0)
rake
rspec (~> 3.2)
sqlite3 (~> 1.3.6)
wwtd
sqlite3 (~> 1.3.13)

BUNDLED WITH
1.16.6
1.17.3
8 changes: 8 additions & 0 deletions gemfiles/rails_6.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "~> 6"
gem "sqlite3", "~> 1.4"

gemspec path: "../"
Loading

0 comments on commit b671472

Please sign in to comment.