chore: upgrade deps

Author: typeparameter

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
-detekt = "1.23.7"
-dokka = "1.9.20"
+detekt = "1.23.8"
+dokka = "2.1.0"
 guice = "7.0.0"
 jakarta-inject = "2.0.1"
-junit = "5.11.1"
-kotlin = "2.0.20"
-ktlint-gradle = "12.1.1"
-mockk = "1.13.12"
+junit = "5.14.1"
+kotlin = "2.2.21"
+ktlint-gradle = "14.0.1"
+mockk = "1.14.6"
 
 [plugins]
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
@@ -20,4 +20,4 @@ guice = { module = "com.google.inject:guice", version.ref = "guice" }
 jakarta-inject = { module = "jakarta.inject:jakarta.inject-api", version.ref = "jakarta-inject" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
 junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
-mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
+mockk = { module = "io.mockk:mockk", version.ref = "mockk" }

kava/build.gradle.kts

@@ -1,14 +1,5 @@
-import org.jetbrains.dokka.base.DokkaBase
-import org.jetbrains.dokka.base.DokkaBaseConfiguration
-import org.jetbrains.dokka.gradle.DokkaTask
 import java.time.LocalDate
 
-buildscript {
-    dependencies {
-        classpath(libs.dokka.base)
-    }
-}
-
 plugins {
     id("maven-publish")
     id("signing")
@@ -83,33 +74,31 @@ publishing {
     }
 }
 
-tasks.withType<DokkaTask>().configureEach {
+dokka {
     moduleName.set(projectName)
 
-    dokkaSourceSets.configureEach {
-        pluginConfiguration<DokkaBase, DokkaBaseConfiguration> {
-            footerMessage = "© $copyrightRange Drew Davis"
-        }
-
+    dokkaSourceSets.main {
         sourceLink {
             localDirectory.set(rootDir)
-            remoteUrl.set(uri("$githubRepositoryUrl/tree/v${project.version}").toURL())
+            remoteUrl("$githubRepositoryUrl/tree/v${project.version}")
             remoteLineSuffix.set("#L")
         }
 
-        externalDocumentationLink {
+        externalDocumentationLinks.register("guice") {
             val guiceJavadocUri = "https://google.github.io/guice/api-docs/${libs.versions.guice.get()}/javadoc"
-            url.set(uri(guiceJavadocUri).toURL())
-
-            // Required until Dokka supports the new element-list standard
-            packageListUrl.set(uri("$guiceJavadocUri/element-list").toURL())
+            url(guiceJavadocUri)
+            packageListUrl("$guiceJavadocUri/element-list")
         }
     }
+
+    pluginsConfiguration.html {
+        footerMessage = "© $copyrightRange Drew Davis"
+    }
 }
 
 tasks.replace("javadocJar", Jar::class).apply {
-    dependsOn(tasks.dokkaHtml)
-    from(tasks.dokkaHtml.flatMap { it.outputDirectory })
+    dependsOn(tasks.dokkaGenerateHtml)
+    from(layout.buildDirectory.dir("dokka/html"))
     archiveClassifier.set("javadoc")
 }
 

kava/src/main/kotlin/dev/reifiedbeans/kava/Injector.kt

@@ -10,6 +10,4 @@ import kotlin.reflect.KClass
  * Rather than passing a Java [Class] (using Class::class.java syntax),
  * one can instead use the Kotlin [KClass] directly (using Class::class syntax).
  */
-fun <T : Any> Injector.getInstance(type: KClass<T>): T {
-    return this.getInstance(type.java)
-}
+fun <T : Any> Injector.getInstance(type: KClass<T>): T = this.getInstance(type.java)