Skip to content

Commit

Permalink
update mruby to 3.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nilsding committed May 18, 2023
1 parent 7e8cfe7 commit 0fb106c
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
2 changes: 1 addition & 1 deletion mruby_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{:symbol=>true,"class"=>Class,:method=>#<Method: #<Class:Rj>#__debug_info>}
{:symbol=>true,"class"=>Class,:method=>#<Method: Rj.__debug_info>}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
:symbol => true,
"class" => Class,
:method => #<Method: #<Class:Rj>#__debug_info>
:method => #<Method: Rj.__debug_info>
}
2 changes: 1 addition & 1 deletion test/fixtures/test_internals_compact_debug_stdout.txt
Original file line number Diff line number Diff line change
@@ -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)"}
2 changes: 1 addition & 1 deletion test/fixtures/test_internals_compact_stdout.txt
Original file line number Diff line number Diff line change
@@ -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)"}
2 changes: 1 addition & 1 deletion test/fixtures/test_internals_debug_stdout.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
}
2 changes: 1 addition & 1 deletion test/fixtures/test_internals_noflags_stdout.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
}
2 changes: 1 addition & 1 deletion test/fixtures/test_options_version_stdout.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rj 0.4.0 (mruby 3.1.0)
rj 0.4.0 (mruby 3.2.0)

0 comments on commit 0fb106c

Please sign in to comment.