From a98ac6d4598f6f2e060f548250fab3f9316d9f27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sat, 18 Jan 2020 14:12:05 +0100 Subject: Drop support for ruby 2.3 and rubygems 2.5 --- .rubocop.yml | 5 +---- .travis.yml | 16 ---------------- bundler.gemspec | 4 ++-- doc/POLICIES.md | 2 +- lib/bundler/templates/newgem/newgem.gemspec.tt | 2 +- 5 files changed, 5 insertions(+), 24 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 604300a117..cbd80d0a93 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,7 +2,7 @@ require: rubocop-performance AllCops: DisabledByDefault: true - TargetRubyVersion: 2.3 + TargetRubyVersion: 2.4 Exclude: - tmp/**/* - lib/bundler/vendor/**/* @@ -447,9 +447,6 @@ Performance/EndWith: Performance/FixedSize: Enabled: true -Performance/RegexpMatch: - Enabled: true - Performance/ReverseEach: Enabled: true diff --git a/.travis.yml b/.travis.yml index 8fd329cf3c..9ea094f8c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,11 +14,6 @@ before_script: then travis_retry sudo apt-get install graphviz -y; fi - - if [ "$TRAVIS_RUBY_VERSION" = "2.3.8" ]; - then - sudo sed -i 's/1000::/1000:Travis:/g' /etc/passwd; - sudo sed -i '/secure_path/d' /etc/sudoers; - fi branches: only: @@ -61,13 +56,6 @@ jobs: - rvm: 2.6.5 script: bin/rake rubocop check_rvm_integration man:check stage: linting - # Ruby 2.3 also tested in 2.x mode - - rvm: 2.3.8 - env: RGV=master - stage: test - - rvm: 2.3.8 - env: RGV=v3.0.6 - stage: test # Ruby 2.5, Rubygems 2.7 - rvm: 2.5.7 env: RGV=v2.7.10 @@ -76,10 +64,6 @@ jobs: - rvm: 2.4.9 env: RGV=v2.6.14 stage: test - # Ruby 2.3, Rubygems 2.5 - - rvm: 2.3.8 - env: RGV=v2.5.2 - stage: test # Ruby-head (we want to know how we're doing, but not fail the build) - rvm: ruby-head env: RGV=master diff --git a/bundler.gemspec b/bundler.gemspec index 27a7f1ea2e..975c83ae0f 100644 --- a/bundler.gemspec +++ b/bundler.gemspec @@ -31,8 +31,8 @@ Gem::Specification.new do |s| } end - s.required_ruby_version = ">= 2.3.0" - s.required_rubygems_version = ">= 2.5.2" + s.required_ruby_version = ">= 2.4.0" + s.required_rubygems_version = ">= 2.6.14" s.files = Dir.glob("{lib,man,exe}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) } diff --git a/doc/POLICIES.md b/doc/POLICIES.md index 81a8a72f82..519fd94457 100644 --- a/doc/POLICIES.md +++ b/doc/POLICIES.md @@ -17,7 +17,7 @@ Bundler tries for perfect backwards compatibility. That means that if something Bundler will provide features and bugfixes to older versions on a schedule similar to Ruby itself. For example, when Bundler 4.x is the current version, Bundler 4 will be eligible for new features and bugfixes. Bundler 3 will be eligible for bugfixes only. Bundler 2 will be eligible for security bugfixes only. Bundler 1 will be unsupported. -Bundler 2 and above will support Ruby and RubyGems versions for the same amount of time as the Ruby core team supports them. As of February 2018, that means no support for Bundler running on Ruby 2.2, security fixes only for Bundler running on Ruby 2.3, and full support (including new features and bugfixes) for Bundler running on Ruby 2.4 and 2.5. Unsupported Ruby versions will be dropped in the first Bundler minor release after support ends. +Bundler 2 supports Ruby and RubyGems versions for the same amount of time as the Ruby core team supports them. As of February 2020, that means no support for Bundler running on Ruby 2.3, security fixes only for Bundler running on Ruby 2.4, and full support (including new features and bugfixes) for Bundler running on Ruby 2.5, 2.6 and 2.7. Unsupported Ruby versions will be dropped in the first Bundler minor release after support ends. These policies are not a guarantee that any particular fix will be backported. Instead, this is a way for us to set an upper limit on the versions of Ruby, RubyGems, and Bundler that we have to consider while making changes. Without the limit, the number of versions grows exponentially over time and quickly becomes overwhelming, which leads to maintainer burnout. We want to avoid that. diff --git a/lib/bundler/templates/newgem/newgem.gemspec.tt b/lib/bundler/templates/newgem/newgem.gemspec.tt index 7961ccf24c..9a67d45008 100644 --- a/lib/bundler/templates/newgem/newgem.gemspec.tt +++ b/lib/bundler/templates/newgem/newgem.gemspec.tt @@ -12,7 +12,7 @@ Gem::Specification.new do |spec| <%- if config[:mit] -%> spec.license = "MIT" <%- end -%> - spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0") + spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0") spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'" -- cgit v1.2.1