From e3ee43f011d81d49c3a4cb23f775a2589b00ce5f Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 3 Apr 2024 14:48:06 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=E4=BE=9D=E5=AD=98=E9=96=A2?= =?UTF-8?q?=E4=BF=82=E3=82=92=E3=82=A2=E3=83=83=E3=83=97=E3=83=87=E3=83=BC?= =?UTF-8?q?=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 25 +++++++++++-------------- gradle.properties | 13 ++++++------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b0c055bb..16a3e6f0 100644 --- a/build.gradle.kts +++ b/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" } @@ -185,7 +183,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 +208,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 +239,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 +260,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 +272,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") diff --git a/gradle.properties b/gradle.properties index 8b8439f8..ba87773a 100644 --- a/gradle.properties +++ b/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 From ecb73a0da6747660dda8bf380827da37574c5867 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:09:20 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BE=9D=E5=AD=98=E9=96=A2=E4=BF=82?= =?UTF-8?q?=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=81=A7=E5=A3=8A=E3=82=8C=E3=81=9F=E9=83=A8=E5=88=86=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 4 ---- .../service/notification/NotificationApiServiceImpl.kt | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 16a3e6f0..ff7abe9d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -96,10 +96,6 @@ tasks.withType { } } -tasks.withType>().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 { kotlinOptions { diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiServiceImpl.kt index 890e7e9c..52caed8f 100644 --- a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiServiceImpl.kt +++ b/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 } }