Release 1.13.18 (#537)

Author: rainbowdashlabs

.editorconfig

@@ -4,8 +4,8 @@ on:
   push:
     tags:
     branches:
-      - master
-      - development
+      - main
+      - dev
 
 jobs:
   docker-build:
@@ -34,7 +34,7 @@ jobs:
           docker image tag ghcr.io/rainbowdashlabs/reputation-bot:${{ github.sha }} ghcr.io/rainbowdashlabs/reputation-bot:${{ github.ref_name }}
           docker push ghcr.io/rainbowdashlabs/reputation-bot:${{ github.ref_name }}
       - name: Tag & Push latest image
-        if: github.ref_name == 'master'
+        if: github.ref_name == 'main'
         run: |
           docker image tag ghcr.io/rainbowdashlabs/reputation-bot:${{ github.sha }} ghcr.io/rainbowdashlabs/reputation-bot:latest
           docker push ghcr.io/rainbowdashlabs/reputation-bot:latest

.github/workflows/docker.yml

@@ -3,7 +3,6 @@ name: docs
 on:
   push:
     branches:
-      - master
       - main
 jobs:
   deploy:

.github/workflows/docs.yml

@@ -0,0 +1,5 @@
+/*
+ *     SPDX-License-Identifier: AGPL-3.0-only
+ *
+ *     Copyright (C) RainbowDashLabs and Contributor
+ */

HEADER.txt

@@ -1,18 +1,26 @@
 plugins {
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    alias(libs.plugins.shadow)
+    alias(libs.plugins.spotless)
     java
     `maven-publish`
 }
 
 group = "de.chojo"
-version = "1.13.17"
+version = "1.13.18"
 
 repositories {
     maven("https://eldonexus.de/repository/maven-public")
     maven("https://eldonexus.de/repository/maven-proxies")
     maven("https://m2.dv8tion.net/releases")
 }
 
+spotless {
+    java {
+        licenseHeaderFile(rootProject.file("HEADER.txt"))
+        target("**/*.java")
+    }
+}
+
 dependencies {
     //discord
     implementation("de.chojo", "cjda-util", "2.8.6+beta.11") {
@@ -21,23 +29,20 @@ dependencies {
 
     // database
     implementation("org.postgresql", "postgresql", "42.6.0")
-    implementation("de.chojo.sadu", "sadu-queries", "1.3.0")
-    implementation("de.chojo.sadu", "sadu-updater", "1.3.0")
-    implementation("de.chojo.sadu", "sadu-postgresql", "1.3.0")
-    implementation("de.chojo.sadu", "sadu-datasource", "1.3.0")
+    implementation(libs.bundles.sadu)
 
     // Logging
-    implementation("org.slf4j", "slf4j-api", "2.0.7")
-    implementation("org.apache.logging.log4j", "log4j-core", "2.20.0")
-    implementation("org.apache.logging.log4j", "log4j-slf4j2-impl", "2.20.0")
-    implementation("club.minnced", "discord-webhooks", "0.8.2")
+    implementation(libs.bundles.log4j)
+    implementation("de.chojo", "log-util", "1.0.1") {
+        exclude("org.apache.logging.log4j")
+    }
 
-    implementation("org.knowm.xchart", "xchart", "3.8.4")
+    implementation("org.knowm.xchart", "xchart", "3.8.5")
 
     // unit testing
-    testImplementation(platform("org.junit:junit-bom:5.9.3"))
+    testImplementation(platform("org.junit:junit-bom:5.10.0"))
     testImplementation("org.junit.jupiter", "junit-jupiter")
-    testImplementation("org.knowm.xchart", "xchart", "3.8.4")
+    testImplementation("org.knowm.xchart", "xchart", "3.8.5")
 }
 
 java {

build.gradle.kts

@@ -1,12 +1,12 @@
-FROM eclipse-temurin:19-alpine as build
+FROM gradle:jdk19-alpine as build
 
 COPY . .
-RUN ./gradlew clean build --no-daemon
+RUN gradle clean build --no-daemon
 
 FROM eclipse-temurin:19-alpine as runtime
 
 WORKDIR /app
 
-COPY --from=build /build/libs/rep-bot-*-all.jar bot.jar
+COPY --from=build /home/gradle/build/libs/rep-bot-*-all.jar bot.jar
 
 ENTRYPOINT ["java", "-Dbot.config=config/config.json", "-Dlog4j.configurationFile=config/log4j2.xml", "-Dcjda.localisation.error.name=false", "-jar" , "bot.jar"]

docker/Dockerfile

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" shutdownHook="disable" packages="de.chojo.repbot.util">
+<Configuration status="WARN" shutdownHook="disable" packages="de.chojo.logutil.appender">
     <Appenders>
         <!-- Console logger for debugging (prints stacktrace) -->
         <Console name="ConsoleDebug" target="SYSTEM_OUT">

docker/config/log4j2.xml

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.jar

@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.