fix: merge conflict

Noelware · Jul 22, 2022 · 8071db0 · 8071db0
2 parents 267b725 + b704907
commit 8071db0
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 63 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -31,10 +31,10 @@ repositories {
 
 dependencies {
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.8.0")
-    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.7.0")
+    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.7.10")
     implementation(kotlin("gradle-plugin", version = "1.7.0"))
     implementation(kotlin("serialization", version = "1.7.0"))
     implementation("io.kotest:kotest-gradle-plugin:0.3.9")
-    implementation("dev.floofy.commons:gradle:2.1.1")
+    implementation("dev.floofy.commons:gradle:2.2.1.1")
     implementation(gradleApi())
 }
diff --git a/buildSrc/src/main/kotlin/remi-module.gradle.kts b/buildSrc/src/main/kotlin/remi-module.gradle.kts
@@ -44,12 +44,12 @@ 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.3"))
+    api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"))
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
     api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8")
 
     // noel utils
-    implementation("dev.floofy.commons:slf4j:2.1.1")
+    implementation("dev.floofy.commons:slf4j:2.2.1.1")
 
     // SLF4J for logging
     api("org.slf4j:slf4j-api:1.7.36")

diff --git a/docs/support-fs/org.noelware.remi.filesystem/sha1.html b/docs/support-fs/org.noelware.remi.filesystem/sha1.html
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/support-gcs/build.gradle.kts b/support-gcs/build.gradle.kts
@@ -23,5 +23,5 @@ plugins {
 }
 
 dependencies {
-    implementation("com.google.cloud:google-cloud-storage:2.9.2")
+    implementation("com.google.cloud:google-cloud-storage:2.10.0")
 }
diff --git a/support-minio/build.gradle.kts b/support-minio/build.gradle.kts
@@ -23,5 +23,5 @@ plugins {
 }
 
 dependencies {
-    api("io.minio:minio:8.4.2")
+    api("io.minio:minio:8.4.3")
 }
diff --git a/support-s3/build.gradle.kts b/support-s3/build.gradle.kts
@@ -23,10 +23,10 @@ plugins {
 }
 
 dependencies {
-    api("software.amazon.awssdk:s3:2.17.227")
+    api("software.amazon.awssdk:s3:2.17.237")
 
     testApi("org.slf4j:slf4j-api:1.7.36")
     testImplementation("org.slf4j:slf4j-simple:1.7.36")
-    testImplementation("dev.floofy.commons:slf4j:2.1.1")
+    testImplementation("dev.floofy.commons:slf4j:2.2.1.1")
     testImplementation("org.testcontainers:testcontainers:1.17.3")
 }