fix: merge conflict

Author: auguwu

buildSrc/build.gradle.kts

@@ -30,11 +30,11 @@ repositories {
 }
 
 dependencies {
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.6.1")
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.7.2")
     implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.6.21")
     implementation(kotlin("gradle-plugin", version = "1.6.21"))
     implementation(kotlin("serialization", version = "1.6.21"))
     implementation("io.kotest:kotest-gradle-plugin:0.3.9")
-    implementation("dev.floofy.commons:gradle:2.1.0.1")
+    implementation("dev.floofy.commons:gradle:2.1.1")
     implementation(gradleApi())
 }

buildSrc/src/main/kotlin/remi-module.gradle.kts

@@ -42,24 +42,24 @@ dependencies {
     api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.3.3"))
 
     // kotlinx.coroutines support
-    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1"))
+    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.3"))
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
     api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8")
 
     // noel utils
-    implementation("dev.floofy.commons:slf4j:2.1.0.1")
+    implementation("dev.floofy.commons:slf4j:2.1.1")
 
     // SLF4J for logging
     api("org.slf4j:slf4j-api:1.7.36")
 
     // testing utilities
-    testImplementation(platform("io.kotest:kotest-bom:5.3.0"))
+    testImplementation(platform("io.kotest:kotest-bom:5.3.2"))
     testImplementation("io.kotest:kotest-runner-junit5")
     testImplementation("io.kotest:kotest-assertions-core")
     testImplementation("io.kotest:kotest-property")
 
     // Tika (for content type checking)
-    implementation("org.apache.tika:tika-core:2.4.0")
+    implementation("org.apache.tika:tika-core:2.4.1")
 
     if (name.startsWith("support-")) {
         implementation(project(":core"))

core/build.gradle.kts

@@ -23,5 +23,5 @@ plugins {
 }
 
 dependencies {
-    api("org.jetbrains.kotlinx:kotlinx-datetime:0.3.2")
+    api("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 }

support-gcs/build.gradle.kts

@@ -23,5 +23,5 @@ plugins {
 }
 
 dependencies {
-    implementation("com.google.cloud:google-cloud-storage:2.6.1")
+    implementation("com.google.cloud:google-cloud-storage:2.9.0")
 }

support-minio/build.gradle.kts

@@ -23,5 +23,5 @@ plugins {
 }
 
 dependencies {
-    api("io.minio:minio:8.4.1")
+    api("io.minio:minio:8.4.2")
 }

support-s3/build.gradle.kts

@@ -23,10 +23,10 @@ plugins {
 }
 
 dependencies {
-    api("software.amazon.awssdk:s3:2.17.196")
+    api("software.amazon.awssdk:s3:2.17.224")
 
     testApi("org.slf4j:slf4j-api:1.7.36")
     testImplementation("org.slf4j:slf4j-simple:1.7.36")
-    testImplementation("dev.floofy.commons:slf4j:2.1.0.1")
-    testImplementation("org.testcontainers:testcontainers:1.17.2")
+    testImplementation("dev.floofy.commons:slf4j:2.1.1")
+    testImplementation("org.testcontainers:testcontainers:1.17.3")
 }