From 024d349d5bba082151923e53f812640d22ab72cf Mon Sep 17 00:00:00 2001
From: hstyi <hstyi@foxmail.com>
Date: Wed, 25 Feb 2026 09:01:26 +0800
Subject: [PATCH] chore: update JBR version to 25.0.2b329.66

---
 .github/workflows/linux.yml              |  4 ++--
 .github/workflows/osx.yml                |  4 ++--
 .github/workflows/windows.yml            |  4 ++--
 build.gradle.kts                         | 13 ++++++++-----
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 plugins/common.gradle.kts                |  3 +++
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index a39e383..b3c6859 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -3,8 +3,8 @@ name: Linux
 on: [ push, pull_request ]
 
 env:
-  JBR_MAJOR: 21.0.8
-  JBR_PATCH: b1163.69
+  JBR_MAJOR: 25.0.2
+  JBR_PATCH: b329.66
 
 jobs:
   build:
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index 4413131..9a23fce 100644
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@@ -8,8 +8,8 @@ env:
   # 只有发布版本时才需要公证
   TERMORA_MAC_NOTARY: "${{ startsWith(github.event.head_commit.message, 'release: ') && github.repository == 'TermoraDev/termora' }}"
   TERMORA_MAC_NOTARY_KEYCHAIN_PROFILE: ${{ secrets.TERMORA_MAC_NOTARY_KEYCHAIN_PROFILE }}
-  JBR_MAJOR: 21.0.8
-  JBR_PATCH: b1163.69
+  JBR_MAJOR: 25.0.2
+  JBR_PATCH: b329.66
 
 jobs:
   build:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index ccaa779..dbf14c1 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -3,8 +3,8 @@ name: Windows
 on: [ push, pull_request ]
 
 env:
-  JBR_MAJOR: 21.0.8
-  JBR_PATCH: b1163.69
+  JBR_MAJOR: 25.0.2
+  JBR_PATCH: b329.66
 
 jobs:
   build:
diff --git a/build.gradle.kts b/build.gradle.kts
index fc68187..81a5971 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -44,6 +44,10 @@ val macOSNotaryKeychainProfile = System.getenv("TERMORA_MAC_NOTARY_KEYCHAIN_PROF
 val macOSNotary = macOSSign && macOSNotaryKeychainProfile.isNotBlank()
         && System.getenv("TERMORA_MAC_NOTARY").toBoolean()
 
+fun exec(action: ExecSpec.() -> Unit) {
+    providers.exec(action).result.get().assertNormalExitValue()
+}
+
 allprojects {
     repositories {
         mavenCentral()
@@ -577,9 +581,8 @@ fun packOnMac(distributionDir: Directory, finalFilenameWithoutExtension: String,
     signMacOSLocalFile(dmgFile)
 
     // 找到 .app
-    val imageFile = layout.buildDirectory.dir("jpackage/images/").get().asFile
-    val appFile = imageFile.listFiles()?.firstOrNull()?.listFiles()?.firstOrNull()
-        ?: throw FileNotFoundException("${projectName}.app")
+    val imageFile = layout.buildDirectory.dir("jpackage/image/").get().asFile
+    val appFile = imageFile.listFiles()?.firstOrNull() ?: throw FileNotFoundException("${projectName}.app")
 
     // zip
     // @formatter:off
@@ -768,7 +771,7 @@ fun stapleMacOSLocalFile(file: File) {
 
 kotlin {
     jvmToolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(25)
     }
 }
 
@@ -781,4 +784,4 @@ idea {
         isDownloadJavadoc = true
         isDownloadSources = true
     }
-}
\ No newline at end of file
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1e2fbf0..2f2958b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugins/common.gradle.kts b/plugins/common.gradle.kts
index 6d0708c..0f65e39 100644
--- a/plugins/common.gradle.kts
+++ b/plugins/common.gradle.kts
@@ -1,5 +1,8 @@
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 
+fun exec(action: ExecSpec.() -> Unit) {
+    providers.exec(action).result.get().assertNormalExitValue()
+}
 
 tasks.withType<Jar> {