Merge branch 'develop' into 'main'

Maintenance Release See merge request Griefed/ServerPackCreator!625
Griefed · Dec 6, 2024 · 2e2175f · 2e2175f
2 parents 3f12744 + 36c07b8
commit 2e2175f
Show file tree

Hide file tree

Showing 8 changed files with 161 additions and 121 deletions.
diff --git a/.github/workflows/github-prerelease.yml b/.github/workflows/github-prerelease.yml
@@ -186,7 +186,7 @@ jobs:
       # GENERATE RELEASE
       - name: Create Release
         id: create_release
-        uses: softprops/action-gh-release@v2.0.9
+        uses: softprops/action-gh-release@v2.1.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag_name: ${{ needs.preparations.outputs.version }}

diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml
@@ -178,7 +178,7 @@ jobs:
       # GENERATE RELEASE
       - name: Create Release
         id: create_release
-        uses: softprops/action-gh-release@v2.0.9
+        uses: softprops/action-gh-release@v2.1.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag_name: ${{ needs.preparations.outputs.version }}
@@ -283,7 +283,7 @@ jobs:
 
       # DEPLOY TO GH-PAGES
       - name: Deploy to GitHub-Pages
-        uses: JamesIves/github-pages-deploy-action@v4.6.8
+        uses: JamesIves/github-pages-deploy-action@v4.7.1
         with:
           branch: gh-pages
           folder: serverpackcreator-api/build/dokka
diff --git a/serverpackcreator-api/build.gradle.kts b/serverpackcreator-api/build.gradle.kts
@@ -14,20 +14,20 @@ repositories {
 
 dependencies {
     api("io.github.microutils:kotlin-logging:3.0.5")
-    api("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0")
+    api("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
     api("de.jensklingenberg.ktorfit:ktorfit-lib:2.1.0")
     api("de.comahe.i18n4k:i18n4k-core:0.9.0")
     api("de.comahe.i18n4k:i18n4k-core-jvm:0.9.0")
-    implementation("org.jetbrains.kotlin:kotlin-bom:2.0.21")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:2.0.21")
+    implementation("org.jetbrains.kotlin:kotlin-bom:2.1.0")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.0")
     implementation(files("${layout.buildDirectory.asFile.get()}/resources/main"))
     api("com.electronwill.night-config:toml:3.7.2")
     api("com.fasterxml.jackson.core:jackson-databind:2.18.1")
     api("net.lingala.zip4j:zip4j:2.11.5")
     api("org.apache.logging.log4j:log4j-api-kotlin:1.5.0")
-    api("org.apache.logging.log4j:log4j-core:2.24.1")
+    api("org.apache.logging.log4j:log4j-core:2.24.2")
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
-    api("org.pf4j:pf4j:3.11.0")
+    api("org.pf4j:pf4j:3.13.0")
     api("org.bouncycastle:bcpkix-jdk18on:1.79")
 
     api("com.github.MCRcortex:nekodetector:Version-1.1-pre")

diff --git a/serverpackcreator-app/build.gradle.kts b/serverpackcreator-app/build.gradle.kts
@@ -41,7 +41,7 @@ dependencies {
     api("org.jetbrains.kotlin:kotlin-reflect:2.0.0")
     api("com.formdev:flatlaf:3.5.1")
     api("com.formdev:flatlaf-extras:3.5.2")
-    api("com.formdev:flatlaf-intellij-themes:3.5.1")
+    api("com.formdev:flatlaf-intellij-themes:3.5.2")
     api("com.formdev:flatlaf-fonts-jetbrains-mono:2.304")
     api("com.formdev:flatlaf-fonts-inter:4.0")
     api("com.formdev:flatlaf-fonts-roboto:2.137")
@@ -55,17 +55,17 @@ dependencies {
 
     //WEB
     api("org.jetbrains.kotlin:kotlin-reflect:1.9.23")
-    api("com.fasterxml.jackson.module:jackson-module-kotlin:2.17.1")
+    api("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.2")
     api("org.springframework.boot:spring-boot-starter-web:3.3.2")
-    api("org.springframework.boot:spring-boot-starter-log4j2:3.3.2")
+    api("org.springframework.boot:spring-boot-starter-log4j2:3.4.0")
     api("org.springframework.boot:spring-boot-starter-data-jpa:3.3.5")
     api("org.postgresql:postgresql:42.7.3")
     api("org.javassist:javassist:3.30.2-GA")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.3")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
     testRuntimeOnly("com.h2database:h2:2.3.232")
     testImplementation("org.springframework.boot:spring-boot-starter-test:3.3.4")
-    developmentOnly("org.springframework.boot:spring-boot-devtools:3.3.4")
+    developmentOnly("org.springframework.boot:spring-boot-devtools:3.4.0")
     //developmentOnly("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0")
 }