From 920d6885f9a6cf8d89d02bab7eaa248c2db625cc Mon Sep 17 00:00:00 2001 From: Mike Rogers Date: Wed, 19 Jun 2019 13:48:06 +0100 Subject: [PATCH] Adding back in version numbers requirements --- Appraisals | 10 +++++----- gemfiles/cancan.gemfile | 2 +- gemfiles/rails_5.0.gemfile | 2 +- gemfiles/rails_5.1.gemfile | 2 +- gemfiles/rails_5.2.gemfile | 2 +- gemfiles/rails_6.0.gemfile | 2 +- rails_admin.gemspec | 2 +- spec/dummy_app/Gemfile | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Appraisals b/Appraisals index a8a188be31..e5abbd38f1 100644 --- a/Appraisals +++ b/Appraisals @@ -1,6 +1,6 @@ appraise "rails-5.0" do gem 'rails', '~> 5.0.0' - gem 'sassc-rails' + gem 'sassc-rails', '~> 2.1' gem 'devise', '~> 4.0' group :test do @@ -33,7 +33,7 @@ end appraise "rails-5.1" do gem 'rails', '~> 5.1.0' - gem 'sassc-rails' + gem 'sassc-rails', '~> 2.1' gem 'devise', '~> 4.0' group :test do @@ -63,7 +63,7 @@ end appraise "rails-5.2" do gem 'rails', '~> 5.2.0' - gem 'sassc-rails' + gem 'sassc-rails', '~> 2.1' gem 'devise', '~> 4.4' group :test do @@ -94,7 +94,7 @@ end appraise "rails-6.0" do gem 'rails', '~> 6.0.0.rc1' gem 'haml', github: 'haml/haml' - gem 'sassc-rails' + gem 'sassc-rails', '~> 2.1' gem 'devise', '~> 4.4' group :test do @@ -110,7 +110,7 @@ end appraise "cancan" do gem 'rails', '~> 5.1.0' - gem 'sassc-rails' + gem 'sassc-rails', '~> 2.1' gem 'devise', '~> 4.0' group :test do diff --git a/gemfiles/cancan.gemfile b/gemfiles/cancan.gemfile index aa56b85770..6df8df4540 100644 --- a/gemfiles/cancan.gemfile +++ b/gemfiles/cancan.gemfile @@ -6,7 +6,7 @@ gem "appraisal", ">= 2.0" gem "rails", "~> 5.1.0" gem "haml" gem "devise", "~> 4.0" -gem "sass-rails", "~> 5.0" +gem "sassc-rails", "~> 2.1" group :active_record do gem "paper_trail" diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile index df082bca1f..9ac65ea20f 100644 --- a/gemfiles/rails_5.0.gemfile +++ b/gemfiles/rails_5.0.gemfile @@ -6,7 +6,7 @@ gem "appraisal", ">= 2.0" gem "rails", "~> 5.0.0" gem "haml" gem "devise", "~> 4.0" -gem "sassc-rails" +gem "sassc-rails", "~> 2.1" group :active_record do gem "paper_trail", ">= 5.0" diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index 316b9d06c0..cf97113add 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -6,7 +6,7 @@ gem "appraisal", ">= 2.0" gem "rails", "~> 5.1.0" gem "haml" gem "devise", "~> 4.0" -gem "sassc-rails" +gem "sassc-rails", "~> 2.1" group :active_record do gem "paper_trail", ">= 5.0" diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index 670bd558be..63f2e62d8d 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -6,7 +6,7 @@ gem "appraisal", ">= 2.0" gem "rails", "~> 5.2.0" gem "haml" gem "devise", "~> 4.4" -gem "sassc-rails" +gem "sassc-rails", "~> 2.1" group :active_record do gem "paper_trail", ">= 5.0" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index a78af48637..073e9cfca7 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -6,7 +6,7 @@ gem "appraisal", ">= 2.0" gem "rails", "~> 6.0.0.rc1" gem "haml", github: "haml/haml" gem "devise", "~> 4.4" -gem "sassc-rails" +gem "sassc-rails", "~> 2.1" group :active_record do gem "paper_trail", ">= 5.0" diff --git a/rails_admin.gemspec b/rails_admin.gemspec index 7f08fc7f9f..33e759c94f 100644 --- a/rails_admin.gemspec +++ b/rails_admin.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'rack-pjax', '>= 0.7' spec.add_dependency 'rails', ['>= 5.0', '< 7'] spec.add_dependency 'remotipart', '~> 1.3' - spec.add_dependency 'sassc-rails', ['>= 1.3', '< 2'] + spec.add_dependency 'sassc-rails', ['>= 1.3', '< 3'] spec.add_dependency 'activemodel-serializers-xml', '>= 1.0' spec.add_development_dependency 'bundler', '>= 1.0' spec.authors = ['Erik Michaels-Ober', 'Bogdan Gaza', 'Petteri Kaapa', 'Benoit Benezech', 'Mitsuhiro Shibuya'] diff --git a/spec/dummy_app/Gemfile b/spec/dummy_app/Gemfile index 309ec65450..a52e6a7064 100644 --- a/spec/dummy_app/Gemfile +++ b/spec/dummy_app/Gemfile @@ -49,7 +49,7 @@ end # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sassc-rails' + gem 'sassc-rails', '~> 2.1' gem 'coffee-rails', '~> 4.0' # See https://github.com/sstephenson/execjs#readme for more supported runtimes