diff --git a/.github/workflows/rake.yml b/.github/workflows/rake.yml index 78574132..592e902c 100644 --- a/.github/workflows/rake.yml +++ b/.github/workflows/rake.yml @@ -69,7 +69,7 @@ jobs: id: cache with: path: lib/expressir/express/express_parser.* - key: v4-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles('ext/express-parser/extconf.rb', 'ext/express-parser/antlrgen/**', 'ext/express-parser/express_parser.cpp', '.git/modules/ext/express-parser/antlr4-upstream/HEAD') }} + key: v4-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('ext/express-parser/extconf.rb', 'ext/express-parser/antlrgen/**', 'ext/express-parser/express_parser.cpp', '.git/modules/ext/express-parser/antlr4-upstream/HEAD') }} - name: Build native extension if: steps.cache.outputs.cache-hit != 'true' diff --git a/expressir.gemspec b/expressir.gemspec index ab334701..75a78cb0 100644 --- a/expressir.gemspec +++ b/expressir.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |spec| spec.extensions = File.join(*%w(ext express-parser extconf.rb)) - spec.add_runtime_dependency "rice", "~> 4.0.3" + spec.add_runtime_dependency "rice", "~> 4.1" spec.add_runtime_dependency "thor", "~> 1.0" spec.add_development_dependency "antlr4-native", "~> 2.1.0" spec.add_development_dependency "asciidoctor", "~> 2.0.13" diff --git a/ext/express-parser/express_parser.cpp b/ext/express-parser/express_parser.cpp index 6ab66700..37104270 100644 --- a/ext/express-parser/express_parser.cpp +++ b/ext/express-parser/express_parser.cpp @@ -18136,7 +18136,7 @@ Object ContextProxy::wrapParseTree(tree::ParseTree* node) { class ParserProxyExt : public Object { public: - ParserProxyExt(Object self, string file) { + ParserProxyExt(string file) { ifstream stream; stream.open(file); input = new ANTLRInputStream(stream); @@ -18427,7 +18427,7 @@ void Init_express_parser() { .define_method("token_index", &TokenProxy::getTokenIndex); rb_cParserExt = define_class_under(rb_mExpressParser, "ParserExt") - .define_constructor(Constructor()) + .define_constructor(Constructor()) .define_method("syntax", &ParserProxyExt::syntax, Return().keepAlive()) .define_method("tokens", &ParserProxyExt::getTokens) .define_method("visit", &ParserProxyExt::visit, Return().keepAlive()); diff --git a/ext/express-parser/extconf.rb b/ext/express-parser/extconf.rb index 9dd22a47..301b8df7 100644 --- a/ext/express-parser/extconf.rb +++ b/ext/express-parser/extconf.rb @@ -41,8 +41,8 @@ # workaround for LoadError: 127: The specified procedure could not be found. $DLDFLAGS << " -static-libgcc -static-libstdc++" when /darwin/ - $CXXFLAGS << " -mmacosx-version-min=10.14 -fno-c++-static-destructors" - $DLDFLAGS << " -mmacosx-version-min=10.14" + $CXXFLAGS << " -mmacosx-version-min=10.15 -fno-c++-static-destructors" + $DLDFLAGS << " -mmacosx-version-min=10.15" end else require "mkmf-rice" diff --git a/lib/expressir/version.rb b/lib/expressir/version.rb index 223bde08..80589c5f 100644 --- a/lib/expressir/version.rb +++ b/lib/expressir/version.rb @@ -1,3 +1,3 @@ module Expressir - VERSION = "1.2.10".freeze + VERSION = "1.2.11".freeze end diff --git a/rakelib/antlr4-native.rake b/rakelib/antlr4-native.rake index f84168d2..3139ea27 100644 --- a/rakelib/antlr4-native.rake +++ b/rakelib/antlr4-native.rake @@ -48,7 +48,7 @@ def create_pp_class_definition(parser_source_lines) class ParserProxyExt : public Object { public: - ParserProxyExt(Object self, string file) { + ParserProxyExt(string file) { ifstream stream; stream.open(file); input = new ANTLRInputStream(stream); @@ -115,7 +115,7 @@ def create_class_api(parser_source_lines) .define_method("token_index", &TokenProxy::getTokenIndex); rb_cParserExt = define_class_under(rb_mExpressParser, "ParserExt") - .define_constructor(Constructor()) + .define_constructor(Constructor()) .define_method("syntax", &ParserProxyExt::syntax, Return().keepAlive()) .define_method("tokens", &ParserProxyExt::getTokens) .define_method("visit", &ParserProxyExt::visit, Return().keepAlive());