diff --git a/CHANGELOG.md b/CHANGELOG.md index b4149418e..4fa1ee595 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/MODULE.bazel b/MODULE.bazel index e510b6def..fcfef6a0d 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -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", diff --git a/bazel/android/dokka.bzl b/bazel/android/dokka.bzl index d03dd2aa0..6e7f7b93d 100644 --- a/bazel/android/dokka.bzl +++ b/bazel/android/dokka.bzl @@ -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 diff --git a/platform/jvm/capture-apollo/build.gradle.kts b/platform/jvm/capture-apollo/build.gradle.kts index 518e6e057..e58371383 100644 --- a/platform/jvm/capture-apollo/build.gradle.kts +++ b/platform/jvm/capture-apollo/build.gradle.kts @@ -69,6 +69,22 @@ dependencies { testImplementation(libs.kotlin.mockito.kotlin) } +tasks.withType().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") diff --git a/platform/jvm/capture-timber/build.gradle.kts b/platform/jvm/capture-timber/build.gradle.kts index c61c325de..f9f408465 100644 --- a/platform/jvm/capture-timber/build.gradle.kts +++ b/platform/jvm/capture-timber/build.gradle.kts @@ -69,6 +69,22 @@ dependencies { testImplementation(libs.kotlin.mockito.kotlin) } +tasks.withType().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")