From ed3760ede28a37c0e0e485a3c4685ea201dc5835 Mon Sep 17 00:00:00 2001 From: Michael Rittmeister Date: Sun, 17 Nov 2024 16:25:34 +0100 Subject: [PATCH] Dependency bumps --- build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Git.kt | 13 ------------- buildSrc/src/main/kotlin/Projects.kt | 16 ---------------- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 8 ++++---- 5 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 buildSrc/src/main/kotlin/Git.kt delete mode 100644 buildSrc/src/main/kotlin/Projects.kt diff --git a/build.gradle.kts b/build.gradle.kts index 7aaa0338..21bad83b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } group = "dev.schlaubi.lavakord" -version = "8.0.0" +version = "8.1.0" allprojects { repositories { diff --git a/buildSrc/src/main/kotlin/Git.kt b/buildSrc/src/main/kotlin/Git.kt deleted file mode 100644 index 321fe3fb..00000000 --- a/buildSrc/src/main/kotlin/Git.kt +++ /dev/null @@ -1,13 +0,0 @@ -import org.gradle.api.Project -import java.io.ByteArrayOutputStream - -internal fun Project.git(vararg command: String): String { - val output = ByteArrayOutputStream() - exec { - commandLine("git", *command) - standardOutput = output - errorOutput = output - workingDir = rootDir - }.rethrowFailure().assertNormalExitValue() - return output.toString().trim() -} diff --git a/buildSrc/src/main/kotlin/Projects.kt b/buildSrc/src/main/kotlin/Projects.kt deleted file mode 100644 index dceca394..00000000 --- a/buildSrc/src/main/kotlin/Projects.kt +++ /dev/null @@ -1,16 +0,0 @@ -import org.gradle.api.NamedDomainObjectContainer -import org.gradle.api.NamedDomainObjectProvider -import org.gradle.kotlin.dsl.named -import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet - -val NamedDomainObjectContainer.jvmMain: NamedDomainObjectProvider - get() = named("jvmMain") - -val NamedDomainObjectContainer.jvmTest: NamedDomainObjectProvider - get() = named("jvmTest") - -val NamedDomainObjectContainer.jsMain: NamedDomainObjectProvider - get() = named("jsMain") - -val NamedDomainObjectContainer.jsTest: NamedDomainObjectProvider - get() = named("jsTest") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72b..94113f20 100644 --- 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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle.kts b/settings.gradle.kts index 1401aaca..7b98cb8e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -52,7 +52,7 @@ dependencyResolutionManagement { library("kotlinx-nodejs", "org.jetbrains.kotlin-wrappers", "kotlin-node").version("22.5.4-pre.820") library("lavalink-protocol", "dev.arbjerg.lavalink", "protocol").version("4.0.8") - library("lyrics-protocol", "dev.schlaubi.lyrics", "protocol").version("2.5.0") + library("lyrics-protocol", "dev.schlaubi.lyrics", "protocol").version("2.6.1") library( "lavasearch-protocol", "com.github.topi314.lavasearch", @@ -64,7 +64,7 @@ dependencyResolutionManagement { "protocol" ).version("4.3.0") - library("kotlinpoet", "com.squareup", "kotlinpoet-ksp").version("1.18.1") + library("kotlinpoet", "com.squareup", "kotlinpoet-ksp").version("2.0.0") library("codegen", "dev.kord.codegen", "kotlinpoet").versionRef(codegen) library("codegen-ksp", "dev.kord.codegen", "ksp").versionRef(codegen) @@ -86,7 +86,7 @@ fun VersionCatalogBuilder.kotlinx() { } fun VersionCatalogBuilder.ktor() { - val ktor = version("ktor", "3.0.0") + val ktor = version("ktor", "3.0.1") library("ktor-io", "io.ktor", "ktor-io").versionRef(ktor) library("ktor-utils", "io.ktor", "ktor-utils").versionRef(ktor) library("ktor-client-websockets", "io.ktor", "ktor-client-websockets").versionRef(ktor) @@ -101,7 +101,7 @@ fun VersionCatalogBuilder.ktor() { } fun VersionCatalogBuilder.ksp() { - val ksp = version("ksp", "2.0.21-1.0.26") + val ksp = version("ksp", "2.0.21-1.0.28") library("ksp-api", "com.google.devtools.ksp", "symbol-processing-api").versionRef(ksp) plugin("ksp", "com.google.devtools.ksp").versionRef(ksp) plugin("gradle-tools", "dev.kord.gradle-tools").version("1.7.1")