Skip to content

Commit c50fd8a

Browse files
committed
Use standard javadoc
1 parent 18615ae commit c50fd8a

3 files changed

Lines changed: 26 additions & 14 deletions

File tree

.github/workflows/android.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ jobs:
5151
- name: Upload pages
5252
uses: actions/upload-pages-artifact@v3
5353
with:
54-
# Upload entire repository
55-
path: 'api/build/dokka/javadoc'
54+
path: 'api/build/javadoc'
5655
- name: Deploy to GitHub Pages
5756
id: deployment
5857
uses: actions/deploy-pages@v4

api/build.gradle.kts

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
plugins {
22
alias(libs.plugins.agp.lib)
3-
alias(libs.plugins.dokka)
4-
alias(libs.plugins.dokka.javadoc)
53
`maven-publish`
64
signing
75
}
@@ -37,16 +35,34 @@ dependencies {
3735
compileOnly(libs.annotation)
3836
}
3937

40-
dokka {
41-
dokkaSourceSets.register("main") {
42-
sourceRoots.from(file("src/main/java"))
38+
val androidJavadoc by tasks.registering(Javadoc::class) {
39+
title = "libxposed API $version"
40+
source(android.sourceSets["main"].java.srcDirs)
41+
destinationDir = layout.buildDirectory.dir("javadoc").get().asFile
42+
43+
(options as StandardJavadocDocletOptions).apply {
44+
links("https://docs.oracle.com/en/java/javase/17/docs/api/")
45+
links("https://developer.android.com/reference/")
46+
encoding = "UTF-8"
47+
charSet = "UTF-8"
48+
docEncoding = "UTF-8"
49+
addBooleanOption("Xdoclint:all,-missing", true)
50+
}
51+
52+
isFailOnError = false
53+
54+
val bootCp = project.extensions.getByType<com.android.build.api.variant.LibraryAndroidComponentsExtension>()
55+
.sdkComponents.bootClasspath
56+
57+
doFirst {
58+
classpath = files(bootCp.get()) + configurations["releaseCompileClasspath"]
4359
}
4460
}
4561

46-
val dokkaJavadocJar by tasks.registering(Jar::class) {
62+
val javadocJar by tasks.registering(Jar::class) {
4763
archiveClassifier.set("javadoc")
48-
dependsOn("dokkaGeneratePublicationJavadoc")
49-
from(layout.buildDirectory.dir("dokka/javadoc"))
64+
dependsOn(androidJavadoc)
65+
from(androidJavadoc.map { it.destinationDir!! })
5066
}
5167

5268
publishing {
@@ -55,7 +71,7 @@ publishing {
5571
artifactId = "api"
5672
group = "io.github.libxposed"
5773
version = "101.0.0"
58-
artifact(dokkaJavadocJar)
74+
artifact(javadocJar)
5975
pom {
6076
name.set("api")
6177
description.set("Modern Xposed API")

gradle/libs.versions.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
[versions]
22
annotation = "1.9.1"
33
agp = "9.1.0"
4-
dokka = "2.1.0"
54

65
[plugins]
76
agp-lib = { id = "com.android.library", version.ref = "agp" }
8-
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
9-
dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version.ref = "dokka" }
107

118
[libraries]
129
annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }

0 commit comments

Comments
 (0)