Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

**Fixed**

- Nothing yet!
- Fixed an issue where 3rd-party dependencies like `androidx` were included in the released Javadoc artifacts. Also updated the style of `capture-timber` and `capture-apollo` javadocs to match.

### iOS

Expand Down
6 changes: 3 additions & 3 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@ maven.install(
"com.google.code.findbugs:jsr305:3.0.2",

# Dokka (javadocs generator)
"org.jetbrains.dokka:analysis-kotlin-descriptors:1.9.10",
"org.jetbrains.dokka:dokka-base:1.9.10",
"org.jetbrains.dokka:dokka-cli:1.9.10",
"org.jetbrains.dokka:analysis-kotlin-descriptors:1.9.20",
"org.jetbrains.dokka:dokka-base:1.9.20",
"org.jetbrains.dokka:dokka-cli:1.9.20",

# Library dependencies
"com.google.code.gson:gson:2.10.1",
Expand Down
4 changes: 2 additions & 2 deletions bazel/android/dokka.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ def _sources_javadocs_impl(ctx):
-jar $dokka_cli_jar \
-pluginsClasspath $plugin_classpath \
-moduleName "Capture" \
-sourceSet "-src $sources_dir -noStdlibLink -noJdkLink" \
-sourceSet "-src $sources_dir -noStdlibLink -noJdkLink -perPackageOptions io.bitdrift.capture.*,-suppress;.*,+suppress" \
-outputDir $tmp_dir > /dev/null \
-pluginsConfiguration "org.jetbrains.dokka.base.DokkaBase={\\"footerMessage\\": \\"\\u00A9 2025 bitdrift, Inc.\\", \\"separateInheritedMembers\\": true}"
-pluginsConfiguration 'org.jetbrains.dokka.base.DokkaBase={"footerMessage": "© 2026 bitdrift, Inc.", "separateInheritedMembers": true}'

original_directory=$PWD
cd $tmp_dir
Expand Down
16 changes: 16 additions & 0 deletions platform/jvm/capture-apollo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,22 @@ dependencies {
testImplementation(libs.kotlin.mockito.kotlin)
}

tasks.withType<org.jetbrains.dokka.gradle.DokkaTask>().configureEach {
val dokkaBaseConfiguration = """{"footerMessage": "\u00A9 2026 bitdrift, Inc.", "separateInheritedMembers": true}"""
pluginsMapConfiguration.set(mapOf("org.jetbrains.dokka.base.DokkaBase" to dokkaBaseConfiguration))

dokkaSourceSets.configureEach {
perPackageOption {
matchingRegex.set("io\\.bitdrift\\.capture\\..*")
suppress.set(false)
}
perPackageOption {
matchingRegex.set(".*")
suppress.set(true)
}
}
}

mavenPublishing {
pom {
name.set("CaptureApollo")
Expand Down
16 changes: 16 additions & 0 deletions platform/jvm/capture-timber/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,22 @@ dependencies {
testImplementation(libs.kotlin.mockito.kotlin)
}

tasks.withType<org.jetbrains.dokka.gradle.DokkaTask>().configureEach {
val dokkaBaseConfiguration = """{"footerMessage": "\u00A9 2026 bitdrift, Inc.", "separateInheritedMembers": true}"""
pluginsMapConfiguration.set(mapOf("org.jetbrains.dokka.base.DokkaBase" to dokkaBaseConfiguration))

dokkaSourceSets.configureEach {
perPackageOption {
matchingRegex.set("io\\.bitdrift\\.capture\\..*")
suppress.set(false)
}
perPackageOption {
matchingRegex.set(".*")
suppress.set(true)
}
}
}

mavenPublishing {
pom {
name.set("CaptureTimber")
Expand Down
20 changes: 20 additions & 0 deletions test_dokka.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
tasks.withType<org.jetbrains.dokka.gradle.DokkaTask>().configureEach {
val dokkaBaseConfiguration = """
{
"footerMessage": "(c) 2025 bitdrift, Inc.",
"separateInheritedMembers": true
}
"""
pluginsMapConfiguration.set(mapOf("org.jetbrains.dokka.base.DokkaBase" to dokkaBaseConfiguration))

dokkaSourceSets.configureEach {
perPackageOption {
matchingRegex.set("io\\.bitdrift\\.capture\\..*")
suppress.set(false)
}
perPackageOption {
matchingRegex.set(".*")
suppress.set(true)
}
}
}
Loading