From ca0b6d0d416776655ed7516ac18f126fbde5315a Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Wed, 3 Aug 2016 10:14:26 -0400 Subject: [PATCH] Don't require C dependencies on Windows/JRuby --- Gemfile | 4 ++-- Gemfile.lock | 37 ------------------------------------- 2 files changed, 2 insertions(+), 39 deletions(-) diff --git a/Gemfile b/Gemfile index 7b0b442aa4..e39b7d9ffe 100644 --- a/Gemfile +++ b/Gemfile @@ -72,8 +72,8 @@ group :cable do # Lock to 1.1.1 until the fix for https://github.com/faye/faye/issues/394 is released gem 'faye', '1.1.1', require: false - gem 'blade', require: false - gem 'blade-sauce_labs_plugin', require: false + gem 'blade', require: false, platforms: [:ruby] + gem 'blade-sauce_labs_plugin', require: false, platforms: [:ruby] end # Add your own local bundler stuff. diff --git a/Gemfile.lock b/Gemfile.lock index cf8bb0fec9..602ea5d66a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -120,30 +120,10 @@ GEM bcrypt (3.1.11-x86-mingw32) beaneater (1.0.0) benchmark-ips (2.6.1) - blade (0.5.6) - activesupport (>= 3.0.0) - blade-qunit_adapter (~> 1.20.0) - coffee-script - coffee-script-source - curses (~> 1.0.0) - eventmachine - faye - sprockets (>= 3.0) - sprockets-export (~> 0.9.1) - thin (>= 1.6.0) - thor (~> 0.19.1) - useragent (~> 0.16.7) - blade-qunit_adapter (1.20.0) - blade-sauce_labs_plugin (0.5.2) - childprocess - faraday - selenium-webdriver builder (3.2.2) bunny (2.2.2) amq-protocol (>= 2.0.1) byebug (8.2.5) - childprocess (0.5.9) - ffi (~> 1.0, >= 1.0.11) coffee-rails (4.2.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.2.x) @@ -154,8 +134,6 @@ GEM concurrent-ruby (1.0.2) connection_pool (2.2.0) cookiejar (0.3.0) - curses (1.0.2) - daemons (1.2.3) dalli (2.7.6) dante (0.2.0) em-hiredis (0.3.1) @@ -174,8 +152,6 @@ GEM eventmachine (1.2.0.1-x64-mingw32) eventmachine (1.2.0.1-x86-mingw32) execjs (2.7.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) faye (1.1.1) cookiejar (>= 0.3.0) em-http-request (>= 0.3.0) @@ -221,7 +197,6 @@ GEM metaclass (~> 0.0.1) mono_logger (1.1.0) multi_json (1.12.1) - multipart-post (2.0.0) mustache (1.0.3) mysql2 (0.4.4) mysql2 (0.4.4-x64-mingw32) @@ -273,7 +248,6 @@ GEM redis (~> 3.0) resque (~> 1.25) rufus-scheduler (~> 3.2) - rubyzip (1.2.0) rufus-scheduler (3.2.1) sass-rails (5.0.5) railties (>= 4.0.0, < 6) @@ -284,10 +258,6 @@ GEM sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - selenium-webdriver (2.53.0) - childprocess (~> 0.5) - rubyzip (~> 1.0) - websocket (~> 1.0) sequel (4.34.0) serverengine (1.5.11) sigdump (~> 0.2.2) @@ -307,7 +277,6 @@ GEM sprockets (3.6.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-export (0.9.1) sprockets-rails (3.1.1) actionpack (>= 4.0) activesupport (>= 4.0) @@ -318,10 +287,6 @@ GEM stackprof (0.2.9) sucker_punch (2.0.2) concurrent-ruby (~> 1.0.0) - thin (1.7.0) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) thor (0.19.1) thread (0.1.7) thread_safe (0.3.5) @@ -335,14 +300,12 @@ GEM tzinfo (>= 1.0.0) uglifier (3.0.0) execjs (>= 0.3.0, < 3) - useragent (0.16.7) vegas (0.1.11) rack (>= 1.0.0) w3c_validators (1.2) json nokogiri wdm (0.1.1) - websocket (1.2.3) websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2)