From 046ec5e77094877b1afe7bae3b8c06e1ef011436 Mon Sep 17 00:00:00 2001 From: Andrey Sitnik Date: Mon, 16 Jul 2018 14:16:36 -0700 Subject: [PATCH] Reemove Sprockets 3 --- .travis.yml | 11 +---------- Gemfile | 10 +++++++++- sprockets3.gemfile | 9 --------- 3 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 sprockets3.gemfile diff --git a/.travis.yml b/.travis.yml index a346985..8b674e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,6 @@ rvm: git: depth: 5 cache: bundler -gemfile: - - sprockets3.gemfile - - sprockets4.gemfile before_install: - nvm install node env: @@ -21,10 +18,4 @@ matrix: env: "EXECJS_RUNTIME=Node" - rvm: "2.4" - gemfile: sprockets3.gemfile - - - rvm: "2.5" - gemfile: sprockets3.gemfile - - - env: "EXECJS_RUNTIME=Node" - gemfile: mini_racer.gemfile + env: "EXECJS_RUNTIME=Node" diff --git a/Gemfile b/Gemfile index ba25ee9..9da96ae 100644 --- a/Gemfile +++ b/Gemfile @@ -1 +1,9 @@ -eval_gemfile "#{ File.dirname(__FILE__) }/sprockets4.gemfile" +source 'https://rubygems.org' + +gemspec + +gem 'execjs' +gem 'rails', '>= 5.0.0.beta2' +gem 'sprockets', '>= 4.0.0.beta1' + +gem 'mini_racer' diff --git a/sprockets3.gemfile b/sprockets3.gemfile deleted file mode 100644 index ba6ecb0..0000000 --- a/sprockets3.gemfile +++ /dev/null @@ -1,9 +0,0 @@ -source 'https://rubygems.org' - -gemspec - -gem 'rails', '< 5' -gem 'sprockets', '>= 3.4.0', '< 4.0' -gem 'sprockets-rails' - -gem 'mini_racer'