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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"features": {
"ghcr.io/devcontainers/features/java:1": {
"version": "24-tem",
"version": "25-tem",
"jdkDistro": "tem",
"installGradle": true
},
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/basic-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Basic checks
on: [pull_request]

env:
JAVA_VERSION: 24
JAVA_VERSION: 25

jobs:
spotless:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- cron: '0 20 * * 4'

env:
JAVA_VERSION: 24
JAVA_VERSION: 25

jobs:
sonar:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- 'master'

env:
JAVA_VERSION: 24
JAVA_VERSION: 25

jobs:
docker:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Docker Verify
on: [pull_request]

env:
JAVA_VERSION: 24
JAVA_VERSION: 25

jobs:
docker:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/releases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ defaults:
shell: bash

env:
JAVA_VERSION: 24
JAVA_VERSION: 25

jobs:

Expand Down
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
//Configure the JDK to Java 18 in settings
//Configure the JDK to Java 25 in settings
"java.compile.nullAnalysis.mode": "disabled",
"java.format.settings.url": "meta/formatting/google-style-eclipse.xml",
"editor.formatOnSave": true,
"editor.formatOnPaste": true,
"java.format.enabled": true,
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# TJ-Bot

[![codefactor](https://img.shields.io/codefactor/grade/github/together-java/tj-bot)](https://www.codefactor.io/repository/github/together-java/tj-bot)
![Java](https://img.shields.io/badge/Java-24-ff696c)
![Java](https://img.shields.io/badge/Java-25-ff696c)
[![license](https://img.shields.io/github/license/Together-Java/TJ-Bot)](https://github.com/Together-Java/TJ-Bot/blob/master/LICENSE)
![GitHub release (latest by date)](https://img.shields.io/github/v/release/Together-Java/TJ-Bot?label=release)

Expand Down
4 changes: 2 additions & 2 deletions application/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
plugins {
id 'application'
id 'com.google.cloud.tools.jib' version '3.5.0'
id 'com.github.johnrengelman.shadow' version '8.1.1'
id 'com.gradleup.shadow' version '9.2.2'
id 'database-settings'
}

Expand All @@ -18,7 +18,7 @@ repositories {
var outputImage = 'togetherjava.org:5001/togetherjava/tjbot:' + System.getenv('BRANCH_NAME') ?: 'latest'

jib {
from.image = 'eclipse-temurin:24'
from.image = 'eclipse-temurin:25'
to {
image = outputImage
auth {
Expand Down
10 changes: 6 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java'
id "com.diffplug.spotless" version "7.2.0"
id "org.sonarqube" version "7.0.0.6105"
id "com.diffplug.spotless" version "8.0.0"
id "org.sonarqube" version "7.0.1.6134"
id "name.remal.sonarlint" version "6.0.0"
}
repositories {
Expand Down Expand Up @@ -35,7 +35,9 @@ sonarqube {
tasks.register('installLocalGitHook', Copy) {
from new File(rootProject.rootDir, 'scripts/pre-commit')
into new File(rootProject.rootDir, '.git/hooks')
fileMode 0775
filePermissions {
unix("rwxrwxr-x")
}
}
build.dependsOn installLocalGitHook

Expand All @@ -59,7 +61,7 @@ subprojects {
java {
toolchain {
// Nails the Java-Version of every Subproject
languageVersion = JavaLanguageVersion.of(24)
languageVersion = JavaLanguageVersion.of(25)
}
}

Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ repositories {
}

dependencies {
implementation "gradle.plugin.org.flywaydb:gradle-plugin-publishing:10.6.0"
implementation 'nu.studer:gradle-jooq-plugin:9.0'
implementation "gradle.plugin.org.flywaydb:gradle-plugin-publishing:11.17.0"
implementation 'nu.studer:gradle-jooq-plugin:10.1.1'
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/groovy/database-settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ var sqliteVersion = "3.36.0.3"

dependencies {
implementation "org.xerial:sqlite-jdbc:${sqliteVersion}"
implementation 'org.flywaydb:flyway-core:8.0.0'
implementation 'org.flywaydb:flyway-core:11.17.0'
implementation "org.jooq:jooq:$jooqVersion"

jooqGenerator "org.xerial:sqlite-jdbc:${sqliteVersion}"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 1 addition & 4 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion wiki/Setup-project-locally.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Alternatively, you can also work directly in the cloud, for free, and get starte
* [[Code in the cloud (codespaces)]]

## Prerequisites
* [Java 24](https://adoptium.net/temurin/releases?version=24) installed
* [Java 25](https://adoptium.net/temurin/releases?version=25) installed
* your favorite Java IDE or text editor, e.g. [IntelliJ](https://www.jetbrains.com/idea/download/) or [Eclipse](https://www.eclipse.org/downloads/)
* [`git`](https://git-scm.com/downloads) installed (or any GUI or IDE plugin)
* [`gradle`](https://gradle.org/releases/) available (or any GUI or IDE plugin), you can either install it or use our provided wrapper
Expand Down
Loading