From 1b68a513a976160757d081012e44b8eb7cce332c Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Tue, 3 Mar 2026 13:49:33 +0000 Subject: [PATCH] tauri jdk25 and docs (#5814) --- .github/workflows/build.yml | 2 +- .github/workflows/pre_commit.yml | 4 ++-- .github/workflows/tauri-build.yml | 4 ++-- .github/workflows/testdriver.yml | 4 ++-- CLAUDE.md | 2 +- DeveloperGuide.md | 6 +++--- devGuide/DeveloperGuide.md | 4 ++-- scripts/build-tauri-jlink.bat | 4 ++-- scripts/build-tauri-jlink.sh | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4fb774c51..53597672b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -147,7 +147,7 @@ jobs: - name: Checkout repository uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: java-version: "25" diff --git a/.github/workflows/pre_commit.yml b/.github/workflows/pre_commit.yml index 9bb40679b..caa5ec6f1 100644 --- a/.github/workflows/pre_commit.yml +++ b/.github/workflows/pre_commit.yml @@ -59,10 +59,10 @@ jobs: pre-commit run trailing-whitespace --all-files -c .pre-commit-config.yaml continue-on-error: true - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: - java-version: 21 + java-version: "25" distribution: "temurin" - name: Setup Gradle diff --git a/.github/workflows/tauri-build.yml b/.github/workflows/tauri-build.yml index 5b868a5e5..7f8b01f47 100644 --- a/.github/workflows/tauri-build.yml +++ b/.github/workflows/tauri-build.yml @@ -102,10 +102,10 @@ jobs: toolchain: stable targets: ${{ (matrix.platform == 'macos-15' || matrix.platform == 'macos-15-intel') && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: - java-version: "21" + java-version: "25" distribution: "temurin" - name: Setup Gradle diff --git a/.github/workflows/testdriver.yml b/.github/workflows/testdriver.yml index 27862ada7..4137c72eb 100644 --- a/.github/workflows/testdriver.yml +++ b/.github/workflows/testdriver.yml @@ -32,10 +32,10 @@ jobs: - name: Checkout repository uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: - java-version: "21" + java-version: "25" distribution: "temurin" - name: Setup Gradle diff --git a/CLAUDE.md b/CLAUDE.md index f1461dcb8..eeaf5e263 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -308,7 +308,7 @@ The frontend is organized with a clear separation of concerns: ## Important Notes -- **Java Version**: Minimum JDK 17, supports and recommends JDK 21 +- **Java Version**: Minimum JDK 21, supports and recommends JDK 25 - **Lombok**: Used extensively - ensure IDE plugin is installed - **File Persistence**: - **Backend**: Designed to be stateless - files are processed in memory/temp locations only diff --git a/DeveloperGuide.md b/DeveloperGuide.md index 738816b86..d67429437 100644 --- a/DeveloperGuide.md +++ b/DeveloperGuide.md @@ -11,7 +11,7 @@ This guide focuses on developing for Stirling 2.0, including both the React fron **Stirling 2.0** is built using: **Backend:** -- Spring Boot (Java 17+, JDK 21 recommended) +- Spring Boot (Java 21+, JDK 25 recommended) - PDFBox for core PDF operations - LibreOffice for document conversions - qpdf for PDF optimization @@ -44,7 +44,7 @@ This guide focuses on developing for Stirling 2.0, including both the React fron - Docker - Git -- Java JDK 17 or later (JDK 21 recommended) +- Java JDK 21 or later (JDK 25 recommended) - Node.js 18+ and npm (required for frontend development) - Gradle 7.0 or later (Included within the repo) - Rust and Cargo (required for Tauri desktop app development) @@ -59,7 +59,7 @@ This guide focuses on developing for Stirling 2.0, including both the React fron cd Stirling-PDF ``` -2. Install Docker and JDK17 if not already installed. +2. Install Docker and JDK 21 (or JDK 25 recommended) if not already installed. 3. Install a recommended Java IDE such as Eclipse, IntelliJ, or VSCode 1. Only VSCode diff --git a/devGuide/DeveloperGuide.md b/devGuide/DeveloperGuide.md index 0fe7216fa..034a475c5 100644 --- a/devGuide/DeveloperGuide.md +++ b/devGuide/DeveloperGuide.md @@ -25,7 +25,7 @@ Stirling-PDF is built using: - Docker - Git -- Java JDK 17 or later +- Java JDK 21 or later (JDK 25 recommended) - Gradle 7.0 or later (Included within the repo) ### Setup Steps @@ -37,7 +37,7 @@ Stirling-PDF is built using: cd Stirling-PDF ``` -2. Install Docker and JDK17 if not already installed. +2. Install Docker and JDK 21 (or JDK 25 recommended) if not already installed. 3. Install a recommended Java IDE such as Eclipse, IntelliJ, or VSCode 1. Only VSCode diff --git a/scripts/build-tauri-jlink.bat b/scripts/build-tauri-jlink.bat index 05d839016..be9cd00d7 100644 --- a/scripts/build-tauri-jlink.bat +++ b/scripts/build-tauri-jlink.bat @@ -54,8 +54,8 @@ if errorlevel 1 ( exit /b 1 ) set "JAVA_EFFECTIVE_MAJOR=%JAVA_EFFECTIVE_MAJOR_NUM%" -if %JAVA_EFFECTIVE_MAJOR% LSS 17 ( - echo ❌ Java 17 or higher is required. Found Java %JAVA_EFFECTIVE_MAJOR% +if %JAVA_EFFECTIVE_MAJOR% LSS 21 ( + echo ❌ Java 21 or higher is required. Found Java %JAVA_EFFECTIVE_MAJOR% exit /b 1 ) echo ✅ Java %JAVA_EFFECTIVE_MAJOR% and jlink detected diff --git a/scripts/build-tauri-jlink.sh b/scripts/build-tauri-jlink.sh index ec2b283af..9aee738e0 100755 --- a/scripts/build-tauri-jlink.sh +++ b/scripts/build-tauri-jlink.sh @@ -44,8 +44,8 @@ if ! command -v jlink &> /dev/null; then fi JAVA_VERSION=$(java -version 2>&1 | head -n 1 | cut -d'"' -f2 | cut -d'.' -f1) -if [ "$JAVA_VERSION" -lt 17 ]; then - print_error "Java 17 or higher is required. Found Java $JAVA_VERSION" +if [ "$JAVA_VERSION" -lt 21 ]; then + print_error "Java 21 or higher is required. Found Java $JAVA_VERSION" exit 1 fi