From 2393d9035d5f90e05d9b6ec2513c9150b5bf15e2 Mon Sep 17 00:00:00 2001 From: Stanislav Katkov Date: Sun, 27 Sep 2020 14:14:16 +0300 Subject: [PATCH 1/2] Travis-ci: remove unsupported rubies and rails versions --- .travis.yml | 125 --------------------- gemfiles/Gemfile.rails-4.0.x | 7 -- gemfiles/Gemfile.rails-4.1.x | 8 -- gemfiles/Gemfile.rails-4.2.x | 8 -- gemfiles/Gemfile.rails-5.0.x | 8 -- gemfiles/Gemfile.rails-5.0.x.sprockets-4.x | 8 -- gemfiles/Gemfile.rails-5.1.x | 8 -- gemfiles/Gemfile.rails-5.1.x.sprockets-4.x | 8 -- 8 files changed, 180 deletions(-) delete mode 100644 gemfiles/Gemfile.rails-4.0.x delete mode 100644 gemfiles/Gemfile.rails-4.1.x delete mode 100644 gemfiles/Gemfile.rails-4.2.x delete mode 100644 gemfiles/Gemfile.rails-5.0.x delete mode 100644 gemfiles/Gemfile.rails-5.0.x.sprockets-4.x delete mode 100644 gemfiles/Gemfile.rails-5.1.x delete mode 100644 gemfiles/Gemfile.rails-5.1.x.sprockets-4.x diff --git a/.travis.yml b/.travis.yml index f0d8628d..3c27d8f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,142 +4,17 @@ cache: bundler before_install: gem install bundler -v '<2' rvm: - - 1.9.3 - - 2.0.0 - - 2.1.10 - - 2.2.10 - - 2.3.8 - - 2.4.10 - 2.5.8 - 2.6.6 - 2.7.1 gemfile: - Gemfile - - gemfiles/Gemfile.rails-4.0.x - - gemfiles/Gemfile.rails-4.1.x - - gemfiles/Gemfile.rails-4.2.x - - gemfiles/Gemfile.rails-5.0.x - - gemfiles/Gemfile.rails-5.0.x.sprockets-4.x - - gemfiles/Gemfile.rails-5.1.x - - gemfiles/Gemfile.rails-5.1.x.sprockets-4.x - gemfiles/Gemfile.rails-5.2.x - gemfiles/Gemfile.rails-5.2.x.sprockets-4.x - gemfiles/Gemfile.rails-6.0.x - gemfiles/Gemfile.rails-6.0.x.sprockets-4.x -matrix: - exclude: - - gemfile: gemfiles/Gemfile.rails-4.0.x - rvm: 2.4.10 - - gemfile: gemfiles/Gemfile.rails-4.1.x - rvm: 2.4.10 - - gemfile: gemfiles/Gemfile.rails-4.0.x - rvm: 2.5.8 - - gemfile: gemfiles/Gemfile.rails-4.1.x - rvm: 2.5.8 - - gemfile: gemfiles/Gemfile.rails-4.0.x - rvm: 2.6.6 - - gemfile: gemfiles/Gemfile.rails-4.1.x - rvm: 2.6.6 - - gemfile: gemfiles/Gemfile.rails-4.0.x - rvm: 2.7.1 - - gemfile: gemfiles/Gemfile.rails-4.1.x - rvm: 2.7.1 - - gemfile: gemfiles/Gemfile.rails-4.2.x - rvm: 2.7.1 - - gemfile: Gemfile - rvm: 1.9.3 - - gemfile: Gemfile - rvm: 2.0.0 - - gemfile: Gemfile - rvm: 2.1.10 - - gemfile: Gemfile - rvm: 2.2.10 - - gemfile: Gemfile - rvm: 2.3.8 - - gemfile: Gemfile - rvm: 2.4.10 - - gemfile: gemfiles/Gemfile.rails-5.0.x - rvm: 1.9.3 - - gemfile: gemfiles/Gemfile.rails-5.0.x - rvm: 2.0.0 - - gemfile: gemfiles/Gemfile.rails-5.0.x - rvm: 2.1.10 - - gemfile: gemfiles/Gemfile.rails-5.0.x.sprockets-4.x - rvm: 1.9.3 - - gemfile: gemfiles/Gemfile.rails-5.0.x.sprockets-4.x - rvm: 2.0.0 - - gemfile: gemfiles/Gemfile.rails-5.0.x.sprockets-4.x - rvm: 2.1.10 - - gemfile: gemfiles/Gemfile.rails-5.0.x.sprockets-4.x - rvm: 2.2.10 - - gemfile: gemfiles/Gemfile.rails-5.0.x.sprockets-4.x - rvm: 2.3.8 - - gemfile: gemfiles/Gemfile.rails-5.0.x.sprockets-4.x - rvm: 2.4.10 - - gemfile: gemfiles/Gemfile.rails-5.1.x - rvm: 1.9.3 - - gemfile: gemfiles/Gemfile.rails-5.1.x - rvm: 2.0.0 - - gemfile: gemfiles/Gemfile.rails-5.1.x - rvm: 2.1.10 - - gemfile: gemfiles/Gemfile.rails-5.1.x.sprockets-4.x - rvm: 1.9.3 - - gemfile: gemfiles/Gemfile.rails-5.1.x.sprockets-4.x - rvm: 2.0.0 - - gemfile: gemfiles/Gemfile.rails-5.1.x.sprockets-4.x - rvm: 2.1.10 - - gemfile: gemfiles/Gemfile.rails-5.1.x.sprockets-4.x - rvm: 2.2.10 - - gemfile: gemfiles/Gemfile.rails-5.1.x.sprockets-4.x - rvm: 2.3.8 - - gemfile: gemfiles/Gemfile.rails-5.1.x.sprockets-4.x - rvm: 2.4.10 - - gemfile: gemfiles/Gemfile.rails-5.2.x - rvm: 1.9.3 - - gemfile: gemfiles/Gemfile.rails-5.2.x - rvm: 2.0.0 - - gemfile: gemfiles/Gemfile.rails-5.2.x - rvm: 2.1.10 - - gemfile: gemfiles/Gemfile.rails-5.2.x - rvm: 2.2.10 - - gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x - rvm: 1.9.3 - - gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x - rvm: 2.0.0 - - gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x - rvm: 2.1.10 - - gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x - rvm: 2.2.10 - - gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x - rvm: 2.3.8 - - gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x - rvm: 2.4.10 - - gemfile: gemfiles/Gemfile.rails-6.0.x - rvm: 1.9.3 - - gemfile: gemfiles/Gemfile.rails-6.0.x - rvm: 2.0.0 - - gemfile: gemfiles/Gemfile.rails-6.0.x - rvm: 2.1.10 - - gemfile: gemfiles/Gemfile.rails-6.0.x - rvm: 2.2.10 - - gemfile: gemfiles/Gemfile.rails-6.0.x - rvm: 2.3.8 - - gemfile: gemfiles/Gemfile.rails-6.0.x - rvm: 2.4.10 - - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x - rvm: 1.9.3 - - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x - rvm: 2.0.0 - - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x - rvm: 2.1.10 - - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x - rvm: 2.2.10 - - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x - rvm: 2.3.8 - - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x - rvm: 2.4.10 notifications: email: false diff --git a/gemfiles/Gemfile.rails-4.0.x b/gemfiles/Gemfile.rails-4.0.x deleted file mode 100644 index 12fc5b72..00000000 --- a/gemfiles/Gemfile.rails-4.0.x +++ /dev/null @@ -1,7 +0,0 @@ -source 'https://rubygems.org' -gemspec :path => ".." - -gem "actionpack", "~> 4.0.0" -gem "railties", "~> 4.0.0" -gem "nokogiri", "< 1.7.0" if RUBY_VERSION < "2.1" -gem "sass", "< 3.5.0" if RUBY_VERSION < "2.0" diff --git a/gemfiles/Gemfile.rails-4.1.x b/gemfiles/Gemfile.rails-4.1.x deleted file mode 100644 index 9a287ee2..00000000 --- a/gemfiles/Gemfile.rails-4.1.x +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://rubygems.org' -gemspec :path => ".." - -gem "actionpack", "~> 4.1.0" -gem "minitest", "< 5.11.0" -gem "railties", "~> 4.1.0" -gem "nokogiri", "< 1.7.0" if RUBY_VERSION < "2.1" -gem "sass", "< 3.5.0" if RUBY_VERSION < "2.0" diff --git a/gemfiles/Gemfile.rails-4.2.x b/gemfiles/Gemfile.rails-4.2.x deleted file mode 100644 index 23e70617..00000000 --- a/gemfiles/Gemfile.rails-4.2.x +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://rubygems.org' -gemspec :path => ".." - -gem 'actionpack', '~> 4.2.0' -gem 'minitest', '< 5.11.0' -gem 'railties', '~> 4.2.0' -gem "nokogiri", "< 1.7.0" if RUBY_VERSION < "2.1" -gem "sass", "< 3.5.0" if RUBY_VERSION < "2.0" diff --git a/gemfiles/Gemfile.rails-5.0.x b/gemfiles/Gemfile.rails-5.0.x deleted file mode 100644 index b8910ddd..00000000 --- a/gemfiles/Gemfile.rails-5.0.x +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://rubygems.org' -git_source(:github) { |repo| "https://github.com/#{repo}.git" } -gemspec path: '..' - -gem 'actionpack', '~> 5.0.0' -gem 'minitest', '< 5.11.0' -gem 'railties', '~> 5.0.0' -gem 'sprockets', github: 'rails/sprockets', branch: '3.x' diff --git a/gemfiles/Gemfile.rails-5.0.x.sprockets-4.x b/gemfiles/Gemfile.rails-5.0.x.sprockets-4.x deleted file mode 100644 index 4caaa7d5..00000000 --- a/gemfiles/Gemfile.rails-5.0.x.sprockets-4.x +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://rubygems.org' -git_source(:github) { |repo| "https://github.com/#{repo}.git" } -gemspec path: '..' - -gem 'actionpack', '~> 5.0.0' -gem 'minitest', '< 5.11.0' -gem 'railties', '~> 5.0.0' -gem 'sprockets', github: 'rails/sprockets', branch: 'master' diff --git a/gemfiles/Gemfile.rails-5.1.x b/gemfiles/Gemfile.rails-5.1.x deleted file mode 100644 index ad189401..00000000 --- a/gemfiles/Gemfile.rails-5.1.x +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://rubygems.org' -git_source(:github) { |repo| "https://github.com/#{repo}.git" } -gemspec path: '..' - -gem 'actionpack', '~> 5.1.0' -gem 'minitest', '< 5.11.0' -gem 'railties', '~> 5.1.0' -gem 'sprockets', github: 'rails/sprockets', branch: '3.x' diff --git a/gemfiles/Gemfile.rails-5.1.x.sprockets-4.x b/gemfiles/Gemfile.rails-5.1.x.sprockets-4.x deleted file mode 100644 index 81aa501a..00000000 --- a/gemfiles/Gemfile.rails-5.1.x.sprockets-4.x +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://rubygems.org' -git_source(:github) { |repo| "https://github.com/#{repo}.git" } -gemspec path: '..' - -gem 'actionpack', '~> 5.1.0' -gem 'minitest', '< 5.11.0' -gem 'railties', '~> 5.1.0' -gem 'sprockets', github: 'rails/sprockets', branch: 'master' From 35ecc3f6c790149a1e3c407a0f4c1e1a64ef49c2 Mon Sep 17 00:00:00 2001 From: Stanislav Katkov Date: Wed, 7 Oct 2020 10:10:23 +0300 Subject: [PATCH 2/2] Update gemspec with minimum ruby/rails versions --- sprockets-rails.gemspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sprockets-rails.gemspec b/sprockets-rails.gemspec index 4cc9b265..5708166b 100644 --- a/sprockets-rails.gemspec +++ b/sprockets-rails.gemspec @@ -11,12 +11,12 @@ Gem::Specification.new do |s| s.files = Dir["README.md", "lib/**/*.rb", "MIT-LICENSE"] - s.required_ruby_version = '>= 1.9.3' + s.required_ruby_version = '>= 2.5' s.add_dependency "sprockets", ">= 3.0.0" - s.add_dependency "actionpack", ">= 4.0" - s.add_dependency "activesupport", ">= 4.0" - s.add_development_dependency "railties", ">= 4.0" + s.add_dependency "actionpack", ">= 5.2" + s.add_dependency "activesupport", ">= 5.2" + s.add_development_dependency "railties", ">= 5.2" s.add_development_dependency "rake" s.add_development_dependency "sass" s.add_development_dependency "uglifier"