diff options
| author | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-12-05 15:42:20 +0300 |
|---|---|---|
| committer | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-12-05 15:42:20 +0300 |
| commit | 14ba5834fa3fff98672166dd24c05bd7aa13dc2a (patch) | |
| tree | 3cb7aad210f1e2b0608c509839f588696f657636 /core/src/main/kotlin/javadoc | |
| parent | 3098b8e7665bcda25f8ead2496c161e10512d7b3 (diff) | |
| download | dokka-14ba5834fa3fff98672166dd24c05bd7aa13dc2a.tar.gz dokka-14ba5834fa3fff98672166dd24c05bd7aa13dc2a.tar.bz2 dokka-14ba5834fa3fff98672166dd24c05bd7aa13dc2a.zip | |
Fix overriding of default analysis services
Diffstat (limited to 'core/src/main/kotlin/javadoc')
| -rw-r--r-- | core/src/main/kotlin/javadoc/dokka-adapters.kt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/src/main/kotlin/javadoc/dokka-adapters.kt b/core/src/main/kotlin/javadoc/dokka-adapters.kt index bed211f6..4676db18 100644 --- a/core/src/main/kotlin/javadoc/dokka-adapters.kt +++ b/core/src/main/kotlin/javadoc/dokka-adapters.kt @@ -4,9 +4,7 @@ import com.google.inject.Binder import com.google.inject.Inject import com.sun.tools.doclets.formats.html.HtmlDoclet import org.jetbrains.dokka.* -import org.jetbrains.dokka.Formats.FormatDescriptor -import org.jetbrains.dokka.Formats.FormatDescriptorAnalysisComponent -import org.jetbrains.dokka.Formats.KotlinAsJava +import org.jetbrains.dokka.Formats.* import org.jetbrains.dokka.Utilities.bind import org.jetbrains.dokka.Utilities.toType @@ -31,7 +29,10 @@ class JavadocGenerator @Inject constructor(val options: DocumentationOptions, va } } -class JavadocFormatDescriptor : FormatDescriptor, FormatDescriptorAnalysisComponent by KotlinAsJava { +class JavadocFormatDescriptor : + FormatDescriptor, + DefaultAnalysisComponent, + DefaultAnalysisComponentServices by KotlinAsJava { override fun configureOutput(binder: Binder): Unit = with(binder) { bind<Generator>() toType JavadocGenerator::class |