diff --git a/.ruby-version b/.ruby-version index 8e8299dc..aedc15bb 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.4.2 +2.5.3 diff --git a/.travis.yml b/.travis.yml index 7161af67..e76f8581 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ language: ruby -rvm: 2.4.2 - services: - redis-server diff --git a/Gemfile b/Gemfile index 918d0887..2c728f11 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby '2.4.2' +ruby '2.5.3' gem 'travis-logger', git: 'https://github.com/travis-ci/travis-logger' gem 'travis-exceptions', git: 'https://github.com/travis-ci/travis-exceptions' @@ -20,9 +20,9 @@ gem 'jemalloc', git: 'https://github.com/joshk/jemalloc-rb' gem 'gh' gem 'aws-sdk' -gem 'actionmailer' +gem 'actionmailer', '>= 5.2.2.1' gem 'roadie' -gem 'roadie-rails', '~> 1.0' +gem 'roadie-rails', '~> 2.0' gem 'multi_json' gem 'faraday' diff --git a/Gemfile.lock b/Gemfile.lock index 45bd13f2..186053d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,29 +56,29 @@ GEM remote: https://rubygems.org/ specs: HDRHistogram (0.1.9) - actionmailer (5.2.1) - actionpack (= 5.2.1) - actionview (= 5.2.1) - activejob (= 5.2.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.1) - actionview (= 5.2.1) - activesupport (= 5.2.1) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.1) - activesupport (= 5.2.1) + actionview (5.2.3) + activesupport (= 5.2.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.1) - activesupport (= 5.2.1) + activejob (5.2.3) + activesupport (= 5.2.3) globalid (>= 0.3.6) - activesupport (5.2.1) + activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -683,7 +683,7 @@ GEM backports (3.11.4) builder (3.2.3) coderay (1.1.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) @@ -691,7 +691,7 @@ GEM css_parser (1.6.0) addressable diff-lcs (1.3) - erubi (1.7.1) + erubi (1.8.0) faraday (0.15.4) multipart-post (>= 1.2, < 3) faraday_middleware (0.12.2) @@ -707,7 +707,7 @@ GEM multi_json (~> 1.0) net-http-persistent (~> 2.9) net-http-pipeline - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) guard (2.14.2) formatador (>= 0.2.4) @@ -725,7 +725,7 @@ GEM rspec (>= 2.99.0, < 4.0) hashr (2.0.1) hitimes (1.3.0) - i18n (1.2.0) + i18n (1.6.0) concurrent-ruby (~> 1.0) jmespath (1.4.0) jwt (2.1.0) @@ -744,7 +744,7 @@ GEM metaclass (0.0.4) method_source (0.9.0) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) mocha (0.10.5) metaclass (~> 0.0.1) @@ -753,15 +753,15 @@ GEM nenv (0.3.0) net-http-persistent (2.9.4) net-http-pipeline (1.0.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.2) + mini_portile2 (~> 2.4.0) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) - rack (2.0.6) + rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) rails-dom-testing (2.0.3) @@ -769,13 +769,13 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (5.2.1) - actionpack (= 5.2.1) - activesupport (= 5.2.1) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (12.3.1) + rake (12.3.2) rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -785,8 +785,8 @@ GEM roadie (3.4.0) css_parser (~> 1.4) nokogiri (~> 1.5) - roadie-rails (1.3.0) - railties (>= 3.0, < 5.3) + roadie-rails (2.0.0) + railties (>= 5.1, < 5.3) roadie (~> 3.1) rspec (3.8.0) rspec-core (~> 3.8.0) @@ -824,7 +824,7 @@ PLATFORMS ruby DEPENDENCIES - actionmailer + actionmailer (>= 5.2.2.1) aws-sdk faraday faraday_middleware @@ -840,7 +840,7 @@ DEPENDENCIES multi_json redis-namespace roadie - roadie-rails (~> 1.0) + roadie-rails (~> 2.0) rspec (~> 3.8) sentry-raven sidekiq (~> 4.0.0) @@ -852,7 +852,7 @@ DEPENDENCIES webmock (~> 1.8.0) RUBY VERSION - ruby 2.4.2p198 + ruby 2.5.3p105 BUNDLED WITH - 1.17.1 + 1.17.3