Merge branch 'main' of https://github.com/DRSchlaubi/mikbot

DRSchlaubi · Dec 16, 2022 · 7836383 · 7836383
2 parents a8bdab0 + 347dfec
commit 7836383
Show file tree

Hide file tree

Showing 33 changed files with 47 additions and 47 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@ import java.nio.file.Files
 
 plugins {
     `mikbot-module`
-    kotlin("plugin.serialization") version "1.7.10"
+    kotlin("plugin.serialization") version "1.7.22"
     application
     // This exists to add the removeVersion extension to this buildscript
     id("dev.schlaubi.mikbot.gradle-plugin") apply false
@@ -36,13 +36,13 @@ dependencies {
     // Plugin system
     implementation("org.pf4j", "pf4j", "3.7.0")
     implementation("org.pf4j", "pf4j-update", "2.3.0")
-    implementation("com.google.code.gson", "gson", "2.9.1")
+    implementation("com.google.code.gson", "gson", "2.10")
     implementation("org.ow2.asm", "asm", "9.3") // pf4j doesn't declare a real dep on it
 
-    implementation("io.insert-koin", "koin-core", "3.2.0")
+    implementation("io.insert-koin", "koin-core", "3.2.2")
 
     // Util
-    implementation("org.jetbrains.kotlinx", "kotlinx-serialization-json", "1.4.0")
+    implementation("org.jetbrains.kotlinx", "kotlinx-serialization-json", "1.4.1")
 
     implementation(project(":api"))
     implementation(kotlin("reflect"))

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     groovy
     `kotlin-dsl`
-    kotlin("jvm") version "1.7.20"
-    kotlin("plugin.serialization") version "1.7.20"
+    kotlin("jvm") version "1.7.22"
+    kotlin("plugin.serialization") version "1.7.22"
 }
 
 repositories {
@@ -15,7 +15,7 @@ repositories {
 dependencies {
     implementation(kotlin("gradle-plugin"))
     implementation("dev.schlaubi", "gradle-plugin", "1.0.0")
-    implementation("com.google.devtools.ksp", "com.google.devtools.ksp.gradle.plugin", "1.7.20-1.0.8")
+    implementation("com.google.devtools.ksp", "com.google.devtools.ksp.gradle.plugin", "1.7.22-1.0.8")
     implementation("org.jlleitschuh.gradle", "ktlint-gradle", "11.0.0")
     implementation("com.github.gmazzo", "gradle-buildconfig-plugin", "3.1.0")
     implementation(gradleApi())

diff --git a/buildSrc/src/main/kotlin/Project.kt b/buildSrc/src/main/kotlin/Project.kt
@@ -1,4 +1,4 @@
 object Project {
     // Mikbot version (not core plugins)
-    const val version = "3.15.0"
+    const val version = "3.16.0"
 }
diff --git a/core/database-i18n/build.gradle.kts b/core/database-i18n/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.9.0"
+version = "2.10.0"
 
 dependencies {
     optionalPlugin(projects.core.gdpr)

diff --git a/core/game-animator/build.gradle.kts b/core/game-animator/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.9.0"
+version = "2.10.0"
 
 mikbotPlugin {
     description.set("Plugin changing the bots presence every 30 seconds")

diff --git a/core/gdpr/build.gradle.kts b/core/gdpr/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.7.0"
+version = "2.8.0"
 
 mikbotPlugin {
     description.set("Plugin adding functionality to comply with the GDPR")

diff --git a/core/health/build.gradle.kts b/core/health/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "1.5.0"
+version = "1.6.0"
 
 dependencies {
     plugin(projects.utils.ktor)

diff --git a/core/redeploy-hook/build.gradle.kts b/core/redeploy-hook/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.8.0"
+version = "2.9.0"
 
 mikbotPlugin {
     description.set("Plugin adding a /redeploy command, backed by a webhook")

diff --git a/game/connect-four/build.gradle.kts b/game/connect-four/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.8.0"
+version = "2.9.0"
 
 dependencies {
     implementation(projects.game.googleEmotes)

diff --git a/game/game-api/build.gradle.kts b/game/game-api/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "3.8.0"
+version = "3.9.0"
 
 dependencies {
     optionalPlugin(projects.core.gdpr)

diff --git a/game/googologo/build.gradle.kts b/game/googologo/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.8.0"
+version = "2.9.0"
 
 dependencies {
     implementation(projects.game.googleEmotes)

diff --git a/game/googolplex/build.gradle.kts b/game/googolplex/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.8.0"
+version = "2.9.0"
 
 dependencies {
     plugin(projects.game.gameApi)

diff --git a/game/multiple-choice-game/build.gradle.kts b/game/multiple-choice-game/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.7.0"
+version = "2.8.0"
 
 dependencies {
     plugin(projects.game.gameApi)

diff --git a/game/music-quiz/build.gradle.kts b/game/music-quiz/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.10.0"
+version = "2.11.0"
 
 dependencies {
     plugin(projects.game.gameApi)

diff --git a/game/tic-tac-toe/build.gradle.kts b/game/tic-tac-toe/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.8.0"
+version = "2.9.0"
 
 dependencies {
     plugin(projects.game.gameApi)

diff --git a/game/trivia/build.gradle.kts b/game/trivia/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.10.0"
+version = "2.11.0"
 
 dependencies {
     plugin(projects.game.gameApi)

diff --git a/game/uno-game/build.gradle.kts b/game/uno-game/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.8.0"
+version = "2.9.0"
 
 dependencies {
     plugin(projects.game.gameApi)

diff --git a/game/uno/build.gradle.kts b/game/uno/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 group = "dev.schlaubi"
-version = "2.7.0"
+version = "2.8.0"
 
 repositories {
     mavenCentral()

diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts
@@ -3,19 +3,19 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     id("com.gradle.plugin-publish") version "1.0.0-rc-3"
     `java-gradle-plugin`
-    kotlin("jvm") version "1.7.10"
-    kotlin("plugin.serialization") version "1.7.10"
+    kotlin("jvm") version "1.7.22"
+    kotlin("plugin.serialization") version "1.7.22"
 }
 
 group = "dev.schlaubi"
-version = "2.6.3"
+version = "2.6.4"
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlinx", "kotlinx-serialization-json", "1.4.0")
+    implementation("org.jetbrains.kotlinx", "kotlinx-serialization-json", "1.4.1")
     implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8", "1.6.4")
     compileOnly(kotlin("gradle-plugin"))
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,11 +1,11 @@
 [versions]
 kordex = "1.5.5-SNAPSHOT"
-kmongo = "4.7.2"
-pf4j = "3.7.0"
+kmongo = "4.8.0"
+pf4j = "3.8.0"
 coroutines = "1.6.4"
-serialization = "1.4.0"
-ktor = "2.1.3"
-kord = "0.8.x-SNAPSHOT"
+serialization = "1.4.1"
+ktor = "2.2.1"
+kord = "0.8.0-M17"
 
 [libraries]
 kord-rest = { group = "dev.kord", name = "kord-rest", version.ref = "kord" }
@@ -22,15 +22,15 @@ kmongo-id-serialization = { group = "org.litote.kmongo", name = "kmongo-id-seria
 pf4j = { group = "org.pf4j", name = "pf4j", version.ref = "pf4j" }
 stdx-full = {group = "dev.schlaubi", name = "stdx-full", version = "1.2.1" }
 envconf = { group = "dev.schlaubi", name = "envconf", version = "1.1" }
-logback-classic = { group = "ch.qos.logback", name = "logback-classic", version = "1.4.0" }
+logback-classic = { group = "ch.qos.logback", name = "logback-classic", version = "1.4.5" }
 commons-text = { group = "org.apache.commons", name = "commons-text", version = "1.10.0" }
 google-cloud-bom = { group = "com.google.cloud", name = "libraries-bom", version = "26.1.4" }
 google-cloud-translate = { group = "com.google.cloud", name = "google-cloud-translate" }
 google-apis-youtube = { group = "com.google.apis", name = "google-api-services-youtube", version = "v3-rev20220926-2.0.0" }
 lavakord-kord = { group = "dev.schlaubi.lavakord", name = "kord", version = "3.7.0" }
 spotify = { group = "se.michaelthelin.spotify", name = "spotify-web-api-java", version = "7.2.2" }
 krontab = { group = "dev.inmo", name = "krontab", version = "0.8.2" }
-ksp-api = { group = "com.google.devtools.ksp", name = "symbol-processing-api", version = "1.7.10-1.0.6" }
+ksp-api = { group = "com.google.devtools.ksp", name = "symbol-processing-api", version = "1.7.22-1.0.8" }
 rhino = { group = "org.mozilla", name = "rhino", version = "1.7.14" }
 ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }

diff --git a/music/build.gradle.kts b/music/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.12.0"
+version = "2.13.0"
 
 dependencies {
     api(libs.lavakord.kord)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.gradle.enterprise") version "3.11.1"
+    id("com.gradle.enterprise") version "3.12"
 }
 
 gradleEnterprise {

diff --git a/utils/birthdays/build.gradle.kts b/utils/birthdays/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.schlaubi"
-version = "1.7.1"
+version = "1.8.0"
 
 dependencies {
     plugin(projects.utils.ktor)

diff --git a/utils/botblock/build.gradle.kts b/utils/botblock/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.schlaubi"
-version = "2.8.0"
+version = "2.9.0"
 
 mikbotPlugin {
     description.set("Plugin adding support to post server counts to server lists using botblock")

diff --git a/utils/epic-games-notifier/build.gradle.kts b/utils/epic-games-notifier/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.schlaubi"
-version = "3.7.0"
+version = "3.8.0"
 
 dependencies {
     plugin(projects.utils.ktor)

diff --git a/utils/eval/build.gradle.kts b/utils/eval/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.7.0"
+version = "2.8.0"
 
 dependencies {
     implementation(libs.rhino)

diff --git a/utils/ktor/build.gradle.kts b/utils/ktor/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.schlaubi"
-version = "2.8.0"
+version = "2.9.0"
 
 dependencies {
     // Verification Server

diff --git a/utils/leaderboard/build.gradle.kts b/utils/leaderboard/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.10.0"
+version = "2.11.0"
 
 dependencies {
     optionalPlugin(projects.core.gdpr)

diff --git a/utils/profiles/build.gradle.kts b/utils/profiles/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.10.0"
+version = "2.11.0"
 
 repositories {
     maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")

diff --git a/utils/role-selector/build.gradle.kts b/utils/role-selector/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "3.5.0"
+version = "3.6.0"
 
 mikbotPlugin {
     description.set("Give Roles on a specific Event")

diff --git a/utils/verification-system/build.gradle.kts b/utils/verification-system/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.9.1"
+version = "2.10.0"
 
 dependencies {
     plugin(projects.utils.ktor)

diff --git a/votebot/build.gradle.kts b/votebot/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     `mikbot-bot`
 }
 
-val versionString = "3.22.1" // version marker
+val versionString = "3.23.0" // version marker
 
 version = versionString