Merge branch 'master' into dependabot/gradle/io.gitlab.arturbosch.det…

…ekt-1.23.1
mojira · Mar 18, 2024 · 46e34ce · 46e34ce
2 parents 55d5830 + aa3ea16
commit 46e34ce
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/push-build-deploy.yml b/.github/workflows/push-build-deploy.yml
@@ -28,7 +28,7 @@ jobs:
           DEPLOY_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
           SERVER_PORT: 50022
           FOLDER: "build/install/arisa-kt/lib"
-          ARGS: "-avh --delete"
+          ARGS: "-avhW --delete"
           SERVER_IP: localhost
           USERNAME: arisakt
           SERVER_DESTINATION: /home/arisakt/arisa-kt
@@ -44,7 +44,7 @@ jobs:
           DEPLOY_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
           SERVER_PORT: 50022
           FOLDER: "build/install/arisa-kt/bin"
-          ARGS: "-avh --delete"
+          ARGS: "-avhW --delete"
           SERVER_IP: localhost
           USERNAME: arisakt
           SERVER_DESTINATION: /home/arisakt/arisa-kt
@@ -60,7 +60,7 @@ jobs:
           DEPLOY_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
           SERVER_PORT: 50022
           FOLDER: "config"
-          ARGS: "-avh --delete --exclude='local.yml'"
+          ARGS: "-avhW --delete --exclude='local.yml'"
           SERVER_IP: localhost
           USERNAME: arisakt
           SERVER_DESTINATION: /home/arisakt/arisa-kt

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.9.0"
+    kotlin("jvm") version "1.9.10"
     id("org.jlleitschuh.gradle.ktlint") version "11.5.0"
     application
     id("io.gitlab.arturbosch.detekt") version "1.23.1"

diff --git a/config/config.yml b/config/config.yml
@@ -36,7 +36,7 @@ arisa:
   privateSecurityLevel:
     default: '10318'
     special:
-      MCL: '10502'
+      mcl: '10502'
 
   modules:
     affectedVersionMessage:

diff --git a/src/main/kotlin/io/github/mojira/arisa/infrastructure/jira/Mappers.kt b/src/main/kotlin/io/github/mojira/arisa/infrastructure/jira/Mappers.kt
@@ -58,7 +58,7 @@ fun getCreationDate(issue: JiraIssue, id: String, default: Instant) = issue.chan
     ?.toInstant() ?: default
 
 fun JiraProject.getSecurityLevelId(config: Config) =
-    config[Arisa.PrivateSecurityLevel.special][key] ?: config[Arisa.PrivateSecurityLevel.default]
+    config[Arisa.PrivateSecurityLevel.special][key.lowercase()] ?: config[Arisa.PrivateSecurityLevel.default]
 
 fun JiraVersion.toDomain() = Version(
     id,