Merge branch 'develop'

# Conflicts: # gradle/libs.versions.toml
HyacinthBots · Dec 11, 2024 · 692fd61 · 692fd61
2 parents 0f4376a + 68f1bfe
commit 692fd61
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -83,6 +83,7 @@ kordEx {
 	addDependencies = false
 	addRepositories = false
 	kordExVersion = libs.versions.kord.extensions
+	ignoreIncompatibleKotlinVersion = true
 
 	bot {
 		dataCollection(DataCollection.None)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 # Plugins
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 shadow = "8.1.1"
 detekt = "1.23.7"
 git-hooks = "0.0.2"
@@ -9,9 +9,9 @@ blossom = "2.1.0"
 
 # Libraries
 kord-extensions = "2.3.1-20241123.224536-17"
-kordex-plugin = "1.5.3"
+kordex-plugin = "1.6.0"
 logging = "7.0.3"
-logback = "1.5.10"
+logback = "1.5.12"
 github-api = "1.326"
 kmongo = "5.1.0"
 docgenerator = "0.3.0-rc.2"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME