Merge f3fb03f into acafb18

CocoaPods · Mar 3, 2018 · 54d1cca · 54d1cca
2 parents acafb18 + f3fb03f
commit 54d1cca
Show file tree

Hide file tree

Showing 13 changed files with 245 additions and 148 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ gemspec
 group :development do
   gem 'bacon'
   gem 'mocha-on-bacon'
-  gem 'mocha', '~> 0.11.4'
+  gem 'mocha'
   gem 'prettybacon'
   gem 'coveralls', :require => false
   gem 'rubocop'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,101 +7,109 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7.1)
+    CFPropertyList (2.3.6)
+    activesupport (4.2.10)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ast (2.3.0)
+    ast (2.2.0)
+    atomos (0.1.2)
     bacon (1.2.0)
-    claide (1.0.1)
-    cocoapods (1.1.1)
+    claide (1.0.2)
+    cocoapods (1.4.0)
       activesupport (>= 4.0.2, < 5)
-      claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.1.1)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.2, < 2.0)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.4.0)
+      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-downloader (>= 1.1.3, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.1.1, < 2.0)
+      cocoapods-trunk (>= 1.3.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
-      colored (~> 1.2)
+      colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.1)
+      molinillo (~> 0.6.4)
       nap (~> 1.0)
-      xcodeproj (>= 1.3.3, < 2.0)
-    cocoapods-core (1.1.1)
-      activesupport (>= 4.0.2, < 5)
+      ruby-macho (~> 1.1)
+      xcodeproj (>= 1.5.4, < 2.0)
+    cocoapods-core (1.4.0)
+      activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.1)
-    cocoapods-downloader (1.1.2)
+    cocoapods-deintegrate (1.0.2)
+    cocoapods-downloader (1.1.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.1.1)
+    cocoapods-trunk (1.3.0)
       nap (>= 0.8, < 2.0)
-      netrc (= 0.7.8)
+      netrc (~> 0.11)
     cocoapods-try (1.1.0)
-    colored (1.2)
-    coveralls (0.8.14)
+    colored2 (3.1.2)
+    concurrent-ruby (1.0.5)
+    coveralls (0.8.21)
       json (>= 1.8, < 3)
-      simplecov (~> 0.12.0)
+      simplecov (~> 0.14.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (~> 1.6.0)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
     docile (1.1.5)
     escape (0.0.4)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.2)
-    i18n (0.7.0)
-    json (1.8.3)
+    gh_inspector (1.1.2)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (2.1.0)
     metaclass (0.0.4)
-    minitest (5.9.1)
-    mocha (0.11.4)
+    minitest (5.11.3)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
-    mocha-on-bacon (0.2.1)
-      mocha (>= 0.9.8)
-    molinillo (0.5.2)
+    mocha-on-bacon (0.2.3)
+      mocha (>= 0.13.0)
+    molinillo (0.6.4)
+    nanaimo (0.2.3)
     nap (1.1.0)
-    netrc (0.7.8)
-    parser (2.3.1.2)
+    netrc (0.11.0)
+    parser (2.3.0.6)
       ast (~> 2.2)
     powerpack (0.1.1)
     prettybacon (0.0.2)
       bacon (~> 1.2)
     rainbow (2.1.0)
-    rake (11.2.2)
-    rubocop (0.41.2)
-      parser (>= 2.3.1.1, < 3.0)
+    rake (10.5.0)
+    rubocop (0.37.2)
+      parser (>= 2.3.0.4, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    simplecov (0.12.0)
+      unicode-display_width (~> 0.3)
+    ruby-macho (1.1.0)
+    ruby-progressbar (1.7.5)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    term-ansicolor (1.3.2)
+    simplecov-html (0.10.2)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tins (1.6.0)
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tins (1.16.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.0)
-    xcodeproj (1.3.3)
-      activesupport (>= 3)
-      claide (>= 1.0.1, < 2.0)
-      colored (~> 1.2)
+    unicode-display_width (0.3.1)
+    xcodeproj (1.5.6)
+      CFPropertyList (~> 2.3.3)
+      atomos (~> 0.1.2)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.3)
 
 PLATFORMS
   ruby
@@ -111,11 +119,11 @@ DEPENDENCIES
   bundler (~> 1.3)
   cocoapods-packager!
   coveralls
-  mocha (~> 0.11.4)
+  mocha
   mocha-on-bacon
   prettybacon
   rake
   rubocop
 
 BUNDLED WITH
-   1.13.5
+   1.16.1