Migrate dokka to 2.0.0 (#1490)

This commit is contained in:
Luna712
2025-01-15 15:32:36 -07:00
committed by GitHub
parent 6da673c2ce
commit a4db6df792
5 changed files with 20 additions and 21 deletions

View File

@ -55,7 +55,7 @@ jobs:
run: | run: |
cd $GITHUB_WORKSPACE/src/ cd $GITHUB_WORKSPACE/src/
chmod +x gradlew chmod +x gradlew
./gradlew docs:dokkaHtml ./gradlew docs:dokkaGeneratePublicationHtml
- name: Copy Dokka - name: Copy Dokka
run: | run: |

View File

@ -178,7 +178,6 @@ dependencies {
// PlayBack // PlayBack
implementation(libs.colorpicker) // Subtitle Color Picker implementation(libs.colorpicker) // Subtitle Color Picker
// implementation(libs.media.ffmpeg) // Custom FFmpeg Lib for Audio Codecs
implementation(libs.newpipeextractor) // For Trailers implementation(libs.newpipeextractor) // For Trailers
implementation(libs.juniversalchardet) // Subtitle Decoding implementation(libs.juniversalchardet) // Subtitle Decoding

View File

@ -1,4 +1,3 @@
import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import java.net.URI import java.net.URI
@ -53,13 +52,10 @@ dependencies {
dokkaImplementation(libs.material) dokkaImplementation(libs.material)
dokkaImplementation(libs.constraintlayout) dokkaImplementation(libs.constraintlayout)
dokkaImplementation(libs.swiperefreshlayout) dokkaImplementation(libs.swiperefreshlayout)
dokkaImplementation(libs.coil)
dokkaImplementation(libs.coil.network.okhttp)
dokkaImplementation(libs.guava) dokkaImplementation(libs.guava)
dokkaImplementation(libs.auto.service.ksp) dokkaImplementation(libs.auto.service.ksp)
dokkaImplementation(libs.bundles.media3) dokkaImplementation(libs.bundles.media3)
dokkaImplementation(libs.colorpicker) // Subtitle Color Picker dokkaImplementation(libs.colorpicker) // Subtitle Color Picker
// dokkaImplementation(libs.media.ffmpeg) // Custom FFmpeg Lib for Audio Codecs
dokkaImplementation(libs.bundles.nextlibMedia3) dokkaImplementation(libs.bundles.nextlibMedia3)
dokkaImplementation(libs.newpipeextractor) dokkaImplementation(libs.newpipeextractor)
dokkaImplementation(libs.juniversalchardet) // Subtitle Decoding dokkaImplementation(libs.juniversalchardet) // Subtitle Decoding
@ -83,28 +79,30 @@ dependencies {
dokkaImplementation(libs.nicehttp) // HTTP Lib dokkaImplementation(libs.nicehttp) // HTTP Lib
} }
tasks.withType<DokkaTask>().configureEach { dokka {
dokkaSourceSets { dokkaSourceSets {
moduleName = "Cloudstream" moduleName = "Cloudstream"
register("cloudstream") { register("cloudstream") {
listOf("androidMain", "commonMain").forEach { srcName -> listOf("androidMain", "commonMain").forEach { srcName ->
sourceRoot("../library/src/$srcName/kotlin") sourceRoots.from("../library/src/$srcName/kotlin")
} }
sourceRoot(file("../app/src/main/java")) sourceRoots.from(file("../app/src/main/java"))
classpath.from(android.bootClasspath) classpath.from(android.bootClasspath)
classpath.from(dokkaImplementation.files) classpath.from(dokkaImplementation.files)
sourceLink { sourceLink {
localDirectory = file("..") localDirectory = file("..")
remoteUrl = URI("https://github.com/recloudstream/cloudstream/tree/master").toURL() remoteUrl("https://github.com/recloudstream/cloudstream/tree/master")
remoteLineSuffix = "#L" remoteLineSuffix = "#L"
} }
externalDocumentationLinks {
dokkaImplementation.dependencies.forEach { dokkaImplementation.dependencies.forEach {
externalDocumentationLink { register(it.name) {
url = URI("https://javadoc.io/doc/${it.group}/${it.name}/${it.version}").toURL() url = URI("https://javadoc.io/doc/${it.group}/${it.name}/${it.version}")
packageListUrl = URI("https://javadoc.io/doc/${it.group}/${it.name}/${it.version}/package-list").toURL() packageListUrl = URI("https://javadoc.io/doc/${it.group}/${it.name}/${it.version}/package-list")
}
} }
} }
} }

View File

@ -20,3 +20,7 @@ android.useAndroidX=true
# Kotlin code style for this project: "official" or "obsolete": # Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official kotlin.code.style=official
android.nonTransitiveRClass=true android.nonTransitiveRClass=true
# Dokka Gradle plugin V1 is deprecated, and will be removed in Dokka version 2.1.0
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true

View File

@ -3,17 +3,17 @@ acraCore = "5.11.3"
appcompat = "1.7.0" appcompat = "1.7.0"
autoServiceKsp = "1.2.0" autoServiceKsp = "1.2.0"
biometric = "1.2.0-alpha05" biometric = "1.2.0-alpha05"
buildkonfigGradlePlugin = "0.15.1" buildkonfigGradlePlugin = "0.15.2"
coil = "3.0.4" coil = "3.0.4"
colorpicker = "1.1.0" colorpicker = "1.1.0"
conscryptAndroid = "2.5.2" conscryptAndroid = "2.5.2"
constraintlayout = "2.2.0" constraintlayout = "2.2.0"
coreKtx = "1.15.0" coreKtx = "1.15.0"
desugar_jdk_libs_nio = "2.1.4" desugar_jdk_libs_nio = "2.1.4"
dokkaGradlePlugin = "1.9.10" dokkaGradlePlugin = "2.0.0"
espressoCore = "3.6.1" espressoCore = "3.6.1"
fuzzywuzzy = "1.4.0" fuzzywuzzy = "1.4.0"
gradle = "8.7.3" gradle = "8.8.0"
guava = "33.3.1-android" guava = "33.3.1-android"
jacksonModuleKotlin = "2.13.1" jacksonModuleKotlin = "2.13.1"
json = "20240303" json = "20240303"
@ -27,7 +27,6 @@ lifecycleLivedataKtx = "2.8.7"
lifecycleViewmodelKtx = "2.8.7" lifecycleViewmodelKtx = "2.8.7"
material = "1.12.0" material = "1.12.0"
media3 = "1.5.1" media3 = "1.5.1"
mediaFfmpeg = "1.1.0"
navigationFragmentKtx = "2.8.5" navigationFragmentKtx = "2.8.5"
navigationUiKtx = "2.8.5" navigationUiKtx = "2.8.5"
newpipeextractor = "v0.24.3" newpipeextractor = "v0.24.3"
@ -86,7 +85,6 @@ kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-c
lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtx" } lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtx" }
lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" } lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
material = { module = "com.google.android.material:material", version.ref = "material" } material = { module = "com.google.android.material:material", version.ref = "material" }
media-ffmpeg = { module = "com.github.recloudstream:media-ffmpeg", version.ref = "mediaFfmpeg" }
media3-cast = { module = "androidx.media3:media3-cast", version.ref = "media3" } media3-cast = { module = "androidx.media3:media3-cast", version.ref = "media3" }
media3-common = { module = "androidx.media3:media3-common", version.ref = "media3" } media3-common = { module = "androidx.media3:media3-common", version.ref = "media3" }
media3-datasource-okhttp = { module = "androidx.media3:media3-datasource-okhttp", version.ref = "media3" } media3-datasource-okhttp = { module = "androidx.media3:media3-datasource-okhttp", version.ref = "media3" }