diff --git a/.travis.yml b/.travis.yml index 3a420e33..3d1b6451 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,11 +38,15 @@ matrix: - 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.0-stable + - rvm: 2.4.10 + gemfile: Gemfile + - rvm: 2.4.10 gemfile: gemfiles/Gemfile.rails-6.0-stable - rvm: 2.4.10 gemfile: gemfiles/Gemfile.rails-4.1-stable - - rvm: 2.4.10 - gemfile: gemfiles/Gemfile.rails-6.0-stable - rvm: 2.5.8 gemfile: gemfiles/Gemfile.rails-4.1-stable - rvm: 2.6.6 diff --git a/Gemfile b/Gemfile index ce2e6ba0..8dac8515 100644 --- a/Gemfile +++ b/Gemfile @@ -4,9 +4,8 @@ source "https://rubygems.org" gemspec -gem "rails", "~> 5.2" -gem "omniauth", "~> 1.3" -gem "oauth2" +gem "rails", "~> 6.0.0" +gem "omniauth" gem "omniauth-oauth2" gem "rdoc" @@ -14,7 +13,7 @@ gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml" gem "rails-controller-testing" -gem "responders", "~> 2.4" +gem "responders", "~> 3.0" group :test do gem "omniauth-facebook" @@ -24,15 +23,15 @@ group :test do gem "mocha", "~> 1.1", require: false end -platforms :jruby do - gem "activerecord-jdbc-adapter" - gem "activerecord-jdbcsqlite3-adapter" - gem "jruby-openssl" +platforms :ruby do + gem "sqlite3", "~> 1.4" end -platforms :ruby do - gem "sqlite3", "~> 1.3.6" -end +# platforms :jruby do +# gem "activerecord-jdbc-adapter" +# gem "activerecord-jdbcsqlite3-adapter" +# gem "jruby-openssl" +# end # TODO: # group :mongoid do diff --git a/Gemfile.lock b/Gemfile.lock index 957127de..0aa695de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,48 +20,61 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (5.2.4.3) - actionpack (= 5.2.4.3) + actioncable (6.0.3.1) + actionpack (= 6.0.3.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.3) - actionpack (= 5.2.4.3) - actionview (= 5.2.4.3) - activejob (= 5.2.4.3) + actionmailbox (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + mail (>= 2.7.1) + actionmailer (6.0.3.1) + actionpack (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.3) - actionview (= 5.2.4.3) - activesupport (= 5.2.4.3) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.4.3) - activesupport (= 5.2.4.3) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.3.1) + actionpack (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + nokogiri (>= 1.8.5) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.4.3) - activesupport (= 5.2.4.3) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.1) + activesupport (= 6.0.3.1) globalid (>= 0.3.6) - activemodel (5.2.4.3) - activesupport (= 5.2.4.3) - activerecord (5.2.4.3) - activemodel (= 5.2.4.3) - activesupport (= 5.2.4.3) - arel (>= 9.0) - activestorage (5.2.4.3) - actionpack (= 5.2.4.3) - activerecord (= 5.2.4.3) + activemodel (6.0.3.1) + activesupport (= 6.0.3.1) + activerecord (6.0.3.1) + activemodel (= 6.0.3.1) + activesupport (= 6.0.3.1) + activestorage (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) marcel (~> 0.3.1) - activesupport (5.2.4.3) + activesupport (6.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - arel (9.0.0) + zeitwerk (~> 2.2, >= 2.2.2) bcrypt (3.1.13) builder (3.2.4) concurrent-ruby (1.1.6) @@ -118,18 +131,20 @@ GEM ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.3) - actioncable (= 5.2.4.3) - actionmailer (= 5.2.4.3) - actionpack (= 5.2.4.3) - actionview (= 5.2.4.3) - activejob (= 5.2.4.3) - activemodel (= 5.2.4.3) - activerecord (= 5.2.4.3) - activestorage (= 5.2.4.3) - activesupport (= 5.2.4.3) + rails (6.0.3.1) + actioncable (= 6.0.3.1) + actionmailbox (= 6.0.3.1) + actionmailer (= 6.0.3.1) + actionpack (= 6.0.3.1) + actiontext (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + activemodel (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) bundler (>= 1.3.0) - railties (= 5.2.4.3) + railties (= 6.0.3.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -140,17 +155,17 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.4.3) - actionpack (= 5.2.4.3) - activesupport (= 5.2.4.3) + railties (6.0.3.1) + actionpack (= 6.0.3.1) + activesupport (= 6.0.3.1) method_source rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + thor (>= 0.20.3, < 2.0) rake (13.0.1) rdoc (6.2.1) - responders (2.4.1) - actionpack (>= 4.2.0, < 6.0) - railties (>= 4.2.0, < 6.0) + responders (3.0.1) + actionpack (>= 5.0) + railties (>= 5.0) ruby-openid (2.9.2) sprockets (4.0.1) concurrent-ruby (~> 1.0) @@ -159,7 +174,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) + sqlite3 (1.4.2) thor (1.0.1) thread_safe (0.3.6) timecop (0.9.1) @@ -174,27 +189,24 @@ GEM websocket-driver (0.7.2) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) + zeitwerk (2.3.0) PLATFORMS ruby DEPENDENCIES activemodel-serializers-xml! - activerecord-jdbc-adapter - activerecord-jdbcsqlite3-adapter devise! - jruby-openssl mocha (~> 1.1) - oauth2 - omniauth (~> 1.3) + omniauth omniauth-facebook omniauth-oauth2 omniauth-openid - rails (~> 5.2) + rails (~> 6.0.0) rails-controller-testing rdoc - responders (~> 2.4) - sqlite3 (~> 1.3.6) + responders (~> 3.0) + sqlite3 (~> 1.4) timecop webrat (= 0.7.3)