diff --git a/CMakeLists.txt b/CMakeLists.txt index 40b69d2..8fc7694 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ include(FeatureSummary) include(ExternalProject) ExternalProject_Add( mruby - URL https://github.com/mruby/mruby/archive/3.1.0.tar.gz - URL_HASH SHA512=b3699587689709b7411105ef468c28a6d89941dea356e6b3272b6ba1f69dc2d59e9c1ebc56c55208adc8b2ba878e21c8961ddd4603781748070fc78b6c2bbdb2 + URL https://github.com/mruby/mruby/archive/3.2.0.tar.gz + URL_HASH SHA512=bb46fa0eda6507cabe775e3f9cceec6da64d5a96c20e704e7ada94f5b4906989553c363cfd85789c4adcb030a6cfd36b8a99d8247f32687c913bbe06edb9bbca CONFIGURE_COMMAND "" BUILD_COMMAND diff --git a/README.md b/README.md index 9ecea04..80e8901 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ tool_that_emits_json | rj '.map { |item| { one: item.foo, two: item.bar.name } } for building: - CMake - Ruby 2.5 or later -- [whatever else mruby 3.1.0 needs][mruby_deps] :^) +- [whatever else mruby 3.2.0 needs][mruby_deps] :^) ## Building @@ -53,4 +53,4 @@ ruby ./test/rj_test.rb ./build/src/rj ``` -[mruby_deps]: https://github.com/mruby/mruby/blob/3.1.0/doc/guides/compile.md#prerequisites +[mruby_deps]: https://github.com/mruby/mruby/blob/3.2.0/doc/guides/compile.md#prerequisites diff --git a/mruby_config.rb b/mruby_config.rb index 0015a18..a72ffdd 100644 --- a/mruby_config.rb +++ b/mruby_config.rb @@ -26,7 +26,7 @@ # Hack to fix the preprocessor command in universal builds: class MRuby::Command::Compiler - # https://github.com/mruby/mruby/blob/3.1.0/lib/mruby/build/command.rb#L87-L100 + # https://github.com/mruby/mruby/blob/3.2.0/lib/mruby/build/command.rb#L83-L96 def run(outfile, infile, _defines=[], _include_paths=[], _flags=[]) mkdir_p File.dirname(outfile) flags = all_flags(_defines, _include_paths, _flags) diff --git a/test/fixtures/test_colours_ruby_symbols_and_other_classes_compact_stdout.txt b/test/fixtures/test_colours_ruby_symbols_and_other_classes_compact_stdout.txt index 6926df5..f02a886 100644 --- a/test/fixtures/test_colours_ruby_symbols_and_other_classes_compact_stdout.txt +++ b/test/fixtures/test_colours_ruby_symbols_and_other_classes_compact_stdout.txt @@ -1 +1 @@ -{:symbol=>true,"class"=>Class,:method=>##__debug_info>} +{:symbol=>true,"class"=>Class,:method=>#} diff --git a/test/fixtures/test_colours_ruby_symbols_and_other_classes_stdout.txt b/test/fixtures/test_colours_ruby_symbols_and_other_classes_stdout.txt index 2c7a9fb..c9020e3 100644 --- a/test/fixtures/test_colours_ruby_symbols_and_other_classes_stdout.txt +++ b/test/fixtures/test_colours_ruby_symbols_and_other_classes_stdout.txt @@ -1,5 +1,5 @@ { :symbol => true, "class" => Class, - :method => ##__debug_info> + :method => # } diff --git a/test/fixtures/test_internals_compact_debug_stdout.txt b/test/fixtures/test_internals_compact_debug_stdout.txt index ef86fb0..a6b1013 100644 --- a/test/fixtures/test_internals_compact_debug_stdout.txt +++ b/test/fixtures/test_internals_compact_debug_stdout.txt @@ -1 +1 @@ -{"colour":false,"compact":true,"debug":true,"output_format":"json","ruby":"mruby 3.1.0 (2022-05-12)"} +{"colour":false,"compact":true,"debug":true,"output_format":"json","ruby":"mruby 3.2.0 (2023-02-24)"} diff --git a/test/fixtures/test_internals_compact_stdout.txt b/test/fixtures/test_internals_compact_stdout.txt index fcf9ccf..4754798 100644 --- a/test/fixtures/test_internals_compact_stdout.txt +++ b/test/fixtures/test_internals_compact_stdout.txt @@ -1 +1 @@ -{"colour":false,"compact":true,"debug":false,"output_format":"json","ruby":"mruby 3.1.0 (2022-05-12)"} +{"colour":false,"compact":true,"debug":false,"output_format":"json","ruby":"mruby 3.2.0 (2023-02-24)"} diff --git a/test/fixtures/test_internals_debug_stdout.txt b/test/fixtures/test_internals_debug_stdout.txt index dfc0b47..6563df3 100644 --- a/test/fixtures/test_internals_debug_stdout.txt +++ b/test/fixtures/test_internals_debug_stdout.txt @@ -3,5 +3,5 @@ "compact": false, "debug": true, "output_format": "json", - "ruby": "mruby 3.1.0 (2022-05-12)" + "ruby": "mruby 3.2.0 (2023-02-24)" } diff --git a/test/fixtures/test_internals_noflags_stdout.txt b/test/fixtures/test_internals_noflags_stdout.txt index d59b280..e3137b2 100644 --- a/test/fixtures/test_internals_noflags_stdout.txt +++ b/test/fixtures/test_internals_noflags_stdout.txt @@ -3,5 +3,5 @@ "compact": false, "debug": false, "output_format": "json", - "ruby": "mruby 3.1.0 (2022-05-12)" + "ruby": "mruby 3.2.0 (2023-02-24)" } diff --git a/test/fixtures/test_options_version_stdout.txt b/test/fixtures/test_options_version_stdout.txt index 8387c0c..9c8f18a 100644 --- a/test/fixtures/test_options_version_stdout.txt +++ b/test/fixtures/test_options_version_stdout.txt @@ -1 +1 @@ -rj 0.4.0 (mruby 3.1.0) +rj 0.4.0 (mruby 3.2.0)