From 767a1c962fdb509ee39aff0a6aa23c2e61858e0a Mon Sep 17 00:00:00 2001 From: dyhkwong <50692134+dyhkwong@users.noreply.github.com> Date: Thu, 20 Mar 2025 19:38:25 +0800 Subject: [PATCH] Update mieru plugin to v3.13.0 --- .github/workflows/release_mieru.yml | 2 +- .../main/java/io/nekohasekai/sagernet/fmt/mieru/MieruFmt.kt | 5 +++++ plugin/mieru/src/main/go/mieru | 2 +- version.properties | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release_mieru.yml b/.github/workflows/release_mieru.yml index 448ffa6c..297ee67d 100644 --- a/.github/workflows/release_mieru.yml +++ b/.github/workflows/release_mieru.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: 1.24.0 + go-version: 1.24.1 cache-dependency-path: "plugin/mieru/src/main/go/mieru/go.sum" - name: Setup Java uses: actions/setup-java@v4 diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/mieru/MieruFmt.kt b/app/src/main/java/io/nekohasekai/sagernet/fmt/mieru/MieruFmt.kt index 1c5dfff0..5297e6e6 100644 --- a/app/src/main/java/io/nekohasekai/sagernet/fmt/mieru/MieruFmt.kt +++ b/app/src/main/java/io/nekohasekai/sagernet/fmt/mieru/MieruFmt.kt @@ -107,6 +107,11 @@ fun MieruBean.toUri(): String { fun MieruBean.buildMieruConfig(port: Int): String { return JSONObject().also { + // Enable this means giving up the support for mieru < 3.13, mieru version 2 and mieru version 1. + // I don't know if it is possible to do a version number check. + /*it["advancedSettings"] = JSONObject().also { + it["noCheckUpdate"] = true + }*/ it["activeProfile"] = "default" it["socks5Port"] = port it["loggingLevel"] = when (DataStore.logLevel) { diff --git a/plugin/mieru/src/main/go/mieru b/plugin/mieru/src/main/go/mieru index c3f96c5e..64e7364e 160000 --- a/plugin/mieru/src/main/go/mieru +++ b/plugin/mieru/src/main/go/mieru @@ -1 +1 @@ -Subproject commit c3f96c5e7502d0fec4ddb8c3fe985b777c66e69b +Subproject commit 64e7364e8f22f969f4b8eff5dbaeacefb2d61585 diff --git a/version.properties b/version.properties index 73ff23bf..7171bea0 100644 --- a/version.properties +++ b/version.properties @@ -11,8 +11,8 @@ BROOK_VERSION=46 HYSTERIA2_VERSION_NAME=2.6.1 HYSTERIA2_VERSION=113 -MIERU_VERSION_NAME=3.12.0 -MIERU_VERSION=145 +MIERU_VERSION_NAME=3.13.0 +MIERU_VERSION=146 JUICITY_VERSION_NAME=0.4.3 JUICITY_VERSION=5