about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorJean Boussier <jean.boussier@shopify.com>2020-09-04 14:34:37 +0200
committerEric Wong <bofh@yhbt.net>2020-09-06 09:22:40 +0000
commit06e904f1e8d8e554d8992fbb3de993dff45dec4c (patch)
treea33219529b436c1a95e77423f179764f6b9f28ff
parentebd6816e393ac9926f16f3a73034fc378492d71e (diff)
downloadunicorn-06e904f1e8d8e554d8992fbb3de993dff45dec4c.tar.gz
Ruby just recently bump the master version to 3.0.
This requirement bump is necessary to test unicorn
against ruby master.

[ew: wrap at <80 columns for hackers with poor eyesight]

Acked-by: Eric Wong <bofh@yhbt.net>
-rw-r--r--ext/unicorn_http/extconf.rb5
-rw-r--r--test/test_helper.rb5
-rw-r--r--unicorn.gemspec9
3 files changed, 15 insertions, 4 deletions
diff --git a/ext/unicorn_http/extconf.rb b/ext/unicorn_http/extconf.rb
index d5f81fb..95514bc 100644
--- a/ext/unicorn_http/extconf.rb
+++ b/ext/unicorn_http/extconf.rb
@@ -1,6 +1,11 @@
 # -*- encoding: binary -*-
 require 'mkmf'
 
+unless RUBY_VERSION < '3.1'
+  warn "Unicorn was only tested against MRI up to 3.0.\n" \
+       "It might not properly work with #{RUBY_VERSION}"
+end
+
 have_macro("SIZEOF_OFF_T", "ruby.h") or check_sizeof("off_t", "sys/types.h")
 have_macro("SIZEOF_SIZE_T", "ruby.h") or check_sizeof("size_t", "sys/types.h")
 have_macro("SIZEOF_LONG", "ruby.h") or check_sizeof("long", "sys/types.h")
diff --git a/test/test_helper.rb b/test/test_helper.rb
index e3c6ad4..974d2f2 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -34,6 +34,11 @@ if ENV['DEBUG']
   Debugger.start
 end
 
+unless RUBY_VERSION < '3.1'
+  warn "Unicorn was only tested against MRI up to 3.0.\n" \
+       "It might not properly work with #{RUBY_VERSION}"
+end
+
 def redirect_test_io
   orig_err = STDERR.dup
   orig_out = STDOUT.dup
diff --git a/unicorn.gemspec b/unicorn.gemspec
index cbe855d..e6af44d 100644
--- a/unicorn.gemspec
+++ b/unicorn.gemspec
@@ -25,10 +25,11 @@ Gem::Specification.new do |s|
   s.homepage = 'https://yhbt.net/unicorn/'
   s.test_files = test_files
 
-  # technically we need ">= 1.9.3", too, but avoid the array here since
-  # old rubygems versions (1.8.23.2 at least) do not support multiple
-  # version requirements here.
-  s.required_ruby_version = '< 3.0'
+  # 1.9.3 is the minumum supported version. We don't specify
+  # a maximum version to make it easier to test pre-releases,
+  # but we do warn users if they install unicorn on an untested
+  # version in extconf.rb
+  s.required_ruby_version = ">= 1.9.3"
 
   # We do not have a hard dependency on rack, it's possible to load
   # things which respond to #call.  HTTP status lines in responses