Merge branch 'develop' into 'main'

chore: Maintenance Update See merge request Griefed/ServerPackCreator!624
Griefed · Nov 6, 2024 · b7d3a6e · b7d3a6e
2 parents 80fc2ff + 2a79722
commit b7d3a6e
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 145 deletions.
diff --git a/.github/workflows/devbuild.yml b/.github/workflows/devbuild.yml
@@ -24,7 +24,7 @@ jobs:
           check-latest: true
           cache: 'gradle'
 
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: wrapper
 
@@ -77,10 +77,10 @@ jobs:
           files: |
             continuous/*
             
-      - name: Delete drafts
-        uses: hugo19941994/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#      - name: Delete drafts
+#        uses: hugo19941994/[email protected]
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get source archives
         run: |

diff --git a/.github/workflows/github-prerelease.yml b/.github/workflows/github-prerelease.yml
@@ -53,7 +53,7 @@ jobs:
         run: |
           chmod +x gradlew
 
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: wrapper
 
@@ -149,13 +149,13 @@ jobs:
 
       - name: General Pre-Info
         id: preinfo
-        uses: jaywcjlove/github-action-read-file@v1.2.2
+        uses: jaywcjlove/github-action-read-file@v2.0.0
         with:
           path: misc/PRE-INFO.md
 
       - name: General Info
         id: info
-        uses: jaywcjlove/github-action-read-file@v1.2.2
+        uses: jaywcjlove/github-action-read-file@v2.0.0
         with:
           path: misc/INFO.md
 
@@ -186,7 +186,7 @@ jobs:
       # GENERATE RELEASE
       - name: Create Release
         id: create_release
-        uses: softprops/[email protected].8
+        uses: softprops/[email protected].9
         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
@@ -51,7 +51,7 @@ jobs:
         run: |
           chmod +x gradlew
 
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: wrapper
 
@@ -147,7 +147,7 @@ jobs:
 
       - name: General Info
         id: info
-        uses: jaywcjlove/github-action-read-file@v1.2.2
+        uses: jaywcjlove/github-action-read-file@v2.0.0
         with:
           path: misc/INFO.md
 
@@ -178,7 +178,7 @@ jobs:
       # GENERATE RELEASE
       - name: Create Release
         id: create_release
-        uses: softprops/[email protected].8
+        uses: softprops/[email protected].9
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag_name: ${{ needs.preparations.outputs.version }}
@@ -275,7 +275,7 @@ jobs:
       - name: Build documentation
         run: ./gradlew :serverpackcreator-api:dokkaHtml -Pversion="${{ needs.preparations.outputs.version }}" --full-stacktrace --info -x test
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: build-artifacts
           path: serverpackcreator-api/build/dokka/

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -24,7 +24,7 @@ jobs:
           check-latest: true
           cache: 'gradle'
 
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: wrapper
 

diff --git a/serverpackcreator-api/build.gradle.kts b/serverpackcreator-api/build.gradle.kts
@@ -18,17 +18,17 @@ dependencies {
     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:1.9.25")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:2.0.20")
+    implementation("org.jetbrains.kotlin:kotlin-bom:2.0.21")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:2.0.21")
     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.0")
+    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.4.0")
+    api("org.apache.logging.log4j:log4j-api-kotlin:1.5.0")
     api("org.apache.logging.log4j:log4j-core:2.24.1")
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
     api("org.pf4j:pf4j:3.11.0")
-    api("org.bouncycastle:bcpkix-jdk18on:1.78")
+    api("org.bouncycastle:bcpkix-jdk18on:1.79")
 
     api("com.github.MCRcortex:nekodetector:Version-1.1-pre")
     //api("dev.kosmx.needle:jneedle:1.0.1")

diff --git a/serverpackcreator-app/build.gradle.kts b/serverpackcreator-app/build.gradle.kts
@@ -40,7 +40,7 @@ dependencies {
     api("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.9.0")
     api("org.jetbrains.kotlin:kotlin-reflect:2.0.0")
     api("com.formdev:flatlaf:3.5.1")
-    api("com.formdev:flatlaf-extras:3.4")
+    api("com.formdev:flatlaf-extras:3.5.2")
     api("com.formdev:flatlaf-intellij-themes:3.5.1")
     api("com.formdev:flatlaf-fonts-jetbrains-mono:2.304")
     api("com.formdev:flatlaf-fonts-inter:4.0")
@@ -51,17 +51,17 @@ dependencies {
     api("net.java.balloontip:balloontip:1.2.4.1")
     api("com.cronutils:cron-utils:9.2.1")
     api("tokyo.northside:tipoftheday:0.4.2")
-    compileOnly("com.install4j:install4j-runtime:10.0.9")
+    compileOnly("com.install4j:install4j-runtime:11.0.1")
 
     //WEB
     api("org.jetbrains.kotlin:kotlin-reflect:1.9.23")
     api("com.fasterxml.jackson.module:jackson-module-kotlin:2.17.1")
     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-data-jpa:3.3.4")
+    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.1")
+    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")

diff --git a/serverpackcreator-plugin-example/build.gradle.kts b/serverpackcreator-plugin-example/build.gradle.kts
@@ -30,8 +30,8 @@ val pluginDescription = "An example plugin for ServerPackCreator, written in Kot
 val pluginAuthor = "Griefed"
 
 dependencies {
-    annotationProcessor("org.pf4j:pf4j:3.12.0")
-    kapt("org.pf4j:pf4j:3.12.0")
+    annotationProcessor("org.pf4j:pf4j:3.12.1")
+    kapt("org.pf4j:pf4j:3.12.1")
     /*
      * CAUTION: When copying the code of the example plugin, make sure to change the dependency on
      * the API to implementation("de.griefed:serverpackcreator:serverpackcreator-api:$VERSION")
@@ -40,8 +40,8 @@ dependencies {
 
 
     // Testing
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.1")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.1")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.3")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.3")
 }
 
 tasks.processResources {