Resolve merge conflicts

Author: christolis

.devcontainer/devcontainer.json

@@ -8,7 +8,7 @@
   },
   "features": {
     "ghcr.io/devcontainers/features/java:1": {
-      "version": "18.0.2.1-tem",
+      "version": "25-tem",
       "jdkDistro": "tem",
       "installGradle": true
     },
@@ -35,4 +35,4 @@
   "postCreateCommand": {
     "config": "cp application/config.json.template application/config.json"
   }
-}
+}

.github/workflows/basic-checks.yml .github/workflows/basic-checks.yaml.github/workflows/basic-checks.yml renamed to .github/workflows/basic-checks.yaml

@@ -3,7 +3,7 @@ name: Basic checks
 on: [pull_request]
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 25
 
 jobs:
   spotless:

.github/workflows/code-analysis.yml

@@ -8,7 +8,7 @@ on:
     - cron: '0 20 * * 4'
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 25
 
 jobs:
   sonar:
@@ -72,7 +72,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -95,4 +95,4 @@ jobs:
        ./gradlew build
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/discord-member.yml .github/workflows/discord-member.yaml.github/workflows/discord-member.yml renamed to .github/workflows/discord-member.yaml

@@ -7,7 +7,7 @@ on:
       - 'master'
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 25
 
 jobs:
   docker:

.github/workflows/docker-publish.yaml

@@ -3,7 +3,7 @@ name: Docker Verify
 on: [pull_request]
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 25
 
 jobs:
   docker:

.github/workflows/docker-verify.yaml

@@ -10,7 +10,7 @@ defaults:
     shell: bash
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 25
 
 jobs:
 

.github/workflows/releases.yaml

@@ -0,0 +1,23 @@
+name: Wiki Sync
+
+on:
+  push:
+    branches:
+      - 'develop'
+    paths:
+      - wiki/**
+      - .github/workflows/wiki-sync.yaml
+
+concurrency:
+  group: sync-wiki
+  cancel-in-progress: true
+  
+permissions:
+  contents: write
+
+jobs:
+  sync-wiki:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Andrew-Chen-Wang/github-wiki-action@v5.0.1

.github/workflows/wiki-sync.yaml

@@ -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,
-}
+}

.vscode/settings.json

@@ -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-21-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)