Merge pull request #1256 from TeamNewPipe/dependabot/gradle/org.mozilla-rhino-1.8.0

Bump org.mozilla:rhino from 1.7.15 to 1.8.0

Author: litetex

extractor/build.gradle

@@ -22,14 +22,19 @@ checkstyleTest {
     enabled false // do not checkstyle test files
 }
 
+ext {
+    rhinoVersion = '1.8.0'
+}
+
 dependencies {
     implementation project(':timeago-parser')
 
     implementation "com.github.TeamNewPipe:nanojson:$nanojsonVersion"
     implementation 'org.jsoup:jsoup:1.18.3'
     implementation "com.google.code.findbugs:jsr305:$jsr305Version"
 
-    implementation 'org.mozilla:rhino:1.7.15'
+    implementation "org.mozilla:rhino:$rhinoVersion"
+    implementation "org.mozilla:rhino-engine:$rhinoVersion"
 
     checkstyle "com.puppycrawl.tools:checkstyle:$checkstyleVersion"
 

extractor/src/main/java/org/schabi/newpipe/extractor/utils/JavaScript.java

@@ -10,31 +10,25 @@ private JavaScript() {
     }
 
     public static void compileOrThrow(final String function) {
-        try {
-            final Context context = Context.enter();
-            context.setOptimizationLevel(-1);
+        try (Context context = Context.enter()) {
+            context.setInterpretedMode(true);
 
             // If it doesn't compile it throws an exception here
             context.compileString(function, null, 1, null);
-        } finally {
-            Context.exit();
         }
     }
 
     public static String run(final String function,
                              final String functionName,
                              final String... parameters) {
-        try {
-            final Context context = Context.enter();
-            context.setOptimizationLevel(-1);
+        try (Context context = Context.enter()) {
+            context.setInterpretedMode(true);
             final ScriptableObject scope = context.initSafeStandardObjects();
 
             context.evaluateString(scope, function, functionName, 1, null);
             final Function jsFunction = (Function) scope.get(functionName, scope);
             final Object result = jsFunction.call(context, scope, scope, parameters);
             return result.toString();
-        } finally {
-            Context.exit();
         }
     }