Skip to content

Commit 8fca842

Browse files
authored
Add JRuby 9.4 and prefer to use it rather than 9.2. (#16)
* Add JRuby 9.4 and prefer to use it rather than 9.2. * Bump ruby-build version.
1 parent 37cf590 commit 8fca842

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ ruby_runtime(
3131
register_toolchains("@ruby3//:toolchain")
3232

3333
# Register a versioned ruby with its default name.
34-
ruby_runtime("jruby-9.2")
34+
ruby_runtime("jruby-9.4")
3535

36-
register_toolchains("@jruby-9.2//:toolchain")
36+
register_toolchains("@jruby-9.4//:toolchain")
3737

3838
local_repository(
3939
name = "rules_ruby_ruby_tests_testdata_another_workspace",

bin/test-suite

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ test.workspace() {
183183
bazel ${BAZEL_OPTS} test ${BAZEL_BUILD_OPTS} ${BAZEL_TEST_OPTS} -- //... ; echo; echo
184184
bazel ${BAZEL_OPTS} build ${BAZEL_BUILD_OPTS} --@rules_ruby//ruby/runtime:version=ruby-3.0 -- //... ; echo; echo
185185
bazel ${BAZEL_OPTS} test ${BAZEL_BUILD_OPTS} --@rules_ruby//ruby/runtime:version=ruby-3.0 ${BAZEL_TEST_OPTS} -- //... ; echo; echo
186-
bazel ${BAZEL_OPTS} build ${BAZEL_BUILD_OPTS} --@rules_ruby//ruby/runtime:version=jruby-9.2 -- //... ; echo; echo
187-
bazel ${BAZEL_OPTS} test ${BAZEL_BUILD_OPTS} --@rules_ruby//ruby/runtime:version=jruby-9.2 ${BAZEL_TEST_OPTS} -- //... ; echo; echo
186+
bazel ${BAZEL_OPTS} build ${BAZEL_BUILD_OPTS} --@rules_ruby//ruby/runtime:version=jruby-9.4 -- //... ; echo; echo
187+
bazel ${BAZEL_OPTS} test ${BAZEL_BUILD_OPTS} --@rules_ruby//ruby/runtime:version=jruby-9.4 ${BAZEL_TEST_OPTS} -- //... ; echo; echo
188188
"
189189
}
190190

ruby/private/constants.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ SUPPORTED_VERSIONS = [
177177
"ruby-3.1.0",
178178
"ruby-3.1.1",
179179
"jruby-9.2.21.0", # Corresponded to 2.5.8
180-
"jruby-9.3.6.0", # Corresponds to 2.6.8
180+
"jruby-9.3.10.0", # Corresponds to 2.6.8
181+
"jruby-9.4.3.0", # Corresponds to 3.1.4
181182
]
182183

183184
def get_supported_version(version):

ruby/private/sdk.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def register_ruby_runtime(name, version = None):
2525
2626
Args:
2727
name: the name of the generated Bazel repository
28-
version: a version identifier (e.g. system, ruby-2.5, jruby-9.2)
28+
version: a version identifier (e.g. system, ruby-2.5, jruby-9.4)
2929
"""
3030
if not version:
3131
version = name

ruby/private/toolchains/ruby_runtime.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ def ruby_bundle(**kwargs):
134134

135135
def _install_ruby_version(ctx, version):
136136
ctx.download_and_extract(
137-
url = "https://github.com/rbenv/ruby-build/archive/refs/tags/v20220825.tar.gz",
138-
sha256 = "55d9363a27486e4ec9623985d7764c5cf8e59cafe58afcf666e81fa148dea2f0",
139-
stripPrefix = "ruby-build-20220825",
137+
url = "https://github.com/rbenv/ruby-build/archive/refs/tags/v20230710.tar.gz",
138+
sha256 = "8c9cf458d461a9b6b63d44e4b5b246304168f665fd47adea1733ab6a7cd0f077",
139+
stripPrefix = "ruby-build-20230710",
140140
)
141141

142142
install_path = "./build"

0 commit comments

Comments
 (0)