chore(deps): more dependency updates + travis tweaks

Jylth · Jul 11, 2016 · 851f4d1 · 851f4d1
1 parent fde6f98
commit 851f4d1
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 48 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ cache: bundler
 sudo: false
 
 rvm:
-  - 1.9.3
   - 2.1
 
 env:
@@ -20,4 +19,4 @@ before_script:
   - psql -c 'create database devise_token_auth_test' -U postgres
 
 addons:
-  postgresql: "9.3"
+  postgresql: "9.4"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -15,21 +15,20 @@ GIT
 
 GIT
   remote: git://github.com/mkdynamic/omniauth-facebook.git
-  revision: f20e906b52b0a8849569f1391f01771fb628f6d7
+  revision: 8afbe04ae8a2f1b2db0f382efeecbb91575d1ba5
   specs:
-    omniauth-facebook (2.1.0)
+    omniauth-facebook (4.0.0.rc1)
       omniauth-oauth2 (~> 1.2)
 
 GIT
   remote: git://github.com/zquestz/omniauth-google-oauth2.git
-  revision: ad0b8ae200a94c86566975dc4d1c2fc28eeb2e24
+  revision: 1cd603bb29499f56379aefcd6b34663ef105e165
   specs:
-    omniauth-google-oauth2 (0.2.8)
-      addressable (~> 2.3)
-      jwt (~> 1.0)
+    omniauth-google-oauth2 (0.4.1)
+      jwt (~> 1.5.2)
       multi_json (~> 1.3)
       omniauth (>= 1.1.1)
-      omniauth-oauth2 (>= 1.1.1)
+      omniauth-oauth2 (>= 1.3.1)
 
 PATH
   remote: .
@@ -79,14 +78,14 @@ GEM
     addressable (2.4.0)
     ansi (1.5.0)
     arel (6.0.3)
-    attr_encrypted (1.3.5)
-      encryptor (~> 1.3.0)
+    attr_encrypted (3.0.1)
+      encryptor (~> 3.0.0)
     bcrypt (3.1.11)
     builder (3.2.2)
-    codeclimate-test-reporter (0.4.8)
+    codeclimate-test-reporter (0.6.0)
       simplecov (>= 0.7.1, < 1.0.0)
-    coderay (1.1.0)
-    colorize (0.7.7)
+    coderay (1.1.1)
+    colorize (0.8.1)
     concurrent-ruby (1.0.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -97,47 +96,48 @@ GEM
       responders
       warden (~> 1.2.3)
     docile (1.1.5)
-    encryptor (1.3.0)
+    encryptor (3.0.0)
     erubis (2.7.0)
-    faker (1.6.1)
+    faker (1.6.5)
       i18n (~> 0.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.10)
+    ffi (1.9.13)
     formatador (0.2.5)
     fuzz_ball (0.9.1)
-    github_api (0.13.1)
+    github_api (0.14.3)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
       hashie (>= 3.4)
-      multi_json (>= 1.7.5, < 2.0)
-      oauth2
-    github_changelog_generator (1.10.1)
+      oauth2 (~> 1.0.0)
+    github_changelog_generator (1.13.0)
       colorize (~> 0.7)
       github_api (~> 0.12)
+      rake (>= 10.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
-    guard (2.13.0)
+    guard (2.14.0)
       formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
+      listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-minitest (2.4.4)
+    guard-minitest (2.4.5)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    hashie (3.4.3)
+    hashie (3.4.4)
     i18n (0.7.0)
     json (1.8.3)
-    jwt (1.5.2)
-    listen (3.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
+    jwt (1.5.4)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.10)
@@ -148,28 +148,29 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
     minitest-focus (1.1.2)
       minitest (>= 4, < 6)
-    minitest-rails (2.2.0)
+    minitest-rails (2.2.1)
       minitest (~> 5.7)
       railties (~> 4.1)
-    minitest-reporters (1.1.7)
+    minitest-reporters (1.1.10)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql2 (0.4.2)
-    nenv (0.2.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    notiffany (0.0.8)
+    mysql2 (0.4.4)
+    nenv (0.3.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    notiffany (0.1.0)
       nenv (~> 0.1)
       shellany (~> 0.0)
     oauth2 (1.0.0)
@@ -178,15 +179,16 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    omniauth (1.2.2)
+    omniauth (1.3.1)
       hashie (>= 1.2, < 4)
-      rack (~> 1.0)
-    omniauth-oauth2 (1.3.1)
+      rack (>= 1.0, < 3)
+    omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
     orm_adapter (0.5.0)
     pg (0.18.4)
-    pry (0.10.3)
+    pkg-config (1.1.7)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -221,17 +223,18 @@ GEM
       activesupport (= 4.2.5.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
+    rake (11.2.2)
     rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     responders (2.2.0)
       railties (>= 4.2.0, < 5.1)
-    ruby-progressbar (1.7.5)
+    ruby-progressbar (1.8.1)
+    ruby_dep (1.3.1)
     shellany (0.0.1)
-    simplecov (0.11.1)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)