diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java index 4d41e46cb4..60735d9f7d 100644 --- a/android/src/mindustry/android/AndroidLauncher.java +++ b/android/src/mindustry/android/AndroidLauncher.java @@ -69,7 +69,7 @@ public class AndroidLauncher extends AndroidApplication{ } @Override - public org.mozilla.javascript.Context getScriptContext(){ + public rhino.Context getScriptContext(){ return AndroidRhinoContext.enter(getContext().getCacheDir()); } diff --git a/android/src/mindustry/android/AndroidRhinoContext.java b/android/src/mindustry/android/AndroidRhinoContext.java index bd6c144478..513911820d 100644 --- a/android/src/mindustry/android/AndroidRhinoContext.java +++ b/android/src/mindustry/android/AndroidRhinoContext.java @@ -13,7 +13,7 @@ import com.android.dx.dex.cf.*; import com.android.dx.dex.file.DexFile; import com.android.dx.merge.*; import dalvik.system.*; -import org.mozilla.javascript.*; +import rhino.*; import java.io.*; import java.nio.*; diff --git a/build.gradle b/build.gradle index 361366e59a..6f2468faae 100644 --- a/build.gradle +++ b/build.gradle @@ -36,6 +36,7 @@ allprojects{ if(!project.hasProperty("versionType")) versionType = 'official' appName = 'Mindustry' steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256' + rhinoVersion = '66ffaf9ba089cc4e6b83cd7a9a397488cd15bf87' loadVersionProps = { return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p } @@ -274,7 +275,7 @@ project(":core"){ api arcModule("extensions:g3d") api arcModule("extensions:fx") api arcModule("extensions:arcnet") - api "org.mozilla:rhino-runtime:1.7.12" + api "com.github.Anuken:rhino:$rhinoVersion" if(localArc() && debugged()) api arcModule("extensions:recorder") compileOnly project(":annotations") diff --git a/core/src/mindustry/core/Platform.java b/core/src/mindustry/core/Platform.java index 1ba3a6aabc..767bfa993d 100644 --- a/core/src/mindustry/core/Platform.java +++ b/core/src/mindustry/core/Platform.java @@ -14,7 +14,7 @@ import mindustry.net.*; import mindustry.net.Net.*; import mindustry.type.*; import mindustry.ui.dialogs.*; -import org.mozilla.javascript.*; +import rhino.*; import static mindustry.Vars.*; diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index 02e70ffb42..43b84a21e4 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -8,9 +8,9 @@ import arc.util.*; import arc.util.Log.*; import mindustry.*; import mindustry.mod.Mods.*; -import org.mozilla.javascript.*; -import org.mozilla.javascript.commonjs.module.*; -import org.mozilla.javascript.commonjs.module.provider.*; +import rhino.*; +import rhino.module.*; +import rhino.module.provider.*; import java.io.*; import java.net.*; diff --git a/gradle.properties b/gradle.properties index 7bc0ba9049..f67fc440d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=7e8a3792e5182a6ef77dd07622fcaed634b72b61 +archash=99e945e135cb2209780c45c4ef19318e135b1977