Second set of upgrades, CI fixes. (#978)

openfarmcc · Mar 1, 2019 · 4194e4b · 4194e4b
1 parent ff0aae8
commit 4194e4b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,9 @@ language: ruby
 # If you don't specify a version, Travis CI will use MRI 1.9.3 as the default.
 # http://docs.travis-ci.com/user/languages/ruby/
 rvm:
-  - 2.5.1
+  - 2.6.1
 services:
-- mongodb
-- elasticsearch
+  - mongodb
+  - elasticsearch
 
 sudo: false
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -65,14 +65,14 @@ GEM
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.11.0)
-      aws-sdk-core (~> 3, >= 3.26.0)
+    aws-sdk-kms (1.13.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
     aws-sdk-rails (2.1.0)
       aws-sdk-ses (~> 1)
       railties (>= 3)
-    aws-sdk-s3 (1.24.0)
-      aws-sdk-core (~> 3, >= 3.26.0)
+    aws-sdk-s3 (1.30.1)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
     aws-sdk-ses (1.14.0)
@@ -129,12 +129,12 @@ GEM
       sass-rails (< 5.1)
       sprockets (< 4.0)
     concurrent-ruby (1.1.4)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
+    coveralls (0.8.22)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
@@ -160,8 +160,6 @@ GEM
       warden (~> 1.2.3)
     diff-lcs (1.3)
     docile (1.3.1)
-    domain_name (0.5.20180417)
-      unf (>= 0.0.5, < 1.0.0)
     easy_diff (1.0.0)
     elasticsearch (6.1.0)
       elasticsearch-api (= 6.1.0)
@@ -212,8 +210,6 @@ GEM
       moneta
       multi_json (>= 1.9.2)
     high_voltage (3.1.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
     httparty (0.16.4)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -301,7 +297,6 @@ GEM
     mutations (0.8.3)
       activesupport
     nested_form (0.3.2)
-    netrc (0.11.0)
     ng-rails-csrf (0.1.0)
     nio4r (2.3.1)
     nokogiri (1.10.1)
@@ -419,10 +414,6 @@ GEM
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
-    rest-client (2.0.2)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
     rollbar (2.19.2)
       multi_json
     rspec-core (3.8.0)
@@ -487,17 +478,14 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (0.20.3)
+    thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.9)
     tins (1.20.2)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.19)
+    uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.5)
     utf8-cleaner (0.2.5)
       activesupport
     vcr (4.0.0)