diff --git a/.rubocop.yml b/.rubocop.yml index ca4bdf59..cfa17fa7 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,6 +1,6 @@ AllCops: DisabledByDefault: true - TargetRubyVersion: 2.2 + TargetRubyVersion: 2.5 DisplayCopNames: true StyleGuideCopsOnly: false Exclude: diff --git a/.travis.yml b/.travis.yml index 53302eab..db493449 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,7 @@ before_install: r_eng="$(ruby -e 'STDOUT.write RUBY_ENGINE')"; rv="$(ruby -e 'STDOUT.write RUBY_VERSION')"; if [ "$r_eng" == "ruby" ]; then - if [ "$rv" \< "2.3" ]; then gem update --system 2.7.9 --no-document - elif [ "$rv" \< "2.6" ]; then gem update --system --no-document --conservative + if [ "$rv" \< "2.6" ]; then gem update --system --no-document --conservative fi fi if [ "$TRAVIS_OS_NAME" == "osx" ]; then @@ -25,9 +24,6 @@ script: - bundle exec rake rvm: - - 2.2.10 - - 2.3.8 - - 2.4.6 - 2.5.5 - 2.6.3 - ruby-head @@ -37,9 +33,6 @@ matrix: include: - rvm: ruby-head env: RUBYOPT="--jit" - - rvm: 2.4.6 - os: osx - osx_image: xcode10.2 - rvm: 2.5.5 os: osx osx_image: xcode10.2 diff --git a/History.md b/History.md index b71b4cd0..0914868a 100644 --- a/History.md +++ b/History.md @@ -9,6 +9,7 @@ * Add option to suppress SignalException on SIGTERM (#1690) * Allow mutual TLS CA to be set using `ssl_bind` DSL (#1689) * Reactor now uses nio4r instead of `select` (#1728) + * Minimum Ruby version now >= 2.5 (#1813) * x bugfixes * Do not accept new requests on shutdown (#1685, #1808) * Fix 3 corner cases when request body is chunked (#1508) diff --git a/puma.gemspec b/puma.gemspec index b11ffec0..49b1ae3c 100644 --- a/puma.gemspec +++ b/puma.gemspec @@ -17,5 +17,8 @@ Gem::Specification.new do |s| %w[History.md LICENSE README.md] s.homepage = "http://puma.io" s.license = "BSD-3-Clause" - s.required_ruby_version = Gem::Requirement.new(">= 2.2") + + # We will guarantee to support the last 2 major releases, + # and may choose to support further back as we see fit. + s.required_ruby_version = Gem::Requirement.new(">= 2.5") end