diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index adfdac0..d436398 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,12 +10,14 @@ jobs: strategy: matrix: ruby_version: [2.4.6, 2.5.5, 2.6.3] - gemfile: [rails_5_0_sprockets_rails_2, rails_5_0, rails_5_1_sprockets_rails_2, rails_5_1, rails_5_2_sprockets_rails_2, rails_5_2, rails_6_0_sprockets_rails_2, rails_6_0] + gemfile: [rails_5_0_sprockets_rails_2, rails_5_0_sprockets_3, rails_5_0_sprockets_4, rails_5_1_sprockets_rails_2, rails_5_1_sprockets_3, rails_5_1_sprockets_4, rails_5_2_sprockets_rails_2, rails_5_2_sprockets_3, rails_5_2_sprockets_4, rails_6_0_sprockets_rails_2, rails_6_0_sprockets_3, rails_6_0_sprockets_4] exclude: - ruby_version: 2.4.6 gemfile: rails_6_0_sprockets_rails_2 - ruby_version: 2.4.6 - gemfile: rails_6_0 + gemfile: rails_6_0_sprockets_3 + - ruby_version: 2.4.6 + gemfile: rails_6_0_sprockets_4 fail-fast: false steps: diff --git a/Appraisals b/Appraisals index 16656c5..acfe2bc 100644 --- a/Appraisals +++ b/Appraisals @@ -3,8 +3,14 @@ appraise "rails-5-0-sprockets-rails-2" do gem "sprockets-rails", "~> 2.0" end -appraise "rails-5-0" do +appraise "rails-5-0-sprockets-3" do gem "rails", "~> 5.0.0" + gem "sprockets", "~> 3.0" +end + +appraise "rails-5-0-sprockets-4" do + gem "rails", "~> 5.0.0" + gem "sprockets", "~> 4.0.0.beta1" end appraise "rails-5-1-sprockets-rails-2" do @@ -12,8 +18,14 @@ appraise "rails-5-1-sprockets-rails-2" do gem "sprockets-rails", "~> 2.0" end -appraise "rails-5-1" do +appraise "rails-5-1-sprockets-3" do + gem "rails", "~> 5.1.0" + gem "sprockets", "~> 3.0" +end + +appraise "rails-5-1-sprockets-4" do gem "rails", "~> 5.1.0" + gem "sprockets", "~> 4.0.0.beta1" end appraise "rails-5-2-sprockets-rails-2" do @@ -21,8 +33,14 @@ appraise "rails-5-2-sprockets-rails-2" do gem "sprockets-rails", "~> 2.0" end -appraise "rails-5-2" do +appraise "rails-5-2-sprockets-3" do gem "rails", "~> 5.2.0" + gem "sprockets", "~> 3.0" +end + +appraise "rails-5-2-sprockets-4" do + gem "rails", "~> 5.2.0" + gem "sprockets", "~> 4.0.0.beta1" end appraise "rails-6-0-sprockets-rails-2" do @@ -30,6 +48,12 @@ appraise "rails-6-0-sprockets-rails-2" do gem "sprockets-rails", "~> 2.0" end -appraise "rails-6-0" do +appraise "rails-6-0-sprockets-3" do + gem "rails", "~> 6.0.0" + gem "sprockets", "~> 3.0" +end + +appraise "rails-6-0-sprockets-4" do gem "rails", "~> 6.0.0" + gem "sprockets", "~> 4.0.0.beta1" end diff --git a/gemfiles/rails_5_0.gemfile b/gemfiles/rails_5_0_sprockets_3.gemfile similarity index 81% rename from gemfiles/rails_5_0.gemfile rename to gemfiles/rails_5_0_sprockets_3.gemfile index 10f52e7..81cfdc5 100644 --- a/gemfiles/rails_5_0.gemfile +++ b/gemfiles/rails_5_0_sprockets_3.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "rails", "~> 5.0.0" +gem "sprockets", "~> 3.0" gemspec path: "../" diff --git a/gemfiles/rails_5_0_sprockets_4.gemfile b/gemfiles/rails_5_0_sprockets_4.gemfile new file mode 100644 index 0000000..a2bd5ac --- /dev/null +++ b/gemfiles/rails_5_0_sprockets_4.gemfile @@ -0,0 +1,8 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 5.0.0" +gem "sprockets", "~> 4.0.0.beta1" + +gemspec path: "../" diff --git a/gemfiles/rails_5_1.gemfile b/gemfiles/rails_5_1_sprockets_3.gemfile similarity index 81% rename from gemfiles/rails_5_1.gemfile rename to gemfiles/rails_5_1_sprockets_3.gemfile index 6100e83..c2ed00e 100644 --- a/gemfiles/rails_5_1.gemfile +++ b/gemfiles/rails_5_1_sprockets_3.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "rails", "~> 5.1.0" +gem "sprockets", "~> 3.0" gemspec path: "../" diff --git a/gemfiles/rails_5_1_sprockets_4.gemfile b/gemfiles/rails_5_1_sprockets_4.gemfile new file mode 100644 index 0000000..d1c3a3b --- /dev/null +++ b/gemfiles/rails_5_1_sprockets_4.gemfile @@ -0,0 +1,8 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 5.1.0" +gem "sprockets", "~> 4.0.0.beta1" + +gemspec path: "../" diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2_sprockets_3.gemfile similarity index 81% rename from gemfiles/rails_5_2.gemfile rename to gemfiles/rails_5_2_sprockets_3.gemfile index 5a706dc..d8ec964 100644 --- a/gemfiles/rails_5_2.gemfile +++ b/gemfiles/rails_5_2_sprockets_3.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "rails", "~> 5.2.0" +gem "sprockets", "~> 3.0" gemspec path: "../" diff --git a/gemfiles/rails_5_2_sprockets_4.gemfile b/gemfiles/rails_5_2_sprockets_4.gemfile new file mode 100644 index 0000000..e8c2463 --- /dev/null +++ b/gemfiles/rails_5_2_sprockets_4.gemfile @@ -0,0 +1,8 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 5.2.0" +gem "sprockets", "~> 4.0.0.beta1" + +gemspec path: "../" diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0_sprockets_3.gemfile similarity index 81% rename from gemfiles/rails_6_0.gemfile rename to gemfiles/rails_6_0_sprockets_3.gemfile index 15b9b27..bff40ec 100644 --- a/gemfiles/rails_6_0.gemfile +++ b/gemfiles/rails_6_0_sprockets_3.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "rails", "~> 6.0.0" +gem "sprockets", "~> 3.0" gemspec path: "../" diff --git a/gemfiles/rails_6_0_sprockets_4.gemfile b/gemfiles/rails_6_0_sprockets_4.gemfile new file mode 100644 index 0000000..4e945a1 --- /dev/null +++ b/gemfiles/rails_6_0_sprockets_4.gemfile @@ -0,0 +1,8 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 6.0.0" +gem "sprockets", "~> 4.0.0.beta1" + +gemspec path: "../" diff --git a/spritely.gemspec b/spritely.gemspec index c717593..fcfaafd 100644 --- a/spritely.gemspec +++ b/spritely.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_dependency 'chunky_png', '~> 1.3' s.add_dependency 'sass', '~> 3.3' - s.add_dependency 'sprockets', '~> 3.0' + s.add_dependency 'sprockets', '>= 3.0', '< 5' s.add_development_dependency 'activesupport' s.add_development_dependency 'pry-byebug'