From c0bd9afea0c0e9e4dc2856dd5bbbcd3dcb838dc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?=
 =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=BE=D0=B2?=
 <22411953+Vladislav4KZ@users.noreply.github.com>
Date: Mon, 12 Oct 2026 18:26:38 +0000
Subject: [PATCH 1/2] ci: update JDK version to 21

---
 .github/workflows/build.yml                 |  2 +-
 android/gradle/gradle-daemon-jvm.properties | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bd821b110..b0902b735 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: gradle
       - name: Setup compilation cache
diff --git a/android/gradle/gradle-daemon-jvm.properties b/android/gradle/gradle-daemon-jvm.properties
index baa28d154..6f724c758 100644
--- a/android/gradle/gradle-daemon-jvm.properties
+++ b/android/gradle/gradle-daemon-jvm.properties
@@ -1,13 +1,12 @@
 #This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7083b89563e7ce20943037b8cd2b8cc2/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/060bbb778a1f55ea705fdebd2ccfeab9/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d09679dc60fe5aa05ef7d03efdefac20/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ed4e3bf2f5e7c5d9aabc4cbd8acd555e/redirect
-toolchainVendor=JETBRAINS
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/542351b649eb2bd122f0bdd21a8e74af/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/65e59d9b9d79dc0a8e44790703568088/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/542351b649eb2bd122f0bdd21a8e74af/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/65e59d9b9d79dc0a8e44790703568088/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/faa59212208d027d066d1bbe337c5da5/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/adf5b89d64773eff73f900e61dd2d632/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/542351b649eb2bd122f0bdd21a8e74af/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/65e59d9b9d79dc0a8e44790703568088/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/916f6e47bbe16857b6188d9f385a936a/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/f9aa63bae008193aeb384bd02c8b44f8/redirect
 toolchainVersion=21

From 461eab56b0bbae66b3ff39043db42f5cd99b2641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?=
 =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=BE=D0=B2?=
 <22411953+Vladislav4KZ@users.noreply.github.com>
Date: Mon, 12 Oct 2026 19:00:21 +0000
Subject: [PATCH 2/2] 3rdparty: update submodules

---
 3rdparty/mainui_cpp | 2 +-
 3rdparty/miniutl    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/3rdparty/mainui_cpp b/3rdparty/mainui_cpp
index 6cb52ee72..4922113b7 160000
--- a/3rdparty/mainui_cpp
+++ b/3rdparty/mainui_cpp
@@ -1 +1 @@
-Subproject commit 6cb52ee726b8f0fb233be4fe01aad91037494e3e
+Subproject commit 4922113b7477d9073e9f483f46b0e10b3be888b7
diff --git a/3rdparty/miniutl b/3rdparty/miniutl
index 048a416f4..371731e8b 160000
--- a/3rdparty/miniutl
+++ b/3rdparty/miniutl
@@ -1 +1 @@
-Subproject commit 048a416f4c54c501dfd728fd792bfdc9f2883f51
+Subproject commit 371731e8b5ee63173e0b8c0cdc0ea2e0851a81da