From 40c2f39fbb3fc56b66c14b0b222321f02beca52c Mon Sep 17 00:00:00 2001 From: Blake Watters Date: Wed, 1 Oct 2014 14:30:41 -0700 Subject: [PATCH] Update Ruby dependencies --- .ruby-version | 2 +- Gemfile | 6 ++--- Gemfile.lock | 65 +++++++++++++++++++++++++++++++-------------------- 3 files changed, 44 insertions(+), 29 deletions(-) diff --git a/.ruby-version b/.ruby-version index 7fa1d1e..eca07e4 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.0.0-p353 +2.1.2 diff --git a/Gemfile b/Gemfile index 233f301..0ed805f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' gem 'rake', '~> 10.1.0' -gem 'cocoapods', '~> 0.29.0' -gem 'xcpretty', '~> 0.1.3' -gem 'xctasks', '~> 0.1.0' +gem 'cocoapods', '~> 0.34.1' +gem 'xcpretty', '~> 0.1.6' +gem 'xctasks', '~> 0.4.1' diff --git a/Gemfile.lock b/Gemfile.lock index c0f32ae..f35eebc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,50 +1,65 @@ GEM remote: http://rubygems.org/ specs: - activesupport (3.2.17) + CFPropertyList (2.2.8) + activesupport (3.2.19) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - claide (0.4.0) - cocoapods (0.29.0) + claide (0.7.0) + cocoapods (0.34.1) activesupport (>= 3.2.15, < 4) - claide (~> 0.4.0) - cocoapods-core (= 0.29.0) - cocoapods-downloader (~> 0.3.0) - cocoapods-try-release-fix (~> 0.1.1) + claide (~> 0.7.0) + cocoapods-core (= 0.34.1) + cocoapods-downloader (~> 0.7.1) + cocoapods-plugins (~> 0.3.1) + cocoapods-trunk (~> 0.2.0) + cocoapods-try (~> 0.4.1) colored (~> 1.2) escape (~> 0.0.4) json_pure (~> 1.8) - nap (~> 0.5) + nap (~> 0.8) open4 (~> 1.3) - xcodeproj (~> 0.14.1) - cocoapods-core (0.29.0) - activesupport (>= 3.2.15, < 4) + xcodeproj (~> 0.19.2) + cocoapods-core (0.34.1) + activesupport (>= 3.2.15) fuzzy_match (~> 2.0.4) json_pure (~> 1.8) - nap (~> 0.5) - cocoapods-downloader (0.3.0) - cocoapods-try-release-fix (0.1.2) + nap (~> 0.8.0) + cocoapods-downloader (0.7.1) + cocoapods-plugins (0.3.1) + nap + cocoapods-trunk (0.2.0) + json_pure (~> 1.8) + nap (>= 0.8) + netrc + cocoapods-try (0.4.1) colored (1.2) escape (0.0.4) fuzzy_match (2.0.4) - i18n (0.6.9) + i18n (0.6.11) json_pure (1.8.1) - multi_json (1.9.0) - nap (0.6.0) - open4 (1.3.3) + mini_portile (0.6.0) + multi_json (1.10.1) + nap (0.8.0) + netrc (0.7.7) + nokogiri (1.6.3.1) + mini_portile (= 0.6.0) + open4 (1.3.4) rake (10.1.1) - xcodeproj (0.14.1) + xcodeproj (0.19.2) + CFPropertyList (~> 2.2) activesupport (~> 3.0) colored (~> 1.2) - rake - xcpretty (0.1.3) - xctasks (0.1.0) + xcpretty (0.1.7) + xctasks (0.4.1) + nokogiri (~> 1.6, >= 1.6.3.1) + rake (~> 10.0, >= 10.0.0) PLATFORMS ruby DEPENDENCIES - cocoapods (~> 0.29.0) + cocoapods (~> 0.34.1) rake (~> 10.1.0) - xcpretty (~> 0.1.3) - xctasks (~> 0.1.0) + xcpretty (~> 0.1.6) + xctasks (~> 0.4.1)