Update dependencies and upgradle (still hilarious)

.github/workflows/gradle.yml

@@ -25,7 +25,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Build Artifacts
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
           arguments: build --stacktrace
           gradle-home-cache-cleanup: true

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Build Artifacts
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
           arguments: build --stacktrace
           gradle-home-cache-cleanup: true

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Build Artifacts
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
           arguments: build --stacktrace
           gradle-home-cache-cleanup: true

build.gradle.kts

@@ -35,11 +35,21 @@ repositories {
 		url = uri("https://maven.fabricmc.net/")
 	}
 
+	maven {
+		name = "QuiltMC (Releases)"
+		url = uri("https://maven.quiltmc.org/repository/release/")
+	}
+
 	maven {
 		name = "QuiltMC (Snapshots)"
 		url = uri("https://maven.quiltmc.org/repository/snapshot/")
 	}
 
+	maven {
+		name = "Shedaniel"
+		url = uri("https://maven.shedaniel.me")
+	}
+
 	maven {
 		name = "JitPack"
 		url = uri("https://jitpack.io")
@@ -53,6 +63,7 @@ dependencies {
 	implementation(libs.kord.extensions.phishing)
 	implementation(libs.kord.extensions.pluralkit)
 	implementation(libs.kord.extensions.unsafe)
+	implementation(libs.kord.extensions.welcome)
 
 	implementation(libs.kotlin.stdlib)
 
@@ -66,9 +77,6 @@ dependencies {
 	// KMongo
 	implementation(libs.kmongo)
 
-	// Cozy's welcome module
-	implementation(libs.cozy.welcome)
-
 	implementation(libs.dma)
 	implementation(libs.docgenerator)
 }

gradle/libs.versions.toml

@@ -8,27 +8,27 @@ grgit = "5.2.1"
 blossom = "2.1.0"
 
 # Libraries
-kord-extensions = "1.7.1-20231217.132026-9"
-logging = "5.1.1"
+kord-extensions = "1.7.1-20240117.210840-21"
+kord-welcome = "1.7.1-20240117.210840-10"
+logging = "6.0.3"
 logback = "1.4.14"
-github-api = "1.317"
+github-api = "1.318"
 kmongo = "4.11.0"
-cozy-welcome = "1.0.1-SNAPSHOT"
 dma = "v0.2.1"
-docgenerator = "0.1.2-SNAPSHOT"
+docgenerator = "main-SNAPSHOT"
 
 [libraries]
 kord-extensions-core = { module = "com.kotlindiscord.kord.extensions:kord-extensions", version.ref = "kord-extensions" }
 kord-extensions-phishing = { module = "com.kotlindiscord.kord.extensions:extra-phishing", version.ref = "kord-extensions" }
 kord-extensions-pluralkit = { module = "com.kotlindiscord.kord.extensions:extra-pluralkit", version.ref = "kord-extensions"}
 kord-extensions-unsafe = { module = "com.kotlindiscord.kord.extensions:unsafe", version.ref = "kord-extensions"}
+kord-extensions-welcome = { module = "com.kotlindiscord.kord.extensions:extra-welcome", version.ref = "kord-welcome"}
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib" }
 logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
 logging = { module = "io.github.oshai:kotlin-logging", version.ref = "logging" }
 github-api = { module = "org.kohsuke:github-api", version.ref = "github-api" }
 kmongo = { module = "org.litote.kmongo:kmongo-coroutine-serialization", version.ref = "kmongo" }
 detekt = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt"}
-cozy-welcome = {module = "org.quiltmc.community:module-welcome", version.ref = "cozy-welcome"}
 dma = { module = "org.hyacinthbots:discord-moderation-actions", version.ref = "dma"}
 docgenerator = { module = "org.hyacinthbots:doc-generator", version.ref = "docgenerator" }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

src/main/kotlin/org/hyacinthbots/lilybot/LilyBot.kt

@@ -7,6 +7,7 @@ import com.kotlindiscord.kord.extensions.checks.hasPermission
 import com.kotlindiscord.kord.extensions.modules.extra.phishing.DetectionAction
 import com.kotlindiscord.kord.extensions.modules.extra.phishing.extPhishing
 import com.kotlindiscord.kord.extensions.modules.extra.pluralkit.extPluralKit
+import com.kotlindiscord.kord.extensions.modules.extra.welcome.welcomeChannel
 import dev.kord.common.entity.Permission
 import dev.kord.gateway.Intent
 import dev.kord.gateway.PrivilegedIntent
@@ -47,7 +48,6 @@ import org.hyacinthbots.lilybot.utils.database
 import org.hyacinthbots.lilybot.utils.getLoggingChannelWithPerms
 import org.kohsuke.github.GitHub
 import org.kohsuke.github.GitHubBuilder
-import org.quiltmc.community.cozy.modules.welcome.welcomeChannel
 import java.io.IOException
 import kotlin.io.path.Path
 import kotlin.time.Duration.Companion.minutes

src/main/kotlin/org/hyacinthbots/lilybot/database/collections/WelcomeChannelCollection.kt

@@ -14,7 +14,7 @@ import org.hyacinthbots.lilybot.database.Database
 import org.hyacinthbots.lilybot.database.entities.WelcomeChannelData
 import org.koin.core.component.inject
 import org.litote.kmongo.eq
-import org.quiltmc.community.cozy.modules.welcome.data.WelcomeChannelData as CozyWelcomeChannelData
+import com.kotlindiscord.kord.extensions.modules.extra.welcome.data.WelcomeChannelData as KordExWelcomeChannelData
 
 /**
  * This class contains the functions for interacting with the [Welcome channel database][WelcomeChannelData]. This class
@@ -26,7 +26,7 @@ import org.quiltmc.community.cozy.modules.welcome.data.WelcomeChannelData as Coz
  * @see setUrlForChannel
  * @see removeChannel
  */
-class WelcomeChannelCollection : KordExKoinComponent, CozyWelcomeChannelData {
+class WelcomeChannelCollection : KordExKoinComponent, KordExWelcomeChannelData {
 	private val db: Database by inject()
 
 	@PublishedApi