diff --git a/.changelog/lang_ar.json b/.changelog/lang_ar.json index 07338ffa..648f2137 100644 --- a/.changelog/lang_ar.json +++ b/.changelog/lang_ar.json @@ -154,7 +154,7 @@ "تحسين README.md لتوثيق أفضل لعملية بناء وتشغيل المشروع _[`issue #344`](http://issues.autojs6.com/344)_" ], "dependency": [ - "تمت إضافة إصدار Eclipse Paho Client Mqttv3 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", + "تمت إضافة إصدار Eclipse Paho Client Mqtt V3 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", "ترقية إصدار Android SDK من 34 إلى 35", "ترقية Gradle من 8.12 إلى 8.14-rc-1", "ترقية Rhino من 1.8.0-SNAPSHOT إلى 1.8.1-SNAPSHOT", @@ -299,7 +299,7 @@ "إضافة EasyWindow (لـ Toaster) نسخة 10.3", "ترقية إصدار Gradle من 8.5 إلى 8.11.1", "ترقية النسخة Rhino 1.7.15 إلى 1.8.0-SNAPSHOT", - "ترقية النسخة Android Material Lang3 1.10.0 إلى 1.12.0", + "ترقية النسخة Android Material 1.10.0 إلى 1.12.0", "ترقية النسخة Androidx Annotation 1.7.0 إلى 1.9.1", "ترقية النسخة Androidx AppCompat 1.6.1 إلى 1.7.0", "ترقية النسخة Androidx WebKit 1.8.0 إلى 1.12.1", diff --git a/.changelog/lang_en.json b/.changelog/lang_en.json index 8dbd5ccd..f52829bc 100644 --- a/.changelog/lang_en.json +++ b/.changelog/lang_en.json @@ -154,7 +154,7 @@ "Enhanced README.md to better document project build and run instructions _[`issue #344`](http://issues.autojs6.com/344)_" ], "dependency": [ - "Added Eclipse Paho Client Mqttv3 version 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", + "Added Eclipse Paho Client Mqtt V3 version 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", "Upgraded Android SDK version from 34 to 35", "Upgraded Gradle from 8.12 to 8.14-rc-1", "Upgraded Rhino from 1.8.0-SNAPSHOT to 1.8.1-SNAPSHOT", @@ -299,7 +299,7 @@ "Include EasyWindow (for Toaster) version 10.3", "Upgrade Gradle version from 8.5 -> 8.11.1", "Upgrade Rhino version 1.7.15-SNAPSHOT -> 1.8.0-SNAPSHOT", - "Upgrade Android Material Lang3 version 1.10.0 -> 1.12.0", + "Upgrade Android Material version 1.10.0 -> 1.12.0", "Upgrade Androidx Annotation version 1.7.0 -> 1.9.1", "Upgrade Androidx AppCompat version 1.6.1 -> 1.7.0", "Upgrade Androidx WebKit version 1.8.0 -> 1.12.1", diff --git a/.changelog/lang_es.json b/.changelog/lang_es.json index ee8468d9..1228d8c7 100644 --- a/.changelog/lang_es.json +++ b/.changelog/lang_es.json @@ -154,7 +154,7 @@ "Mejoras en el README.md para documentar la construcción y ejecución del proyecto _[`issue #344`](http://issues.autojs6.com/344)_" ], "dependency": [ - "Añadido Eclipse Paho Client Mqttv3 versión 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", + "Añadido Eclipse Paho Client Mqtt V3 versión 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", "Actualizado la versión de Android SDK de 34 a 35", "Actualizado Gradle de 8.12 a 8.14-rc-1", "Actualizado Rhino de 1.8.0-SNAPSHOT a 1.8.1-SNAPSHOT", @@ -299,7 +299,7 @@ "Incluir la versión 10.3 de EasyWindow (para Toaster)", "Actualización de versión de Gradle de 8.5 a 8.11.1", "Actualizar la versión 1.7.15-SNAPSHOT de Rhino -> 1.8.0-SNAPSHOT", - "Actualizar la versión 1.10.0 de Android Material Lang3 -> 1.12.0", + "Actualizar la versión 1.10.0 de Android Material -> 1.12.0", "Actualizar la versión 1.7.0 de Androidx Annotation -> 1.9.1", "Actualizar la versión 1.6.1 de Androidx AppCompat -> 1.7.0", "Actualizar la versión 1.8.0 de Androidx WebKit -> 1.12.1", diff --git a/.changelog/lang_fr.json b/.changelog/lang_fr.json index e09eacc5..22e90b84 100644 --- a/.changelog/lang_fr.json +++ b/.changelog/lang_fr.json @@ -154,7 +154,7 @@ "Amélioration du README.md pour mieux documenter la construction et l'exécution du projet _[`issue #344`](http://issues.autojs6.com/344)_" ], "dependency": [ - "Ajout d'Eclipse Paho Client Mqttv3 version 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", + "Ajout d'Eclipse Paho Client Mqtt V3 version 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", "Mise à jour de la version de Android SDK de 34 à 35", "Mise à jour de Gradle de 8.12 à 8.14-rc-1", "Mise à jour de Rhino de 1.8.0-SNAPSHOT à 1.8.1-SNAPSHOT", @@ -299,7 +299,7 @@ "Inclure la version 10.3 de EasyWindow (pour Toaster)", "Mettre à niveau la version 8.5 de Gradle -> 8.11.1 ", "Mettre à niveau la version 1.7.15-SNAPSHOT de Rhino -> 1.8.0-SNAPSHOT", - "Mettre à niveau la version 1.10.0 d'Android Material Lang3 -> 1.12.0", + "Mettre à niveau la version 1.10.0 d'Android Material -> 1.12.0", "Mettre à niveau la version 1.7.0 d'Androidx Annotation -> 1.9.1", "Mettre à niveau la version 1.6.1 d'Androidx AppCompat -> 1.7.0", "Mettre à niveau la version 1.8.0 d'Androidx WebKit -> 1.12.1", diff --git a/.changelog/lang_ja.json b/.changelog/lang_ja.json index 37252e5c..a725654b 100644 --- a/.changelog/lang_ja.json +++ b/.changelog/lang_ja.json @@ -154,7 +154,7 @@ "README.md を改善し, プロジェクトのビルドおよび実行方法のドキュメントを充実 _[`issue #344`](http://issues.autojs6.com/344)_" ], "dependency": [ - "Eclipse Paho Client Mqttv3 バージョン 1.1.0 を追加 _[`issue #330`](http://issues.autojs6.com/330)_", + "Eclipse Paho Client Mqtt V3 バージョン 1.1.0 を追加 _[`issue #330`](http://issues.autojs6.com/330)_", "Android SDK のバージョンを 34 から 35 に更新", "Gradle を 8.12 から 8.14-rc-1 に更新", "Rhino を 1.8.0-SNAPSHOT から 1.8.1-SNAPSHOT に更新", @@ -299,7 +299,7 @@ "追加 EasyWindow (for Toaster) バージョン 10.3", "Gradle バージョンを 8.5 -> 8.11.1 にアップグレード", "Rhino バージョン 1.7.15-SNAPSHOT -> 1.8.0-SNAPSHOT にアップグレード", - "Android Material Lang3 バージョン 1.10.0 -> 1.12.0 にアップグレード", + "Android Material バージョン 1.10.0 -> 1.12.0 にアップグレード", "Androidx Annotation バージョン 1.7.0 -> 1.9.1 にアップグレード", "Androidx AppCompat バージョン 1.6.1 -> 1.7.0 にアップグレード", "Androidx WebKit バージョン 1.8.0 -> 1.12.1 にアップグレード", diff --git a/.changelog/lang_ko.json b/.changelog/lang_ko.json index c43f7682..6526e73a 100644 --- a/.changelog/lang_ko.json +++ b/.changelog/lang_ko.json @@ -154,7 +154,7 @@ "README.md 를 개선하여 프로젝트 빌드 및 실행 방법에 대한 문서를 보강 _[`issue #344`](http://issues.autojs6.com/344)_" ], "dependency": [ - "Eclipse Paho Client Mqttv3 버전 1.1.0 추가 _[`issue #330`](http://issues.autojs6.com/330)_", + "Eclipse Paho Client Mqtt V3 버전 1.1.0 추가 _[`issue #330`](http://issues.autojs6.com/330)_", "Android SDK 버전을 34 에서 35 로 업데이트", "Gradle 을 8.12 에서 8.14-rc-1 로 업데이트", "Rhino 를 1.8.0-SNAPSHOT 에서 1.8.1-SNAPSHOT 으로 업데이트", @@ -299,7 +299,7 @@ "EasyWindow (for Toaster) 버전 10.3 추가", "Gradle 버전 8.5 -> 8.11.1 업그레이드", "Rhino 버전 1.7.15-SNAPSHOT 에서 1.8.0-SNAPSHOT 으로 업그레이드", - "Android Material Lang3 버전 1.10.0 에서 1.12.0 으로 업그레이드", + "Android Material 버전 1.10.0 에서 1.12.0 으로 업그레이드", "Androidx Annotation 버전 1.7.0 에서 1.9.1 으로 업그레이드", "Androidx AppCompat 버전 1.6.1 에서 1.7.0 으로 업그레이드", "Androidx WebKit 버전 1.8.0 에서 1.12.1 으로 업그레이드", diff --git a/.changelog/lang_ru.json b/.changelog/lang_ru.json index 32ccb3f5..098e236b 100644 --- a/.changelog/lang_ru.json +++ b/.changelog/lang_ru.json @@ -154,7 +154,7 @@ "Улучшение README.md с целью лучшей документации сборки и запуска проекта _[`issue #344`](http://issues.autojs6.com/344)_" ], "dependency": [ - "Добавлен Eclipse Paho Client Mqttv3 версии 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", + "Добавлен Eclipse Paho Client Mqtt V3 версии 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", "Обновлена версия Android SDK с 34 до 35", "Обновлён Gradle с 8.12 до 8.14-rc-1", "Обновлён Rhino с 1.8.0-SNAPSHOT до 1.8.1-SNAPSHOT", @@ -299,7 +299,7 @@ "Включить версию 10.3 EasyWindow (для Toaster)", "Обновить Gradle с версии 8.5 до 8.11.1", "Обновить Rhino с версии 1.7.15-SNAPSHOT до 1.8.0-SNAPSHOT", - "Обновить Android Material Lang3 с версии 1.10.0 до 1.12.0", + "Обновить Android Material с версии 1.10.0 до 1.12.0", "Обновить Androidx Annotation с версии 1.7.0 до 1.9.1", "Обновить Androidx AppCompat с версии 1.6.1 до 1.7.0", "Обновить Androidx WebKit с версии 1.8.0 до 1.12.1", diff --git a/.changelog/lang_zh-Hans.json b/.changelog/lang_zh-Hans.json index 57bb5a53..d51d4276 100644 --- a/.changelog/lang_zh-Hans.json +++ b/.changelog/lang_zh-Hans.json @@ -1,7 +1,7 @@ { "$data": { "v6.7.0": { - "released_date": "2025/09/24", + "released_date": "2025/09/28", "feature": [ "zip 模块, 用于文件压缩与解压缩操作 (Ref to [Auto.js Pro](https://g.pro.autojs.org/)) (参阅 项目文档 > [Zip](https://docs.autojs6.com/#/zip))", "mediainfo 模块, 用于查看媒体文件的详细信息 (参阅 项目文档 > [媒体信息](https://docs.autojs6.com/#/mediainfo))", @@ -50,21 +50,22 @@ "附加 Androidx Core (KTX) 版本 1.15.0", "升级 Android SDK 版本 35 -> 36", "升级 Gradle 版本 8.14 -> 8.14.3", + "升级 Desugar JDK Libs 版本 2.0.4 -> 2.1.5", + "升级 Android Material 版本 1.12.0 -> 1.13.0", + "升级 Androidx AppCompat 版本 1.7.0 -> 1.7.1", + "升级 Androidx Room 版本 2.7.1 -> 2.7.2", + "升级 Androidx WebKit 版本 1.13.0 -> 1.14.0", + "升级 Material Progressbar 版本 1.4.2 -> 1.6.1", "升级 Apache Commons 版本 3.16.0 -> 3.18.0", "升级 Retrofit2 Retrofit 版本 2.11.0 -> 2.12.0", "升级 Retrofit2 Converter Gson 版本 2.11.0 -> 2.12.0", "升级 Retrofit2 RxJava2 版本 2.11.0 -> 2.12.0", "升级 Joda Time 版本 2.12.7 -> 2.14.0", - "升级 Androidx WebKit 版本 1.13.0 -> 1.14.0", "升级 Gson 版本 2.11.0 -> 2.13.1", "升级 ARSCLib 版本 1.3.1 -> 1.3.5", "升级 Jsoup 版本 1.19.1 -> 1.20.1", "升级 Junit Jupiter 版本 5.10.3 -> 5.13.0", - "升级 Androidx AppCompat 版本 1.7.0 -> 1.7.1", - "升级 Material Progressbar 版本 1.4.2 -> 1.6.1", - "升级 Androidx Room 版本 2.7.1 -> 2.7.2", - "升级 OpenCC 版本 1.2.0 -> 1.2.2", - "升级 Desugar JDK Libs 版本 2.0.4 -> 2.1.5" + "升级 OpenCC 版本 1.2.0 -> 1.2.2" ] }, "v6.6.4": { @@ -221,7 +222,7 @@ "README.md 完善项目构建与运行相关内容 _[`issue #344`](http://issues.autojs6.com/344)_" ], "dependency": [ - "附加 Eclipse Paho Client Mqttv3 版本 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", + "附加 Eclipse Paho Client Mqtt V3 版本 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", "升级 Android SDK 版本 34 -> 35", "升级 Gradle 版本 8.12 -> 8.14-rc-1", "升级 Rhino 版本 1.8.0-SNAPSHOT -> 1.8.1-SNAPSHOT", @@ -366,7 +367,7 @@ "附加 EasyWindow (for Toaster) 版本 10.3", "升级 Gradle 版本 8.5 -> 8.11.1", "升级 Rhino 版本 1.7.15-SNAPSHOT -> 1.8.0-SNAPSHOT", - "升级 Android Material Lang3 版本 1.10.0 -> 1.12.0", + "升级 Android Material 版本 1.10.0 -> 1.12.0", "升级 Androidx Annotation 版本 1.7.0 -> 1.9.1", "升级 Androidx AppCompat 版本 1.6.1 -> 1.7.0", "升级 Androidx WebKit 版本 1.8.0 -> 1.12.1", diff --git a/.changelog/lang_zh-Hant-HK.json b/.changelog/lang_zh-Hant-HK.json index 7c619a8f..1ad7f4e7 100644 --- a/.changelog/lang_zh-Hant-HK.json +++ b/.changelog/lang_zh-Hant-HK.json @@ -154,7 +154,7 @@ "README.md 完善項目構建與運行相關內容 _[`issue #344`](http://issues.autojs6.com/344)_" ], "dependency": [ - "附加 Eclipse Paho Client Mqttv3 版本 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", + "附加 Eclipse Paho Client Mqtt V3 版本 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", "升級 Android SDK 版本 34 -> 35", "升級 Gradle 版本 8.12 -> 8.14-rc-1", "升級 Rhino 版本 1.8.0-SNAPSHOT -> 1.8.1-SNAPSHOT", @@ -299,7 +299,7 @@ "附加 EasyWindow (for Toaster) 版本 10.3", "升級 Gradle 版本 8.5 -> 8.11.1", "升級 Rhino 版本 1.7.15-SNAPSHOT -> 1.8.0-SNAPSHOT", - "升級 Android Material Lang3 版本 1.10.0 -> 1.12.0", + "升級 Android Material 版本 1.10.0 -> 1.12.0", "升級 Androidx Annotation 版本 1.7.0 -> 1.9.1", "升級 Androidx AppCompat 版本 1.6.1 -> 1.7.0", "升級 Androidx WebKit 版本 1.8.0 -> 1.12.1", diff --git a/.changelog/lang_zh-Hant-TW.json b/.changelog/lang_zh-Hant-TW.json index c330c4a0..9fe49306 100644 --- a/.changelog/lang_zh-Hant-TW.json +++ b/.changelog/lang_zh-Hant-TW.json @@ -154,7 +154,7 @@ "README.md 完善專案構建與執行相關內容 _[`issue #344`](http://issues.autojs6.com/344)_" ], "dependency": [ - "附加 Eclipse Paho Client Mqttv3 版本 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", + "附加 Eclipse Paho Client Mqtt V3 版本 1.1.0 _[`issue #330`](http://issues.autojs6.com/330)_", "升級 Android SDK 版本 34 -> 35", "升級 Gradle 版本 8.12 -> 8.14-rc-1", "升級 Rhino 版本 1.8.0-SNAPSHOT -> 1.8.1-SNAPSHOT", @@ -299,7 +299,7 @@ "附加 EasyWindow (for Toaster) 版本 10.3", "升級 Gradle 版本 8.5 -> 8.11.1", "升級 Rhino 版本 1.7.15-SNAPSHOT -> 1.8.0-SNAPSHOT", - "升級 Android Material Lang3 版本 1.10.0 -> 1.12.0", + "升級 Android Material 版本 1.10.0 -> 1.12.0", "升級 Androidx Annotation 版本 1.7.0 -> 1.9.1", "升級 Androidx AppCompat 版本 1.6.1 -> 1.7.0", "升級 Androidx WebKit 版本 1.8.0 -> 1.12.1", diff --git a/app/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java b/app/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java index b8c82982..c2a1c517 100644 --- a/app/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java +++ b/app/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java @@ -7,7 +7,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.net.Uri; import androidx.annotation.Nullable; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; +// import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.util.Log; @@ -52,7 +52,8 @@ public class AppUtils { @ScriptInterface public void sendLocalBroadcastSync(Intent intent) { - LocalBroadcastManager.getInstance(mContext).sendBroadcastSync(intent); + // LocalBroadcastManager.getInstance(mContext).sendBroadcastSync(intent); + throw new UnsupportedOperationException("This method has been obsoleted as LocalBroadcastManager is deprecated"); } @ScriptInterface diff --git a/app/src/main/java/org/autojs/autojs/AbstractAutoJs.kt b/app/src/main/java/org/autojs/autojs/AbstractAutoJs.kt index a73828bc..175b0470 100644 --- a/app/src/main/java/org/autojs/autojs/AbstractAutoJs.kt +++ b/app/src/main/java/org/autojs/autojs/AbstractAutoJs.kt @@ -60,8 +60,8 @@ abstract class AbstractAutoJs protected constructor(val application: Application scriptEngineManager.registerEngine(JavaScriptSource.ENGINE) { val rt = createRuntime() when (isInrt) { - true -> LoopBasedJavaScriptEngineWithDecryption(rt, applicationContext) - else -> LoopBasedJavaScriptEngine(rt, applicationContext) + true -> LoopBasedJavaScriptEngineWithDecryption(applicationContext) + else -> LoopBasedJavaScriptEngine(applicationContext) }.also { it.runtime = rt } } initContextFactory() diff --git a/app/src/main/java/org/autojs/autojs/engine/LoopBasedJavaScriptEngine.java b/app/src/main/java/org/autojs/autojs/engine/LoopBasedJavaScriptEngine.java index 33d5b425..e6067c19 100644 --- a/app/src/main/java/org/autojs/autojs/engine/LoopBasedJavaScriptEngine.java +++ b/app/src/main/java/org/autojs/autojs/engine/LoopBasedJavaScriptEngine.java @@ -26,8 +26,8 @@ public class LoopBasedJavaScriptEngine extends RhinoJavaScriptEngine { private Handler mHandler; private boolean mLooping = false; - public LoopBasedJavaScriptEngine(ScriptRuntime scriptRuntime, Context context) { - super(scriptRuntime, context); + public LoopBasedJavaScriptEngine(Context context) { + super(context); } public interface ExecuteCallback { diff --git a/app/src/main/java/org/autojs/autojs/engine/RhinoJavaScriptEngine.kt b/app/src/main/java/org/autojs/autojs/engine/RhinoJavaScriptEngine.kt index c52a1392..72b4e73d 100644 --- a/app/src/main/java/org/autojs/autojs/engine/RhinoJavaScriptEngine.kt +++ b/app/src/main/java/org/autojs/autojs/engine/RhinoJavaScriptEngine.kt @@ -44,7 +44,7 @@ import java.util.* * Created by Stardust on Apr 2, 2017. * Modified by SuperMonster003 as of May 26, 2022. */ -open class RhinoJavaScriptEngine(private val scriptRuntime: ScriptRuntime, private val androidContext: android.content.Context) : JavaScriptEngine() { +open class RhinoJavaScriptEngine(private val androidContext: android.content.Context) : JavaScriptEngine() { private val mWrapFactory = WrapFactory() val context: Context = enterContext() diff --git a/app/src/main/java/org/autojs/autojs/extension/ViewExtensions.kt b/app/src/main/java/org/autojs/autojs/extension/ViewExtensions.kt index 8885394c..53c6b157 100644 --- a/app/src/main/java/org/autojs/autojs/extension/ViewExtensions.kt +++ b/app/src/main/java/org/autojs/autojs/extension/ViewExtensions.kt @@ -31,12 +31,16 @@ object ViewExtensions { } val Toolbar.titleView: TextView? - get() = this.findViewById(com.google.android.material.R.id.action_bar_title) - ?: Toolbar::class.java.getDeclaredField("mTitleTextView").apply { isAccessible = true }.get(this@titleView) as TextView? + get() = this.findViewById(androidx.appcompat.R.id.action_bar_title) + ?: runCatching { + Toolbar::class.java.getDeclaredField("mTitleTextView").apply { isAccessible = true }.get(this@titleView) as TextView? + }.getOrNull() val Toolbar.subtitleView: TextView? - get() = this.findViewById(com.google.android.material.R.id.action_bar_subtitle) - ?: Toolbar::class.java.getDeclaredField("mSubtitleTextView").apply { isAccessible = true }.get(this@subtitleView) as TextView? + get() = this.findViewById(androidx.appcompat.R.id.action_bar_subtitle) + ?: runCatching { + Toolbar::class.java.getDeclaredField("mSubtitleTextView").apply { isAccessible = true }.get(this@subtitleView) as TextView? + }.getOrNull() @JvmStatic fun Toolbar.setOnTitleViewClickListener(l: View.OnClickListener?) { diff --git a/app/src/main/java/org/autojs/autojs/inrt/autojs/LoopBasedJavaScriptEngineWithDecryption.kt b/app/src/main/java/org/autojs/autojs/inrt/autojs/LoopBasedJavaScriptEngineWithDecryption.kt index 92e9b41a..323c843f 100644 --- a/app/src/main/java/org/autojs/autojs/inrt/autojs/LoopBasedJavaScriptEngineWithDecryption.kt +++ b/app/src/main/java/org/autojs/autojs/inrt/autojs/LoopBasedJavaScriptEngineWithDecryption.kt @@ -4,14 +4,13 @@ import android.content.Context import org.autojs.autojs.engine.LoopBasedJavaScriptEngine import org.autojs.autojs.engine.encryption.ScriptEncryption import org.autojs.autojs.pio.PFiles -import org.autojs.autojs.runtime.ScriptRuntime import org.autojs.autojs.script.EncryptedScriptFileHeader import org.autojs.autojs.script.EncryptedScriptFileHeader.BLOCK_SIZE import org.autojs.autojs.script.JavaScriptFileSource import org.autojs.autojs.script.ScriptSource import org.autojs.autojs.script.StringScriptSource -class LoopBasedJavaScriptEngineWithDecryption(scriptRuntime: ScriptRuntime, context: Context) : LoopBasedJavaScriptEngine(scriptRuntime, context) { +class LoopBasedJavaScriptEngineWithDecryption(context: Context) : LoopBasedJavaScriptEngine(context) { override fun execute(source: ScriptSource?, callback: ExecuteCallback?) { if (source is JavaScriptFileSource) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bb2a41c2..a7c96d1d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -72,7 +72,7 @@ junit-quickcheck-core = "1.0" junit-quickcheck-generators = "1.0" leakcanary = "2.14" licensesdialog = "2.2.0" -material = "1.12.0" +material = "1.13.0" materialprogressbar = "1.6.1" multidex = "2.0.1" opencc = "1.2.2" diff --git a/settings.gradle.kts b/settings.gradle.kts index 6d4fd0d9..205d185f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -126,9 +126,9 @@ pluginManagement { // @AnchorBegin ANDROID_GRADLE_PLUGIN_RELEASES_LIST // @Script /.utils/scrape-and-inject-agp-releases.mjs // @Reference https://developer.android.com/reference/tools/gradle-api - // @Updated by SuperMonster003 on Sep 26, 2025. + // @Updated by SuperMonster003 on Sep 28, 2025. val agpReleases = listOf( - "9.0.0-alpha07", + "9.0.0-alpha08", "8.13.0", "8.12.3", "8.11.2", diff --git a/version.properties b/version.properties index a1e97c2b..e99f0874 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ -#Sun Sep 28 22:30:49 CST 2025 -BUILD_TIME=1759069849955 +#Sun Sep 28 23:19:46 CST 2025 +BUILD_TIME=1759072786473 COMPILE_SDK_VERSION=36 IMAGE_QUANT_CMAKE_VERSION=3.22.1 IMAGE_QUANT_NDK_VERSION=26.1.10909125 @@ -23,6 +23,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3 TARGET_SDK_VERSION=36 TARGET_SDK_VERSION_INRT=29 -VERSION_BUILD=3386 +VERSION_BUILD=3387 VERSION_NAME=6.7.0 Alpha6 VSCODE_EXT_REQUIRED_VERSION=1.0.8