Finish migration

gradle.properties

@@ -23,7 +23,8 @@ kotlin.code.style=official
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true
 org.gradle.configuration-cache=true
-# Helpers for migrating to Dokka v2
-org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
+# Enable Dokka v2
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
 # The version of the THEOplayer Open Video UI for Android.
 version=1.9.4

gradle/libs.versions.toml

@@ -46,4 +46,5 @@ theoplayer-cast = { group = "com.theoplayer.theoplayer-sdk-android", name = "int
 android-application = { id = "com.android.application", version.ref = "gradle" }
 android-library = { id = "com.android.library", version.ref = "gradle" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-gradle-plugin" }
-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
+dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
+dokka-javadoc = { id = "org.jetbrains.dokka-javadoc" }

ui/build.gradle.kts

@@ -1,7 +1,3 @@
-import org.jetbrains.dokka.base.DokkaBase
-import org.jetbrains.dokka.base.DokkaBaseConfiguration
-import org.jetbrains.dokka.gradle.AbstractDokkaTask
-import org.jetbrains.dokka.gradle.DokkaTask
 import java.time.Year
 import kotlin.text.Typography.copyright
 
@@ -15,6 +11,7 @@ plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.dokka)
+    alias(libs.plugins.dokka.javadoc)
     id("maven-publish")
 }
 
@@ -94,10 +91,27 @@ dependencies {
     dokkaPlugin(libs.dokka.plugin)
 }
 
+dokka {
+    moduleName = rootProject.name
+
+    pluginsConfiguration.html {
+        customAssets.from("assets/logo-icon.svg")
+        footerMessage = "$copyright ${Year.now().value} THEO Technologies"
+    }
+
+    dokkaPublications.html {
+        outputDirectory = rootDir.resolve("site/api")
+    }
+
+    dokkaPublications.javadoc {
+        enabled = true
+    }
+}
+
 val dokkaJavadocJar = tasks.register<Jar>("dokkaJavadocJar") {
-    group = "documentation"
-    from(tasks.dokkaJavadoc)
-    dependsOn(tasks.dokkaJavadoc)
+    group = "dokka"
+    from(tasks.dokkaGeneratePublicationJavadoc)
+    dependsOn(tasks.dokkaGeneratePublicationJavadoc)
     archiveClassifier.set("javadoc")
 }
 
@@ -133,16 +147,3 @@ publishing {
         }
     }
 }
-
-tasks.withType<AbstractDokkaTask>().configureEach {
-    moduleName = rootProject.name
-
-    pluginConfiguration<DokkaBase, DokkaBaseConfiguration> {
-        customAssets = listOf(file("assets/logo-icon.svg"))
-        footerMessage = "$copyright ${Year.now().value} THEO Technologies"
-    }
-}
-
-tasks.named<DokkaTask>("dokkaHtml").configure {
-    outputDirectory.set(rootDir.resolve("site/api"))
-}