Skip to content

Fix classpath when source set has no metadata compilations #4296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Parent: Support AGP with Kotlin Built-in
wants to merge 1 commit into
base: adam/support-agp-kotlin-builtin
Choose a base branch
from
Draft

Fix classpath when source set has no metadata compilations #4296

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 23 additions & 3 deletions dokka-runners/dokka-gradle-plugin/src/main/kotlin/adapters/KotlinAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,10 @@ abstract class KotlinAdapter @Inject constructor(

private fun determineClasspath(
details: KotlinSourceSetDetails
): Provider<FileCollection> {
return details.primaryCompilations.map { compilations: List<KotlinCompilationDetails> ->
): FileCollection {
val aggregatedClasspath = objects.fileCollection()

val directClasspath = details.primaryCompilations.map { compilations: List<KotlinCompilationDetails> ->
val classpath = objects.fileCollection()

if (compilations.isNotEmpty()) {
Expand All @@ -200,6 +202,24 @@ abstract class KotlinAdapter @Inject constructor(
.from(details.sourceDirectoriesOfDependents)
}
}
aggregatedClasspath.from(directClasspath)

val combinedClasspath = details.allCompilations.map { compilations: List<KotlinCompilationDetails> ->
val classpath = objects.fileCollection()

if (compilations.none { it.isMetadata }) {
logger.info("[$dkaName] No metadata compilation found for ${details.name}, also including all compilations")
classpath.from(compilations.map { it.compilationClasspath })
compilations.fold(classpath) { acc, compilation ->
acc.from(compilation.compilationClasspath)
}
}

classpath
}
aggregatedClasspath.from(combinedClasspath)

return aggregatedClasspath
}

@InternalDokkaGradlePluginApi
Expand Down Expand Up @@ -335,7 +355,7 @@ private class KotlinCompilationDetailsBuilder(
dependentSourceSetNames = dependentSourceSetNames.toSet(),
compilationClasspath = compilationClasspath,
defaultSourceSetName = compilation.defaultSourceSet.name,
isMetadata = compilation is KotlinMetadataTarget,
isMetadata = compilation.target is KotlinMetadataTarget,
)
}

Expand Down
Loading