Specify the version of jazzy to resolve the conflicts with xcpretty

carousell · Jul 1, 2017 · 967e897 · 967e897
1 parent 05f594a
commit 967e897
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,7 @@ install:
 script:
   - make -B test
   - make -B carthage
+  - make -B docs
   - bundle exec danger
 notifications:
   email: false

diff --git a/Gemfile b/Gemfile
@@ -2,6 +2,6 @@ source "https://rubygems.org"
 
 gem "cocoapods"
 gem "danger"
-gem "jazzy"
+gem "jazzy", "~> 0.8.0"
 gem "pry"
 gem "xcpretty"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,14 +2,14 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.5)
-    activesupport (4.2.8)
+    activesupport (4.2.9)
       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)
-    claide (1.0.1)
+    claide (1.0.2)
     claide-plugins (0.9.2)
       cork
       nap
@@ -51,7 +51,7 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (5.2.2)
+    danger (5.3.2)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -72,24 +72,25 @@ GEM
     gh_inspector (1.0.3)
     git (1.3.0)
     i18n (0.8.4)
-    jazzy (0.0.14)
-      activesupport (~> 4.1)
+    jazzy (0.8.2)
+      cocoapods (~> 1.0)
       mustache (~> 0.99)
-      nokogiri (~> 1.6)
+      open4
       redcarpet (~> 3.2)
+      rouge (~> 1.5)
       sass (~> 3.4)
-    kramdown (1.13.2)
+      sqlite3 (~> 1.3)
+      xcinvoke (~> 0.3.0)
+    kramdown (1.14.0)
+    liferaft (0.0.6)
     method_source (0.8.2)
-    mini_portile2 (2.1.0)
     minitest (5.10.2)
     molinillo (0.5.7)
     multipart-post (2.0.0)
     mustache (0.99.8)
     nanaimo (0.2.3)
     nap (1.1.0)
     netrc (0.7.8)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
@@ -99,36 +100,39 @@ GEM
       slop (~> 3.4)
     public_suffix (2.0.5)
     redcarpet (3.4.0)
-    rouge (2.0.7)
+    rouge (1.11.1)
     ruby-macho (1.1.0)
     sass (3.4.24)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     slop (3.6.0)
+    sqlite3 (1.3.13)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    unicode-display_width (1.2.1)
-    xcodeproj (1.4.4)
+    unicode-display_width (1.3.0)
+    xcinvoke (0.3.0)
+      liferaft (~> 0.0.6)
+    xcodeproj (1.5.0)
       CFPropertyList (~> 2.3.3)
-      claide (>= 1.0.1, < 2.0)
+      claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.2.3)
-    xcpretty (0.2.8)
-      rouge (~> 2.0.7)
+    xcpretty (0.2.6)
+      rouge (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   cocoapods
   danger
-  jazzy
+  jazzy (~> 0.8.0)
   pry
   xcpretty
 
 BUNDLED WITH
-   1.15.0
+   1.15.1