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 fluent/fluent-plugin-sql#77 Signed-off-by: Takuro Ashie <[email protected]>
fluent · Oct 29, 2019 · d3efac6 · d3efac6
1 parent d9533da
commit d3efac6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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"])