Merge branch 'develop' into kotlin2

hideout-core/build.gradle.kts

@@ -6,11 +6,6 @@ import com.github.jk1.license.render.*
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
 
-val ktor_version: String by project
-val kotlin_version: String by project
-val h2_version: String by project
-val coroutines_version: String by project
-
 plugins {
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.detekt)
@@ -172,7 +167,7 @@ val os = org.gradle.nativeplatform.platform.internal
     .DefaultNativePlatform.getCurrentOperatingSystem()
 
 dependencies {
-    developmentOnly("com.h2database:h2:$h2_version")
+    developmentOnly(libs.h2db)
     detektPlugins(libs.detekt.formatting)
 
     implementation(libs.bundles.exposed)
@@ -192,15 +187,16 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-log4j2")
     implementation("org.springframework.boot:spring-boot-starter-validation")
 
+    implementation(libs.blurhash)
+    implementation(libs.aws.s3)
+    implementation(libs.jsoup)
+    implementation(libs.owasp.java.html.sanitizer)
+    implementation(libs.postgresql)
+    implementation(libs.imageio.webp)
+    implementation(libs.thumbnailator)
+    implementation(libs.flyway.core)
+
     implementation("dev.usbharu:owl-common-serialize-jackson:0.0.1")
-    implementation("io.trbl:blurhash:1.0.0")
-    implementation("software.amazon.awssdk:s3:2.25.55")
-    implementation("org.jsoup:jsoup:1.17.2")
-    implementation("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1")
-    implementation("org.postgresql:postgresql:42.7.3")
-    implementation("com.twelvemonkeys.imageio:imageio-webp:3.10.1")
-    implementation("net.coobird:thumbnailator:0.4.20")
-    implementation("org.flywaydb:flyway-core")
 
     implementation(libs.javacv) {
         exclude(module = "opencv")
@@ -225,11 +221,11 @@ dependencies {
 
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
+    implementation(libs.kotlin.junit)
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version")
+    implementation(libs.coroutines.test)
 
-    testImplementation("io.ktor:ktor-client-mock:$ktor_version")
+    testImplementation(libs.ktor.client.mock)
-    testImplementation("com.h2database:h2:$h2_version")
+    testImplementation(libs.h2db)
 
     testImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1")
     testImplementation("org.mockito:mockito-inline:5.2.0")
@@ -238,17 +234,16 @@ dependencies {
 
     intTestImplementation("org.springframework.boot:spring-boot-starter-test")
     intTestImplementation("org.springframework.security:spring-security-test")
-    intTestImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
+    intTestImplementation(libs.kotlin.junit)
-    intTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version")
+    intTestImplementation(libs.coroutines.test)
     intTestImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1")
-    intTestImplementation("com.h2database:h2:$h2_version")
+    intTestImplementation(libs.h2db)
 
     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.2")
     e2eTestImplementation("com.intuit.karate:karate-junit5:1.4.1")
-    e2eTestImplementation("com.h2database:h2:$h2_version")
+    e2eTestImplementation(libs.h2db)
 
 }
 

hideout-core/gradle.properties

@@ -13,11 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-ktor_version=2.3.11
-kotlin_version=1.9.24
-coroutines_version=1.8.1
 kotlin.code.style=official
-h2_version=2.2.224
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 org.gradle.caching=true

libs.versions.toml

@@ -23,6 +23,7 @@ exposed-java-time = { module = "org.jetbrains.exposed:exposed-java-time", versio
 cotoutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 cotoutines-reactor = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactor", version.ref = "coroutines" }
 cotoutines-slf4j = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-slf4j", version.ref = "coroutines" }
+coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 
 javacv = { module = "org.bytedeco:javacv", version = "1.5.10" }
 javacv-ffmpeg = { module = "org.bytedeco:ffmpeg", version.ref = "javacv-ffmpeg" }
@@ -32,7 +33,7 @@ detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting",
 ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
 ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
-ktor-client-mock = { module = "io.ktor:ktor-client-client-mock", version.ref = "ktor" }
+ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
 ktor-client-logging-jvm = { module = "io.ktor:ktor-client-logging-jvm", version.ref = "ktor" }
 ktor-serialization-jackson = { module = "io.ktor:ktor-serialization-jackson", version.ref = "ktor" }
 
@@ -66,6 +67,26 @@ owl-broker-mongodb = { module = "dev.usbharu:owl-broker-mongodb", version.ref =
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
 jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
 
+blurhash = { module = "io.trbl:blurhash", version = "1.0.0" }
+
+aws-s3 = { module = "software.amazon.awssdk:s3", version = "2.25.56" }
+
+jsoup = { module = "org.jsoup:jsoup", version = "1.17.2" }
+
+owasp-java-html-sanitizer = { module = "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer", version = "20240325.1" }
+
+postgresql = { module = "org.postgresql:postgresql", version = "42.7.3" }
+
+imageio-webp = { module = "com.twelvemonkeys.imageio:imageio-webp", version = "3.10.1" }
+
+thumbnailator = { module = "net.coobird:thumbnailator", version = "0.4.20" }
+
+flyway-core = { module = "org.flywaydb:flyway-core" }
+
+h2db = { module = "com.h2database:h2", version = "2.2.224" }
+
+kotlin-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
+
 [bundles]
 
 exposed = ["exposed-core", "exposed-java-time", "exposed-jdbc", "exposed-spring"]