Merge pull request #62 from THEOplayer/release/1.10.0

Release 1.10.0

Author: MattiasBuelens

CHANGELOG.md

@@ -9,6 +9,10 @@
 > - 🏠 Internal
 > - 💅 Polish
 
+## v1.10.0 (2025-04-02)
+
+* 🚀 Added support for THEOplayer 9.0. ([#61](https://github.com/THEOplayer/android-ui/pulls/61))
+
 ## v1.9.4 (2024-12-18)
 
 * 🐛 Revert to `compileSdk` 34. ([#56](https://github.com/THEOplayer/android-ui/pull/56/))
@@ -40,7 +44,7 @@
 
 ## v1.8.0 (2024-09-06)
 
-* 🚀 Added support for THEOplayer 8.0.
+* 🚀 Added support for THEOplayer 8.0. ([#37](https://github.com/THEOplayer/android-ui/pulls/37))
 
 ## v1.7.4 (2024-09-02)
 

gradle.properties

@@ -23,5 +23,8 @@ kotlin.code.style=official
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true
 org.gradle.configuration-cache=true
+# 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
+version=1.10.0

gradle/libs.versions.toml

@@ -12,7 +12,7 @@ ui-test-junit4 = "1.7.5" # ...not in BOM for some reason?
 androidx-junit = "1.2.1"
 androidx-espresso = "3.6.1"
 androidx-mediarouter = "1.7.0"
-dokka = "1.9.20"
+dokka = "2.0.0"
 theoplayer = "8.6.2"
 
 [libraries]
@@ -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")
 }
 
@@ -87,17 +84,50 @@ dependencies {
 
     implementation(libs.theoplayer) {
         version {
-            strictly("[5.0, 9.0)")
+            strictly("[5.0, 10.0)")
         }
     }
 
     dokkaPlugin(libs.dokka.plugin)
 }
 
+dokka {
+    moduleName = rootProject.name
+
+    dokkaSourceSets.main {
+        sourceLink {
+            localDirectory = file("src/main/java")
+            remoteUrl("https://github.com/THEOplayer/android-ui/blob/${version}/ui/src/main/java")
+            remoteLineSuffix = "#L"
+        }
+
+        externalDocumentationLinks {
+            register("com.theoplayer.android.api") {
+                url("https://www.theoplayer.com/docs/theoplayer/v8/api-reference/android/")
+                // Default package-list URL doesn't work on theoplayer.com... Use GitHub for now.
+                packageListUrl("https://raw.githubusercontent.com/THEOplayer/documentation/refs/heads/main/theoplayer/static/theoplayer/v8/api-reference/android/package-list")
+            }
+        }
+    }
+
+    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 +163,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"))
-}