From 9b44877691d4a2483369b260c691b2b591e1d0cd Mon Sep 17 00:00:00 2001
From: JP Simard <jp@jpsim.com>
Date: Fri, 27 Oct 2017 10:58:51 -0700
Subject: [PATCH] Update Ruby dependencies

---
 Gemfile      |  6 +++---
 Gemfile.lock | 44 +++++++++++++++++++++++++-------------------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9278ddd72..9ed00c9b9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gemspec
 
 group :development do
   # Code style
-  gem 'rubocop'
+  gem 'rubocop', '0.49.0'
 
   # Tests
   gem 'bacon'
@@ -14,9 +14,9 @@ group :development do
   gem 'webmock'
 
   # Integration tests
-  gem 'diffy'
   gem 'clintegracon', '0.7.0'
-  
+  gem 'diffy'
+
   # Code Review
   gem 'danger'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index b804eb896..68cd758f1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,13 +15,13 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.5)
-    activesupport (4.2.9)
+    activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     ast (2.3.0)
     bacon (1.2.0)
     claide (1.0.2)
@@ -67,11 +67,12 @@ GEM
     cocoapods-try (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
+    concurrent-ruby (1.0.5)
     cork (0.3.0)
       colored2 (~> 3.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    danger (5.2.2)
+    danger (5.5.3)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -80,11 +81,12 @@ GEM
       faraday-http-cache (~> 1.0)
       git (~> 1)
       kramdown (~> 1.5)
-      octokit (~> 4.2)
+      no_proxy_fix
+      octokit (~> 4.7)
       terminal-table (~> 1)
     diffy (3.2.0)
     escape (0.0.4)
-    faraday (0.12.1)
+    faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (1.3.1)
       faraday (~> 0.8)
@@ -93,13 +95,14 @@ GEM
     fuzzy_match (2.0.4)
     gh_inspector (1.0.3)
     git (1.3.0)
-    hashdiff (0.3.4)
-    i18n (0.8.6)
-    kramdown (1.13.2)
+    hashdiff (0.3.7)
+    i18n (0.9.0)
+      concurrent-ruby (~> 1.0)
+    kramdown (1.15.0)
     liferaft (0.0.6)
     metaclass (0.0.4)
     minitest (5.10.3)
-    mocha (1.2.1)
+    mocha (1.3.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.3)
       mocha (>= 0.13.0)
@@ -109,15 +112,17 @@ GEM
     nanaimo (0.2.3)
     nap (1.1.0)
     netrc (0.11.0)
+    no_proxy_fix (0.1.2)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
+    parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
     prettybacon (0.0.2)
       bacon (~> 1.2)
-    public_suffix (2.0.5)
+    public_suffix (3.0.0)
     rainbow (2.2.2)
       rake
     rake (10.5.0)
@@ -126,16 +131,17 @@ GEM
       ffi (>= 0.5.0, < 2)
     redcarpet (3.4.0)
     rouge (1.11.1)
-    rubocop (0.48.1)
+    rubocop (0.49.0)
+      parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-macho (1.1.0)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
     safe_yaml (1.0.4)
-    sass (3.5.1)
+    sass (3.5.3)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -147,16 +153,16 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    unicode-display_width (1.2.1)
-    webmock (3.0.1)
+    unicode-display_width (1.3.0)
+    webmock (3.1.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.5.2)
+    xcodeproj (1.5.3)
       CFPropertyList (~> 2.3.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
@@ -176,7 +182,7 @@ DEPENDENCIES
   mocha-on-bacon
   prettybacon
   rake (~> 10.3)
-  rubocop
+  rubocop (= 0.49.0)
   webmock
 
 BUNDLED WITH