From d2ba80b5df7118383cbcfae934316310c6d81633 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Wed, 29 May 2019 17:58:18 -0700 Subject: Revert "Fix building with 1.8 BASERUBY" This reverts commit 05bc14d81a1d7f6af826a92371aeff0c3fb2a67e. We have decided that the cost of reintroducing support for 1.8 BASERUBY outweighs the benefit. If you are still using 1.8 and want to build master/trunk, build and install the latest release, and use that as BASERUBY. --- tool/generic_erb.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tool/generic_erb.rb') diff --git a/tool/generic_erb.rb b/tool/generic_erb.rb index 456a8e138b..3904b570c4 100644 --- a/tool/generic_erb.rb +++ b/tool/generic_erb.rb @@ -33,9 +33,8 @@ unchanged = color.pass("unchanged") updated = color.fail("updated") result = templates.map do |template| - method = ERB.instance_method(:initialize) - if method.respond_to?(:parameters) && method.parameters.assoc(:key) # Ruby 2.6+ - erb = ERB.new(File.read(template), :trim_mode => '%-') + if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ + erb = ERB.new(File.read(template), trim_mode: '%-') else erb = ERB.new(File.read(template), nil, '%-') end -- cgit v1.2.1