summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNARUSE, Yui <naruse@airemix.jp>2021-02-03 00:30:28 +0900
committerNARUSE, Yui <naruse@airemix.jp>2021-02-03 00:30:59 +0900
commit03c50eb0db82afc528f1eaf53b5fd55423449f04 (patch)
treeb6b9cf751b1dda0d57fd652f300a12a3db8300a2
parent852c112a3f6fe4211c5818c2584a1514f46b7d0b (diff)
merge revision(s) 598b7988f4f332c2d974bde6bc8be299150e2dce,4a06cb31170789f6fc0b1ce069bccab9d731c8bf: [Backport #17604]
Bundle RBS 1.0.4 (#4136) --- gems/bundled_gems | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Update TypeProf to 0.12.0 (#4132) --- gems/bundled_gems | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
-rw-r--r--gems/bundled_gems4
-rw-r--r--version.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/gems/bundled_gems b/gems/bundled_gems
index 22e846be9e..f8fe130552 100644
--- a/gems/bundled_gems
+++ b/gems/bundled_gems
@@ -5,5 +5,5 @@ rake 13.0.3 https://github.com/ruby/rake
test-unit 3.3.7 https://github.com/test-unit/test-unit 3.3.7
rexml 3.2.4 https://github.com/ruby/rexml
rss 0.2.9 https://github.com/ruby/rss 0.2.9
-rbs 1.0.0 https://github.com/ruby/rbs
-typeprof 0.11.0 https://github.com/ruby/typeprof \ No newline at end of file
+rbs 1.0.4 https://github.com/ruby/rbs
+typeprof 0.12.0 https://github.com/ruby/typeprof
diff --git a/version.h b/version.h
index e8dfcf6999..e40891fa06 100644
--- a/version.h
+++ b/version.h
@@ -12,11 +12,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 33
+#define RUBY_PATCHLEVEL 37
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_DAY 3
#include "ruby/version.h"