From b671472b072a837223aa4ee37b1816852b91f34d Mon Sep 17 00:00:00 2001 From: Kleber Correia Date: Sun, 1 Dec 2019 20:25:24 +0000 Subject: [PATCH] Add Rails 6 support SQLite3 gem on ActiveRecord 6 needs to be higher than 1.3, this commit makes sure each Gemfile has its proper version --- Appraisals | 8 ++ fc-vault-rails.gemspec | 8 +- gemfiles/rails_4.2.gemfile | 1 + gemfiles/rails_4.2.gemfile.lock | 14 ++- gemfiles/rails_5.0.gemfile | 1 + gemfiles/rails_5.0.gemfile.lock | 14 ++- gemfiles/rails_5.1.gemfile | 1 + gemfiles/rails_5.1.gemfile.lock | 14 ++- gemfiles/rails_5.2.gemfile | 1 + gemfiles/rails_5.2.gemfile.lock | 14 ++- gemfiles/rails_6.gemfile | 8 ++ gemfiles/rails_6.gemfile.lock | 179 ++++++++++++++++++++++++++++++++ 12 files changed, 227 insertions(+), 36 deletions(-) create mode 100644 gemfiles/rails_6.gemfile create mode 100644 gemfiles/rails_6.gemfile.lock diff --git a/Appraisals b/Appraisals index e511c9ce..6b25703f 100644 --- a/Appraisals +++ b/Appraisals @@ -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 diff --git a/fc-vault-rails.gemspec b/fc-vault-rails.gemspec index 04aa31e7..95cca792 100644 --- a/fc-vault-rails.gemspec +++ b/fc-vault-rails.gemspec @@ -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 diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile index 6977eb02..07b883b7 100644 --- a/gemfiles/rails_4.2.gemfile +++ b/gemfiles/rails_4.2.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "rails", "~> 4.2.0" +gem "sqlite3", "~> 1.3.13" gemspec path: "../" diff --git a/gemfiles/rails_4.2.gemfile.lock b/gemfiles/rails_4.2.gemfile.lock index cdd289d3..58361d76 100644 --- a/gemfiles/rails_4.2.gemfile.lock +++ b/gemfiles/rails_4.2.gemfile.lock @@ -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 @@ -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) @@ -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 @@ -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 diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile index 10f52e7a..23d47f65 100644 --- a/gemfiles/rails_5.0.gemfile +++ b/gemfiles/rails_5.0.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "rails", "~> 5.0.0" +gem "sqlite3", "~> 1.3.13" gemspec path: "../" diff --git a/gemfiles/rails_5.0.gemfile.lock b/gemfiles/rails_5.0.gemfile.lock index 8015f982..83a3dff5 100644 --- a/gemfiles/rails_5.0.gemfile.lock +++ b/gemfiles/rails_5.0.gemfile.lock @@ -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 @@ -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) @@ -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 @@ -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 diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index 6100e830..226e6174 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "rails", "~> 5.1.0" +gem "sqlite3", "~> 1.3.13" gemspec path: "../" diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index c5438ecf..dfa6b316 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -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 @@ -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) @@ -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 @@ -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 diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index 5a706dcb..9c104738 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "rails", "~> 5.2.0" +gem "sqlite3", "~> 1.3.13" gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index 50e7eecf..bc96849f 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -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 @@ -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) @@ -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 @@ -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 diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile new file mode 100644 index 00000000..e6b9af96 --- /dev/null +++ b/gemfiles/rails_6.gemfile @@ -0,0 +1,8 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 6" +gem "sqlite3", "~> 1.4" + +gemspec path: "../" diff --git a/gemfiles/rails_6.gemfile.lock b/gemfiles/rails_6.gemfile.lock new file mode 100644 index 00000000..7d8ee873 --- /dev/null +++ b/gemfiles/rails_6.gemfile.lock @@ -0,0 +1,179 @@ +PATH + remote: .. + specs: + fc-vault-rails (2.0.3) + activerecord (>= 4.2) + vault (~> 0.7) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.1) + actionpack (= 6.0.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.1) + actionpack (= 6.0.1) + activejob (= 6.0.1) + activerecord (= 6.0.1) + activestorage (= 6.0.1) + activesupport (= 6.0.1) + mail (>= 2.7.1) + actionmailer (6.0.1) + actionpack (= 6.0.1) + actionview (= 6.0.1) + activejob (= 6.0.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.1) + actionview (= 6.0.1) + activesupport (= 6.0.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.1) + actionpack (= 6.0.1) + activerecord (= 6.0.1) + activestorage (= 6.0.1) + activesupport (= 6.0.1) + nokogiri (>= 1.8.5) + actionview (6.0.1) + activesupport (= 6.0.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.1) + activesupport (= 6.0.1) + globalid (>= 0.3.6) + activemodel (6.0.1) + activesupport (= 6.0.1) + activerecord (6.0.1) + activemodel (= 6.0.1) + activesupport (= 6.0.1) + activestorage (6.0.1) + actionpack (= 6.0.1) + activejob (= 6.0.1) + activerecord (= 6.0.1) + marcel (~> 0.3.1) + activesupport (6.0.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + aws-eventstream (1.0.3) + aws-sigv4 (1.1.0) + aws-eventstream (~> 1.0, >= 1.0.2) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.5) + diff-lcs (1.3) + erubi (1.9.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.7.0) + concurrent-ruby (~> 1.0) + loofah (2.4.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.13.0) + nio4r (2.5.2) + nokogiri (1.10.5) + mini_portile2 (~> 2.4.0) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.1) + actioncable (= 6.0.1) + actionmailbox (= 6.0.1) + actionmailer (= 6.0.1) + actionpack (= 6.0.1) + actiontext (= 6.0.1) + actionview (= 6.0.1) + activejob (= 6.0.1) + activemodel (= 6.0.1) + activerecord (= 6.0.1) + activestorage (= 6.0.1) + activesupport (= 6.0.1) + bundler (>= 1.3.0) + railties (= 6.0.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.1) + actionpack (= 6.0.1) + activesupport (= 6.0.1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.1) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.0) + rspec-support (~> 3.9.0) + rspec-expectations (3.9.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.0) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.4.1) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + vault (0.13.0) + aws-sigv4 + websocket-driver (0.7.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + zeitwerk (2.2.2) + +PLATFORMS + ruby + +DEPENDENCIES + appraisal (~> 2.1) + bundler + byebug + fc-vault-rails! + pry + rails (~> 6) + rake + rspec (~> 3.2) + sqlite3 (~> 1.4) + +BUNDLED WITH + 1.17.3