Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v5
with:
java-version: '21'
java-version: '25'
distribution: 'temurin'
cache: 'gradle'

Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:

- uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v5
with:
java-version: '21'
java-version: '25'
distribution: 'temurin'
cache: 'gradle'

Expand Down Expand Up @@ -278,7 +278,7 @@ jobs:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v5
with:
java-version: '21'
java-version: '25'
distribution: 'temurin'
- name: Submit Gradle dependency graph
uses: gradle/actions/dependency-submission@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v5
if: matrix.language == 'java-kotlin'
with:
java-version: '21'
java-version: '25'
distribution: 'temurin'
- uses: github/codeql-action/init@9b3254085494b55a0f7c4c2b3d2d52cc712ce370 # v4.39.1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ jobs:

- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

- name: Set up JDK 21
- name: Set up JDK 25
if: matrix.gradle_build
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v5
with:
java-version: '21'
java-version: '25'
distribution: 'temurin'
cache: 'gradle'

Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# eclipse-temurin:21-jre-alpine
# eclipse-temurin:25-jre-alpine
FROM eclipse-temurin:25-jre-alpine@sha256:3c0a9084927a221ccd1d007fcaf614465672c0af37aaa834c5184483afe56d61
# brotli-libs 1.2.0-r1 -> 1.2.1-r0 (CVE-2026-111497)
RUN apk upgrade --no-cache p11-kit p11-kit-trust libexpat openssl libssl3 brotli-libs
Expand Down
4 changes: 2 additions & 2 deletions backend/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {

group = "com.taskowolf"
version = "0.0.1-SNAPSHOT"
java.sourceCompatibility = JavaVersion.VERSION_21
java.sourceCompatibility = JavaVersion.VERSION_25

repositories {
mavenCentral()
Expand Down Expand Up @@ -83,7 +83,7 @@ dependencies {
tasks.withType<KotlinCompile> {
compilerOptions {
freeCompilerArgs.add("-Xjsr305=strict")
jvmTarget.set(JvmTarget.JVM_21)
jvmTarget.set(JvmTarget.JVM_25)
}
}

Expand Down
2 changes: 1 addition & 1 deletion mkdocs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Prerequisites

- JDK 21 (Temurin recommended)
- JDK 25 (Temurin recommended)
- Node.js 22.22+ (required by react-router v8 at build time)
- Docker (for Testcontainers)

Expand Down
Loading