flik/termora
1
0
Fork 0
mirror of https://github.com/TermoraDev/termora.git synced 2026-03-31 21:32:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: update JBR version to 25.0.2b329.66

Browse Source
This commit is contained in:
hstyi
2026-02-25 09:01:26 +08:00
committed by GitHub
parent 5375a2e42e
commit 024d349d5b
6 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/linux.yml vendored
View File

@@ -3,8 +3,8 @@ name: Linux
on: [ push, pull_request ] on: [ push, pull_request ]
env: env:
JBR_MAJOR: 21.0.8 JBR_MAJOR: 25.0.2
JBR_PATCH: b1163.69 JBR_PATCH: b329.66
jobs: jobs:
build: build:

4
.github/workflows/osx.yml vendored
View File

@@ -8,8 +8,8 @@ env:
# 只有发布版本时才需要公证 # 只有发布版本时才需要公证
TERMORA_MAC_NOTARY: "${{ startsWith(github.event.head_commit.message, 'release: ') && github.repository == 'TermoraDev/termora' }}" 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 }} TERMORA_MAC_NOTARY_KEYCHAIN_PROFILE: ${{ secrets.TERMORA_MAC_NOTARY_KEYCHAIN_PROFILE }}
JBR_MAJOR: 21.0.8 JBR_MAJOR: 25.0.2
JBR_PATCH: b1163.69 JBR_PATCH: b329.66
jobs: jobs:
build: build:

4
.github/workflows/windows.yml vendored
View File

@@ -3,8 +3,8 @@ name: Windows
on: [ push, pull_request ] on: [ push, pull_request ]
env: env:
JBR_MAJOR: 21.0.8 JBR_MAJOR: 25.0.2
JBR_PATCH: b1163.69 JBR_PATCH: b329.66
jobs: jobs:
build: build:

11
build.gradle.kts
View File

@@ -44,6 +44,10 @@ val macOSNotaryKeychainProfile = System.getenv("TERMORA_MAC_NOTARY_KEYCHAIN_PROF
val macOSNotary = macOSSign && macOSNotaryKeychainProfile.isNotBlank() val macOSNotary = macOSSign && macOSNotaryKeychainProfile.isNotBlank()
&& System.getenv("TERMORA_MAC_NOTARY").toBoolean() && System.getenv("TERMORA_MAC_NOTARY").toBoolean()
fun exec(action: ExecSpec.() -> Unit) {
providers.exec(action).result.get().assertNormalExitValue()
}
allprojects { allprojects {
repositories { repositories {
mavenCentral() mavenCentral()
@@ -577,9 +581,8 @@ fun packOnMac(distributionDir: Directory, finalFilenameWithoutExtension: String,
signMacOSLocalFile(dmgFile) signMacOSLocalFile(dmgFile)
// 找到 .app // 找到 .app
val imageFile = layout.buildDirectory.dir("jpackage/images/").get().asFile val imageFile = layout.buildDirectory.dir("jpackage/image/").get().asFile
val appFile = imageFile.listFiles()?.firstOrNull()?.listFiles()?.firstOrNull() val appFile = imageFile.listFiles()?.firstOrNull() ?: throw FileNotFoundException("${projectName}.app")
?: throw FileNotFoundException("${projectName}.app")
// zip // zip
// @formatter:off // @formatter:off
@@ -768,7 +771,7 @@ fun stapleMacOSLocalFile(file: File) {
kotlin { kotlin {
jvmToolchain { jvmToolchain {
languageVersion = JavaLanguageVersion.of(21) languageVersion = JavaLanguageVersion.of(25)
} }
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

3
plugins/common.gradle.kts
View File

@@ -1,5 +1,8 @@
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
fun exec(action: ExecSpec.() -> Unit) {
providers.exec(action).result.get().assertNormalExitValue()
}
tasks.withType<Jar> { tasks.withType<Jar> {