Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
- Update Kotlin to 2.0.20
- Update Gradle to 8.10
- Update JDA to 5.1.0
- Update kotlinx-atomicfu to 0.25.0
- Update junit-jupiter-engine to 5.11.0
- Update slf4j-simple to 2.0.16
- Update kotlin-node to 20.14.10-pre.800
- Update lavalink-protocol to 4.0.7
- Update lyrics-protocol to 2.5.0
- Update kotlinpoet-ksp to 1.18.1
- Update codegen-kt to main-SNAPSHOT
- Update kotlinx-serialization-json to 1.7.2
- Update kotlinx-datetime to 0.6.1
- Update ksp to 2.0.20-1.0.24
- Update kord-gradle-tools to 1.6.2
  • Loading branch information
DRSchlaubi committed Sep 2, 2024
1 parent c1025cb commit 1046449
Show file tree
Hide file tree
Showing 18 changed files with 111 additions and 131 deletions.
4 changes: 3 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ subprojects {
apply<KordGradlePlugin>()
configure<KordExtension> {
publicationName = "mavenCentral"
jvmTarget = JvmTarget.JVM_17
if (jvmTarget.get() <= JvmTarget.JVM_17) {
jvmTarget = JvmTarget.JVM_17
}
}
}
group = rootProject.group
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {
}

dependencies {
val kotlinVersion = "2.0.0"
val kotlinVersion = "2.0.20"
implementation(kotlin("gradle-plugin", kotlinVersion))
implementation(kotlin("serialization", kotlinVersion))
implementation(kotlin("gradle-plugin-api", kotlinVersion))
Expand Down
4 changes: 0 additions & 4 deletions buildSrc/src/main/kotlin/lavalink-jvm-module.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,4 @@ tasks {
withType<Test> {
useJUnitPlatform()
}

task("publishForCurrentOs") {
dependsOn("publishAllPublicationsToMavenCentralRepository")
}
}
2 changes: 1 addition & 1 deletion core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
`lavalink-module`
`lavalink-publishing`
kotlin("plugin.serialization")
id("kotlinx-atomicfu")
alias(libs.plugins.kotlinx.atomicfu)
alias(libs.plugins.ksp)
}

Expand Down
13 changes: 5 additions & 8 deletions example/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
java
kotlin("multiplatform")
alias(libs.plugins.gradle.tools)
}

group = "me.schlaubi.lavakord"
Expand Down Expand Up @@ -56,12 +59,6 @@ kotlin {
}
}

tasks {
withType<JavaCompile> {
options.compilerArgs.add("--enable-preview")
}

withType<JavaExec> {
args!!.add("--enable-preview")
}
kord {
jvmTarget = JvmTarget.JVM_21
}
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ SONATYPE_CONNECT_TIMEOUT_SECONDS=300
nextPlannedVersion=6.4.0
kotlinx.atomicfu.enableJvmIrTransformation=true
kotlinx.atomicfu.enableJsIrTransformation=true
kotlin.suppressGradlePluginWarnings=IncorrectCompileOnlyDependencyWarning
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
2 changes: 1 addition & 1 deletion jda/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {
api(projects.core)
api(libs.kotlinlogging)
api(libs.kotlinx.coroutines.jdk8)
api("net.dv8tion:JDA:5.0.0-beta.24") {
api("net.dv8tion:JDA:5.1.0") {
exclude(module = "opus-java")
}
}
Expand Down
2 changes: 1 addition & 1 deletion jda/src/main/kotlin/dev/schlaubi/lavakord/jda/JDA.kt
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public sealed class AbstractLavakordJda : VoiceDispatchInterceptor, EventListene
* @see VoiceDispatchInterceptor.onVoiceServerUpdate
*/
override fun onVoiceStateUpdate(update: VoiceDispatchInterceptor.VoiceStateUpdate): Boolean =
internalLavakord?.onVoiceStateUpdate(update) ?: false
internalLavakord?.onVoiceStateUpdate(update) == true
}

/**
Expand Down
Loading

0 comments on commit 1046449

Please sign in to comment.