Merge remote-tracking branch 'origin/develop' into develop

build.gradle.kts

@@ -8,7 +8,6 @@ import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
 
 val ktor_version: String by project
 val kotlin_version: String by project
-val logback_version: String by project
 val exposed_version: String by project
 val h2_version: String by project
 val koin_version: String by project
@@ -16,13 +15,12 @@ val coroutines_version: String by project
 val serialization_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.9.22"
-    id("org.graalvm.buildtools.native") version "0.10.0"
-    id("io.gitlab.arturbosch.detekt") version "1.23.5"
-    id("org.springframework.boot") version "3.2.2"
-    kotlin("plugin.spring") version "1.9.22"
-    id("org.openapi.generator") version "7.2.0"
-    id("org.jetbrains.kotlinx.kover") version "0.7.4"
+    kotlin("jvm") version "1.9.23"
+    id("io.gitlab.arturbosch.detekt") version "1.23.6"
+    id("org.springframework.boot") version "3.2.3"
+    kotlin("plugin.spring") version "1.9.23"
+    id("org.openapi.generator") version "7.4.0"
+    id("org.jetbrains.kotlinx.kover") version "0.7.6"
     id("com.github.jk1.dependency-license-report") version "2.5"
 
 }
@@ -98,10 +96,6 @@ tasks.withType<Test> {
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask<*>>().configureEach {
-    compilerOptions.languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
-    compilerOptions.apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
-}
 
 tasks.withType<KotlinCompile> {
     kotlinOptions {
@@ -185,7 +179,6 @@ dependencies {
     implementation("org.jetbrains.exposed:exposed-core:$exposed_version")
     implementation("org.jetbrains.exposed:exposed-jdbc:$exposed_version")
     developmentOnly("com.h2database:h2:$h2_version")
-    implementation("org.xerial:sqlite-jdbc:3.45.1.0")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:$serialization_version")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version")
 
@@ -211,13 +204,13 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-mongodb-reactive")
     implementation("org.jetbrains.exposed:exposed-spring-boot-starter:$exposed_version")
     implementation("io.trbl:blurhash:1.0.0")
-    implementation("software.amazon.awssdk:s3:2.23.17")
+    implementation("software.amazon.awssdk:s3:2.25.23")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$coroutines_version")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:$coroutines_version")
     implementation("dev.usbharu:http-signature:1.0.0")
 
-    implementation("org.postgresql:postgresql:42.7.1")
+    implementation("org.postgresql:postgresql:42.7.3")
     implementation("com.twelvemonkeys.imageio:imageio-webp:3.10.1")
     implementation("org.apache.tika:tika-core:2.9.1")
     implementation("org.apache.tika:tika-parsers:2.9.1")
@@ -242,7 +235,7 @@ dependencies {
 
     implementation("dev.usbharu:emoji-kt:2.0.0")
     implementation("org.jsoup:jsoup:1.17.2")
-    implementation("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20220608.1")
+    implementation("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1")
 
     implementation("io.ktor:ktor-client-logging-jvm:$ktor_version")
 
@@ -263,7 +256,7 @@ dependencies {
     implementation("org.drewcarlson:kjob-core:0.6.0")
     implementation("org.drewcarlson:kjob-mongo:0.6.0")
 
-    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.5")
+    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.6")
 
     intTestImplementation("org.springframework.boot:spring-boot-starter-test")
     intTestImplementation("org.springframework.security:spring-security-test")
@@ -275,7 +268,7 @@ dependencies {
     e2eTestImplementation("org.springframework.boot:spring-boot-starter-test")
     e2eTestImplementation("org.springframework.security:spring-security-test")
     e2eTestImplementation("org.springframework.boot:spring-boot-starter-webflux")
-    e2eTestImplementation("org.jsoup:jsoup:1.17.1")
+    e2eTestImplementation("org.jsoup:jsoup:1.17.2")
     e2eTestImplementation("com.intuit.karate:karate-junit5:1.4.1")
     e2eTestImplementation("com.h2database:h2:$h2_version")
 

gradle.properties

@@ -1,12 +1,11 @@
-ktor_version=2.3.8
-kotlin_version=1.9.22
-logback_version=1.4.14
-coroutines_version=1.7.3
-serialization_version=1.6.2
+ktor_version=2.3.9
+kotlin_version=1.9.23
+coroutines_version=1.8.0
+serialization_version=1.6.3
 kotlin.code.style=official
-exposed_version=0.47.0
+exposed_version=0.49.0
 h2_version=2.2.224
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 org.gradle.caching=true
-org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC
+org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC

src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiServiceImpl.kt

@@ -116,11 +116,11 @@ class NotificationApiServiceImpl(
             reblog -> Notification.Type.reblog
             follow -> Notification.Type.follow
             follow_request -> Notification.Type.follow
-            favourite -> Notification.Type.followRequest
+            favourite -> Notification.Type.follow_request
             poll -> Notification.Type.poll
             update -> Notification.Type.update
-            admin_sign_up -> Notification.Type.adminPeriodSignUp
+            admin_sign_up -> Notification.Type.adminPeriodSign_up
             admin_report -> Notification.Type.adminPeriodReport
-            severed_relationships -> Notification.Type.severedRelationships
+            severed_relationships -> Notification.Type.severed_relationships
         }
 }