From 7f3689ce3faf6e0fe08dd4d8bba9f0b2e2fae077 Mon Sep 17 00:00:00 2001 From: Toni Helenius Date: Sat, 10 Jan 2026 12:57:08 +0200 Subject: [PATCH 1/2] Remove the platform independent fix (handled by NBPackage) --- .github/workflows/release.yml | 2 -- build.gradle | 36 ----------------------------------- 2 files changed, 38 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ef2aee33..5d331ec1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,8 +24,6 @@ jobs: run: ./gradlew overrideHarness -Ptag_name=${{ github.ref_name }} - name: Build Installers run: ant -Dstorepass="$NBM_SIGN_PASS" -Dpack200.enabled=false set-spec-version build-zip unset-spec-version - - name: Fix Platform Independent Build - run: ./gradlew fixPlatformIndependent -Ptag_name=${{ github.ref_name }} - name: Download JDKs for the installers run: bash download-jdks.sh working-directory: installers diff --git a/build.gradle b/build.gradle index a76f4b0f..460d7f3b 100644 --- a/build.gradle +++ b/build.gradle @@ -643,42 +643,6 @@ tasks.register('cleanSdk') { } } -tasks.register('extractPlatformIndependent', Copy) { - from zipTree('dist/jmonkeyplatform.zip') - into "dist/temp/" - - exclude("jmonkeyplatform/etc/jmonkeyplatform.conf") -} - -tasks.register('patchPlatformIndependent', Copy) { - dependsOn extractPlatformIndependent - from zipTree('dist/jmonkeyplatform.zip') - into "dist/temp/" - - include("jmonkeyplatform/etc/jmonkeyplatform.conf") - - filter { String line -> - line.startsWith('jdkhome=') ? '#jdkhome="/path/to/jdk"' : line - } - - doLast { - delete(file('dist/jmonkeyplatform.zip')) - } -} - -tasks.register('fixPlatformIndependent', Zip) { - dependsOn patchPlatformIndependent - description = "We compile our installers with the bundled jdk, but the platform independent zip doesn't have the jdk. For this we need to change the jmonkeyplatform.zip after building the installers to not have a jdk bundled" - - from 'dist/temp' - archiveFileName = 'jmonkeyplatform.zip' - destinationDirectory = file('dist') - - doLast { - delete("dist/temp") - } -} - wrapper { gradleVersion = '9.2.1' } From 0e76499262db26e19249a3035668657b4fed1415 Mon Sep 17 00:00:00 2001 From: Toni Helenius Date: Sat, 10 Jan 2026 12:57:38 +0200 Subject: [PATCH 2/2] Update license years --- installers/windows-x64/licenses-sdk.txt | 2 +- license-jme.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installers/windows-x64/licenses-sdk.txt b/installers/windows-x64/licenses-sdk.txt index 8d5dbb4e..d1f4b07b 100644 --- a/installers/windows-x64/licenses-sdk.txt +++ b/installers/windows-x64/licenses-sdk.txt @@ -1,7 +1,7 @@ ****************************************************************************** JME LICENSE ****************************************************************************** -Copyright (c) 2003-2025 jMonkeyEngine +Copyright (c) 2003-2026 jMonkeyEngine All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/license-jme.txt b/license-jme.txt index f36b8e99..a2741ee7 100644 --- a/license-jme.txt +++ b/license-jme.txt @@ -1,4 +1,4 @@ -Copyright (c) 2003-2025 jMonkeyEngine +Copyright (c) 2003-2026 jMonkeyEngine All rights reserved. Redistribution and use in source and binary forms, with or without