Skip to content

Commit 964b7be

Browse files
committed
1 parent 46fddd0 commit 964b7be

File tree

12 files changed

+624
-510
lines changed

12 files changed

+624
-510
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Performance:
4949

5050
Changes:
5151

52+
* The TruffleRuby `ScriptEngine` implementation is removed in favor of the generic [ScriptEngine](https://github.com/oracle/graal/blob/master/docs/reference-manual/embedding/embed-languages.md#compatibility-with-jsr-223-scriptengine) in GraalVM docs.
5253

5354
Memory Footprint:
5455

doc/user/jruby-migration.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ The standalone distribution does not allow for Java interoperability.
2121

2222
JRuby supports many different ways to embed Ruby in Java, including JSR 223 (also know as `javax.script`), the Bean Scripting Framework (BSF), JRuby Embed (also known as Red Bridge), and the JRuby direct embedding API.
2323

24-
Thes best way to embed TruffleRuby is to use the Polyglot API, which is part of GraalVM.
24+
The best way to embed TruffleRuby is to use the Polyglot API, which is part of GraalVM.
2525
The API is different because it is designed to support many languages, not just Ruby.
2626

2727
TruffleRuby also supports JSR 223, compatible with JRuby, to make it easier to run legacy JRuby code.
28+
See [this documentation](https://github.com/oracle/graal/blob/master/docs/reference-manual/embedding/embed-languages.md#compatibility-with-jsr-223-scriptengine) for how to use it.
2829

2930
You will need to use GraalVM to use both of these APIs.
3031

mx.truffleruby/mx_truffleruby.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,6 @@ def verify_ci(args):
273273
'truffleruby:JCODINGS',
274274
'truffleruby:JONI',
275275
],
276-
boot_jars=[
277-
'truffleruby:TRUFFLERUBY-SERVICES'
278-
],
279276
support_distributions=[
280277
'truffleruby:TRUFFLERUBY_GRAALVM_SUPPORT',
281278
'truffleruby:TRUFFLERUBY_GRAALVM_SUPPORT_NO_NI_RESOURCES',

mx.truffleruby/suite.py

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
"test/truffle/ecosystem/blog6",
129129
"test/truffle/ecosystem/hello-world",
130130
"test/truffle/ecosystem/rails-app",
131-
"test/truffle/offline",
132131
"tool/docker",
133132
"rubyspec_temp",
134133
]
@@ -327,7 +326,7 @@
327326
"requires": ["java.scripting"],
328327
"dependencies": [
329328
# Distributions
330-
"TRUFFLERUBY-SERVICES",
329+
"sdk:POLYGLOT",
331330
# Libraries
332331
"mx:JUNIT",
333332
],
@@ -475,25 +474,6 @@
475474
"maven": False,
476475
},
477476

478-
"TRUFFLERUBY-SERVICES": {
479-
"moduleInfo": {
480-
"name": "org.graalvm.ruby.services",
481-
"exports": [
482-
"org.truffleruby.services.scriptengine",
483-
],
484-
},
485-
"dependencies": [
486-
"org.truffleruby.services"
487-
],
488-
"distDependencies": [
489-
"sdk:GRAAL_SDK",
490-
],
491-
"description": "TruffleRuby services",
492-
"license": ["EPL-2.0"],
493-
"maven": False,
494-
"useModulePath": True,
495-
},
496-
497477
"TRUFFLERUBY": {
498478
"moduleInfo": {
499479
"name": "org.graalvm.ruby",
@@ -705,7 +685,7 @@
705685
"org.truffleruby.test.embedding",
706686
],
707687
"distDependencies": [
708-
"TRUFFLERUBY-SERVICES",
688+
"sdk:POLYGLOT",
709689
# runtime-only dependencies
710690
"TRUFFLERUBY",
711691
],

src/services/java/META-INF/services/javax.script.ScriptEngineFactory

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/services/java/org/truffleruby/services/scriptengine/TruffleRubyBindings.java

Lines changed: 0 additions & 83 deletions
This file was deleted.

src/services/java/org/truffleruby/services/scriptengine/TruffleRubyScriptEngine.java

Lines changed: 0 additions & 196 deletions
This file was deleted.

0 commit comments

Comments
 (0)