diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8b335103a5..7f0783c0a6 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -8,7 +8,7 @@ }, "features": { "ghcr.io/devcontainers/features/java:1": { - "version": "24-tem", + "version": "25-tem", "jdkDistro": "tem", "installGradle": true }, diff --git a/.github/workflows/basic-checks.yaml b/.github/workflows/basic-checks.yaml index 2619863c74..29194fb84d 100644 --- a/.github/workflows/basic-checks.yaml +++ b/.github/workflows/basic-checks.yaml @@ -3,7 +3,7 @@ name: Basic checks on: [pull_request] env: - JAVA_VERSION: 24 + JAVA_VERSION: 25 jobs: spotless: diff --git a/.github/workflows/code-analysis.yml b/.github/workflows/code-analysis.yml index 9ee9c064f8..31c8a77507 100644 --- a/.github/workflows/code-analysis.yml +++ b/.github/workflows/code-analysis.yml @@ -8,7 +8,7 @@ on: - cron: '0 20 * * 4' env: - JAVA_VERSION: 24 + JAVA_VERSION: 25 jobs: sonar: diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index edd933f799..b78064ff15 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -7,7 +7,7 @@ on: - 'master' env: - JAVA_VERSION: 24 + JAVA_VERSION: 25 jobs: docker: diff --git a/.github/workflows/docker-verify.yaml b/.github/workflows/docker-verify.yaml index 560c6f61d9..36faa729c9 100644 --- a/.github/workflows/docker-verify.yaml +++ b/.github/workflows/docker-verify.yaml @@ -3,7 +3,7 @@ name: Docker Verify on: [pull_request] env: - JAVA_VERSION: 24 + JAVA_VERSION: 25 jobs: docker: diff --git a/.github/workflows/releases.yaml b/.github/workflows/releases.yaml index fbd106930b..0e78daba85 100644 --- a/.github/workflows/releases.yaml +++ b/.github/workflows/releases.yaml @@ -10,7 +10,7 @@ defaults: shell: bash env: - JAVA_VERSION: 24 + JAVA_VERSION: 25 jobs: diff --git a/.vscode/settings.json b/.vscode/settings.json index 5f19eba23c..9b6fe2e916 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -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, -} \ No newline at end of file +} diff --git a/README.md b/README.md index 3c9c50cb40..b1e65d81e4 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/application/build.gradle b/application/build.gradle index fffb9a9974..f701c01246 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -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' } @@ -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 { diff --git a/build.gradle b/build.gradle index b7f8d7a7b6..f3562829ed 100644 --- a/build.gradle +++ b/build.gradle @@ -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 { @@ -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 @@ -59,7 +61,7 @@ subprojects { java { toolchain { // Nails the Java-Version of every Subproject - languageVersion = JavaLanguageVersion.of(24) + languageVersion = JavaLanguageVersion.of(25) } } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 4324ee2457..f800175af0 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -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' } diff --git a/buildSrc/src/main/groovy/database-settings.gradle b/buildSrc/src/main/groovy/database-settings.gradle index 8d931179d6..1c8afbdbe9 100644 --- a/buildSrc/src/main/groovy/database-settings.gradle +++ b/buildSrc/src/main/groovy/database-settings.gradle @@ -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}" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55baa..f8e1ee3125 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ff23a68d70..bad7c2462f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index 23d15a9367..adff685a03 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index db3a6ac207..c4bdd3ab8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/wiki/Setup-project-locally.md b/wiki/Setup-project-locally.md index 8b69928eee..b62a6430df 100644 --- a/wiki/Setup-project-locally.md +++ b/wiki/Setup-project-locally.md @@ -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