Merge branch 'develop' into 'main'

Develop

See merge request Griefed/ServerPackCreator!645

Author: Griefed

.github/workflows/github-prerelease.yml

@@ -25,7 +25,7 @@ jobs:
       # EXTRACT TAG FROM PUSH
       - name: Get tag
         id: tag
-        uses: tj-actions/branch-names@v8.0.1
+        uses: tj-actions/branch-names@v8.1.0
       - name: Use tag
         run: echo ${{steps.tag.outputs.tag}}
 

.github/workflows/github_release.yml

@@ -23,7 +23,7 @@ jobs:
       # EXTRACT TAG FROM PUSH
       - name: Get tag
         id: tag
-        uses: tj-actions/branch-names@v8.0.1
+        uses: tj-actions/branch-names@v8.1.0
       - name: Use tag
         run: echo ${{steps.tag.outputs.tag}}
 

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
 
       - name: Get branch name
         id: branch-name
-        uses: tj-actions/branch-names@v8.0.1
+        uses: tj-actions/branch-names@v8.1.0
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4

Dockerfile.help

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/nginx:1.26.2
+FROM ghcr.io/linuxserver/nginx:1.26.3
 
 ARG VERSION=dev
 ENV ARTIFACT=webHelpSPCH2-all.zip

serverpackcreator-api/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
     api("de.jensklingenberg.ktorfit:ktorfit-lib:2.1.0")
     api("de.comahe.i18n4k:i18n4k-core:0.10.0")
     api("de.comahe.i18n4k:i18n4k-core-jvm:0.10.0")
-    implementation("org.jetbrains.kotlin:kotlin-bom:2.1.10")
+    implementation("org.jetbrains.kotlin:kotlin-bom:2.1.20")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.0")
     implementation(files("${layout.buildDirectory.asFile.get()}/resources/main"))
     api("com.electronwill.night-config:toml:3.8.1")
@@ -28,12 +28,12 @@ dependencies {
     api("org.apache.logging.log4j:log4j-core:2.24.3")
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
     api("org.pf4j:pf4j:3.13.0")
-    api("org.bouncycastle:bcpkix-jdk18on:1.79")
+    api("org.bouncycastle:bcpkix-jdk18on:1.80")
 
     api("com.github.MCRcortex:nekodetector:Version-1.1-pre")
     //api("dev.kosmx.needle:jneedle:1.0.1")
 
-    testImplementation("org.jetbrains.kotlin:kotlin-test:2.1.0")
+    testImplementation("org.jetbrains.kotlin:kotlin-test:2.1.20")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
 }