From d3efac684ed1913191074027dcc6e1cdd1ee98bc Mon Sep 17 00:00:00 2001 From: Takuro Ashie Date: Mon, 28 Oct 2019 18:40:26 +0900 Subject: [PATCH] Accept tzinfo not only 2.x but also 1.x The pull request #2479 enforces using tzinfo ~> 2.0 but it conflicts with plugins which depend on activesupport such as fluent-plugin-sql since it requires tzinfo ~> 1.1. Until activesupport upgrades it, it would be better to accept also tzinfo 1.x to keep availability of such plugins. Fluentd can accept both versions of tzinfo since #2479 absorb the difference of their API. Fix #2634 See also https://github.com/fluent/fluent-plugin-sql/issues/77 Signed-off-by: Takuro Ashie --- fluentd.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fluentd.gemspec b/fluentd.gemspec index fd4f28d7ba..2263821ff2 100644 --- a/fluentd.gemspec +++ b/fluentd.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |gem| gem.add_runtime_dependency("serverengine", [">= 2.0.4", "< 3.0.0"]) gem.add_runtime_dependency("http_parser.rb", [">= 0.5.1", "< 0.7.0"]) gem.add_runtime_dependency("sigdump", ["~> 0.2.2"]) - gem.add_runtime_dependency("tzinfo", ["~> 2.0"]) + gem.add_runtime_dependency("tzinfo", [">= 1.0", "< 3.0"]) gem.add_runtime_dependency("tzinfo-data", ["~> 1.0"]) gem.add_runtime_dependency("strptime", [">= 0.2.2", "< 1.0.0"]) gem.add_runtime_dependency("dig_rb", ["~> 1.0.0"])