From fb17e2755f5f17041dddb059cd61a891646c3a68 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sat, 16 Jan 2021 16:57:45 -0300 Subject: [PATCH] Move Rails 6.1 to the main Gemfile instead of an extra one We have the gemfiles/* to test other versions of Rails, but keep the most recent one in the main Gemfile. --- .travis.yml | 11 -- Gemfile | 2 +- Gemfile.lock | 163 +++++++++--------- gemfiles/Gemfile.rails-6.1-stable | 26 --- gemfiles/Gemfile.rails-6.1-stable.lock | 224 ------------------------- 5 files changed, 87 insertions(+), 339 deletions(-) delete mode 100644 gemfiles/Gemfile.rails-6.1-stable delete mode 100644 gemfiles/Gemfile.rails-6.1-stable.lock diff --git a/.travis.yml b/.travis.yml index b3dcf1d7..3d1b6451 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ rvm: gemfile: - Gemfile - - gemfiles/Gemfile.rails-6.1-stable - gemfiles/Gemfile.rails-6.0-stable - gemfiles/Gemfile.rails-5.2-stable - gemfiles/Gemfile.rails-5.1-stable @@ -24,8 +23,6 @@ matrix: exclude: - rvm: 2.1.10 gemfile: Gemfile - - rvm: 2.1.10 - gemfile: gemfiles/Gemfile.rails-6.1-stable - rvm: 2.1.10 gemfile: gemfiles/Gemfile.rails-6.0-stable - rvm: 2.1.10 @@ -36,22 +33,16 @@ matrix: gemfile: gemfiles/Gemfile.rails-5.0-stable - rvm: 2.2.10 gemfile: Gemfile - - rvm: 2.2.10 - gemfile: gemfiles/Gemfile.rails-6.1-stable - rvm: 2.2.10 gemfile: gemfiles/Gemfile.rails-6.0-stable - rvm: 2.2.10 gemfile: gemfiles/Gemfile.rails-5.2-stable - rvm: 2.3.8 gemfile: Gemfile - - rvm: 2.3.8 - gemfile: gemfiles/Gemfile.rails-6.1-stable - rvm: 2.3.8 gemfile: gemfiles/Gemfile.rails-6.0-stable - rvm: 2.4.10 gemfile: Gemfile - - rvm: 2.4.10 - gemfile: gemfiles/Gemfile.rails-6.1-stable - rvm: 2.4.10 gemfile: gemfiles/Gemfile.rails-6.0-stable - rvm: 2.4.10 @@ -88,8 +79,6 @@ matrix: gemfile: gemfiles/Gemfile.rails-5.2-stable - env: DEVISE_ORM=mongoid gemfile: gemfiles/Gemfile.rails-6.0-stable - - env: DEVISE_ORM=mongoid - gemfile: gemfiles/Gemfile.rails-6.1-stable allow_failures: - rvm: ruby-head diff --git a/Gemfile b/Gemfile index 37dc67d9..f9112334 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" gemspec -gem "rails", "~> 6.0.0" +gem "rails", "~> 6.1.0" gem "omniauth" gem "omniauth-oauth2" gem "rdoc" diff --git a/Gemfile.lock b/Gemfile.lock index 6696760e..7d8c5f94 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,75 +29,82 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.0.3.3) - actionpack (= 6.0.3.3) + actioncable (6.1.1) + actionpack (= 6.1.1) + activesupport (= 6.1.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.3) - actionpack (= 6.0.3.3) - activejob (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionmailbox (6.1.1) + actionpack (= 6.1.1) + activejob (= 6.1.1) + activerecord (= 6.1.1) + activestorage (= 6.1.1) + activesupport (= 6.1.1) mail (>= 2.7.1) - actionmailer (6.0.3.3) - actionpack (= 6.0.3.3) - actionview (= 6.0.3.3) - activejob (= 6.0.3.3) + actionmailer (6.1.1) + actionpack (= 6.1.1) + actionview (= 6.1.1) + activejob (= 6.1.1) + activesupport (= 6.1.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.3) - actionview (= 6.0.3.3) - activesupport (= 6.0.3.3) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.1) + actionview (= 6.1.1) + activesupport (= 6.1.1) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.3) - actionpack (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + actiontext (6.1.1) + actionpack (= 6.1.1) + activerecord (= 6.1.1) + activestorage (= 6.1.1) + activesupport (= 6.1.1) nokogiri (>= 1.8.5) - actionview (6.0.3.3) - activesupport (= 6.0.3.3) + actionview (6.1.1) + activesupport (= 6.1.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.3) - activesupport (= 6.0.3.3) + activejob (6.1.1) + activesupport (= 6.1.1) globalid (>= 0.3.6) - activemodel (6.0.3.3) - activesupport (= 6.0.3.3) - activerecord (6.0.3.3) - activemodel (= 6.0.3.3) - activesupport (= 6.0.3.3) - activestorage (6.0.3.3) - actionpack (= 6.0.3.3) - activejob (= 6.0.3.3) - activerecord (= 6.0.3.3) + activemodel (6.1.1) + activesupport (= 6.1.1) + activerecord (6.1.1) + activemodel (= 6.1.1) + activesupport (= 6.1.1) + activestorage (6.1.1) + actionpack (= 6.1.1) + activejob (= 6.1.1) + activerecord (= 6.1.1) + activesupport (= 6.1.1) marcel (~> 0.3.1) - activesupport (6.0.3.3) + mimemagic (~> 0.3.2) + activesupport (6.1.1) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) bcrypt (3.1.16) builder (3.2.4) concurrent-ruby (1.1.7) crass (1.0.6) - erubi (1.9.0) - faraday (1.0.1) + erubi (1.10.0) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) + ruby2_keywords + faraday-net_http (1.0.1) globalid (0.4.2) activesupport (>= 4.2.0) hashie (4.1.0) - i18n (1.8.5) + i18n (1.8.7) concurrent-ruby (~> 1.0) jwt (2.2.2) - loofah (2.7.0) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -107,15 +114,16 @@ GEM method_source (1.0.0) mimemagic (0.3.5) mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.2) - mocha (1.11.2) + mini_portile2 (2.5.0) + minitest (5.14.3) + mocha (1.12.0) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) oauth2 (1.4.4) faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) @@ -125,53 +133,55 @@ GEM omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) - omniauth-facebook (7.0.0) + omniauth-facebook (8.0.0) omniauth-oauth2 (~> 1.2) - omniauth-oauth2 (1.7.0) + omniauth-oauth2 (1.7.1) oauth2 (~> 1.4) - omniauth (~> 1.9) + omniauth (>= 1.9, < 3) omniauth-openid (1.0.1) omniauth (~> 1.0) rack-openid (~> 1.3.1) orm_adapter (0.5.0) + racc (1.5.2) rack (2.2.3) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.3.3) - actioncable (= 6.0.3.3) - actionmailbox (= 6.0.3.3) - actionmailer (= 6.0.3.3) - actionpack (= 6.0.3.3) - actiontext (= 6.0.3.3) - actionview (= 6.0.3.3) - activejob (= 6.0.3.3) - activemodel (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) - bundler (>= 1.3.0) - railties (= 6.0.3.3) + rails (6.1.1) + actioncable (= 6.1.1) + actionmailbox (= 6.1.1) + actionmailer (= 6.1.1) + actionpack (= 6.1.1) + actiontext (= 6.1.1) + actionview (= 6.1.1) + activejob (= 6.1.1) + activemodel (= 6.1.1) + activerecord (= 6.1.1) + activestorage (= 6.1.1) + activesupport (= 6.1.1) + bundler (>= 1.15.0) + railties (= 6.1.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.3.3) - actionpack (= 6.0.3.3) - activesupport (= 6.0.3.3) + railties (6.1.1) + actionpack (= 6.1.1) + activesupport (= 6.1.1) method_source rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) - rake (13.0.1) - rdoc (6.2.1) + thor (~> 1.0) + rake (13.0.3) + rdoc (6.3.0) responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) ruby-openid (2.9.2) + ruby2_keywords (0.0.2) sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -181,10 +191,9 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.4.2) thor (1.0.1) - thread_safe (0.3.6) - timecop (0.9.1) - tzinfo (1.2.7) - thread_safe (~> 0.1) + timecop (0.9.2) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) warden (1.2.9) rack (>= 2.0.9) webrat (0.7.3) @@ -194,7 +203,7 @@ GEM websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.4.0) + zeitwerk (2.4.2) PLATFORMS ruby @@ -207,7 +216,7 @@ DEPENDENCIES omniauth-facebook omniauth-oauth2 omniauth-openid - rails (~> 6.0.0) + rails (~> 6.1.0) rails-controller-testing! rdoc responders (~> 3.0) diff --git a/gemfiles/Gemfile.rails-6.1-stable b/gemfiles/Gemfile.rails-6.1-stable deleted file mode 100644 index 00330580..00000000 --- a/gemfiles/Gemfile.rails-6.1-stable +++ /dev/null @@ -1,26 +0,0 @@ -source "https://rubygems.org" - -gemspec path: ".." - -gem "rails", '~> 6.1.0' -gem "omniauth" -gem "omniauth-oauth2" -gem "rdoc" - -gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml" - -gem "rails-controller-testing", github: "rails/rails-controller-testing" - -gem "responders", "~> 3.0" - -group :test do - gem "omniauth-facebook" - gem "omniauth-openid" - gem "timecop" - gem "webrat", "0.7.3", require: false - gem "mocha", "~> 1.1", require: false -end - -platforms :ruby do - gem "sqlite3", "~> 1.4" -end diff --git a/gemfiles/Gemfile.rails-6.1-stable.lock b/gemfiles/Gemfile.rails-6.1-stable.lock deleted file mode 100644 index f9131e1f..00000000 --- a/gemfiles/Gemfile.rails-6.1-stable.lock +++ /dev/null @@ -1,224 +0,0 @@ -GIT - remote: git://github.com/rails/activemodel-serializers-xml.git - revision: 694f4071c6b16e4c8597cc323c241b5f787b3ea8 - specs: - activemodel-serializers-xml (1.0.2) - activemodel (>= 5.0.0.a) - activesupport (>= 5.0.0.a) - builder (~> 3.1) - -GIT - remote: git://github.com/rails/rails-controller-testing.git - revision: 4b15c86e82ee380f2a7cc009e470368f7520560a - specs: - rails-controller-testing (1.0.5) - actionpack (>= 5.0.1.rc1) - actionview (>= 5.0.1.rc1) - activesupport (>= 5.0.1.rc1) - -PATH - remote: .. - specs: - devise (4.7.3) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0) - responders - warden (~> 1.2.3) - -GEM - remote: https://rubygems.org/ - specs: - actioncable (6.1.0) - actionpack (= 6.1.0) - activesupport (= 6.1.0) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (6.1.0) - actionpack (= 6.1.0) - activejob (= 6.1.0) - activerecord (= 6.1.0) - activestorage (= 6.1.0) - activesupport (= 6.1.0) - mail (>= 2.7.1) - actionmailer (6.1.0) - actionpack (= 6.1.0) - actionview (= 6.1.0) - activejob (= 6.1.0) - activesupport (= 6.1.0) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (6.1.0) - actionview (= 6.1.0) - activesupport (= 6.1.0) - rack (~> 2.0, >= 2.0.9) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.0) - actionpack (= 6.1.0) - activerecord (= 6.1.0) - activestorage (= 6.1.0) - activesupport (= 6.1.0) - nokogiri (>= 1.8.5) - actionview (6.1.0) - activesupport (= 6.1.0) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.0) - activesupport (= 6.1.0) - globalid (>= 0.3.6) - activemodel (6.1.0) - activesupport (= 6.1.0) - activerecord (6.1.0) - activemodel (= 6.1.0) - activesupport (= 6.1.0) - activestorage (6.1.0) - actionpack (= 6.1.0) - activejob (= 6.1.0) - activerecord (= 6.1.0) - activesupport (= 6.1.0) - marcel (~> 0.3.1) - mimemagic (~> 0.3.2) - activesupport (6.1.0) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - bcrypt (3.1.16) - builder (3.2.4) - concurrent-ruby (1.1.7) - crass (1.0.6) - erubi (1.10.0) - faraday (1.2.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords - globalid (0.4.2) - activesupport (>= 4.2.0) - hashie (4.1.0) - i18n (1.8.5) - concurrent-ruby (~> 1.0) - jwt (2.2.2) - loofah (2.8.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 (1.0.0) - mimemagic (0.3.5) - mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.2) - mocha (1.12.0) - multi_json (1.15.0) - multi_xml (0.6.0) - multipart-post (2.1.1) - nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - oauth2 (1.4.4) - faraday (>= 0.8, < 2.0) - jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (>= 1.2, < 3) - omniauth (1.9.1) - hashie (>= 3.4.6) - rack (>= 1.6.2, < 3) - omniauth-facebook (8.0.0) - omniauth-oauth2 (~> 1.2) - omniauth-oauth2 (1.7.0) - oauth2 (~> 1.4) - omniauth (~> 1.9) - omniauth-openid (1.0.1) - omniauth (~> 1.0) - rack-openid (~> 1.3.1) - orm_adapter (0.5.0) - rack (2.2.3) - rack-openid (1.3.1) - rack (>= 1.1.0) - ruby-openid (>= 2.1.8) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (6.1.0) - actioncable (= 6.1.0) - actionmailbox (= 6.1.0) - actionmailer (= 6.1.0) - actionpack (= 6.1.0) - actiontext (= 6.1.0) - actionview (= 6.1.0) - activejob (= 6.1.0) - activemodel (= 6.1.0) - activerecord (= 6.1.0) - activestorage (= 6.1.0) - activesupport (= 6.1.0) - bundler (>= 1.15.0) - railties (= 6.1.0) - 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.1.0) - actionpack (= 6.1.0) - activesupport (= 6.1.0) - method_source - rake (>= 0.8.7) - thor (~> 1.0) - rake (13.0.3) - rdoc (6.3.0) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) - ruby-openid (2.9.2) - ruby2_keywords (0.0.2) - sprockets (4.0.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - sqlite3 (1.4.2) - thor (1.0.1) - timecop (0.9.2) - tzinfo (2.0.4) - concurrent-ruby (~> 1.0) - warden (1.2.9) - rack (>= 2.0.9) - webrat (0.7.3) - nokogiri (>= 1.2.0) - rack (>= 1.0) - rack-test (>= 0.5.3) - websocket-driver (0.7.3) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - zeitwerk (2.4.2) - -PLATFORMS - ruby - -DEPENDENCIES - activemodel-serializers-xml! - devise! - mocha (~> 1.1) - omniauth - omniauth-facebook - omniauth-oauth2 - omniauth-openid - rails (~> 6.1.0) - rails-controller-testing! - rdoc - responders (~> 3.0) - sqlite3 (~> 1.4) - timecop - webrat (= 0.7.3) - -BUNDLED WITH - 1.17.3