aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authoraleksZubakov <aleks.zubakov@gmail.com>2018-08-06 17:14:28 +0300
committeraleksZubakov <aleks.zubakov@gmail.com>2018-08-06 17:14:28 +0300
commit4456ead8b702e4881321488969cb4ce1711e5663 (patch)
tree11d89258c16f21f880b49f6d559a675801fc35af /core
parent77ce80517f79a774ef985be47ae00db828e34273 (diff)
downloaddokka-4456ead8b702e4881321488969cb4ce1711e5663.tar.gz
dokka-4456ead8b702e4881321488969cb4ce1711e5663.tar.bz2
dokka-4456ead8b702e4881321488969cb4ce1711e5663.zip
Optional dependency bug workaround: google/guice#847
Diffstat (limited to 'core')
-rw-r--r--core/src/main/kotlin/Formats/FormatDescriptor.kt1
-rw-r--r--core/src/main/kotlin/Generation/FileGenerator.kt2
2 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/kotlin/Formats/FormatDescriptor.kt b/core/src/main/kotlin/Formats/FormatDescriptor.kt
index b497fb0f..4bac8aa0 100644
--- a/core/src/main/kotlin/Formats/FormatDescriptor.kt
+++ b/core/src/main/kotlin/Formats/FormatDescriptor.kt
@@ -25,6 +25,7 @@ abstract class FileGeneratorBasedFormatDescriptor : FormatDescriptor {
override fun configureOutput(binder: Binder): Unit = with(binder) {
bind<Generator>() toType NodeLocationAwareGenerator::class
bind<NodeLocationAwareGenerator>() toType generatorServiceClass
+ bind(generatorServiceClass.java) // https://github.com/google/guice/issues/847
bind<LanguageService>() toType languageServiceClass
diff --git a/core/src/main/kotlin/Generation/FileGenerator.kt b/core/src/main/kotlin/Generation/FileGenerator.kt
index d7b35581..eb6800b3 100644
--- a/core/src/main/kotlin/Generation/FileGenerator.kt
+++ b/core/src/main/kotlin/Generation/FileGenerator.kt
@@ -10,7 +10,7 @@ import java.io.OutputStreamWriter
class FileGenerator @Inject constructor(@Named("outputDir") override val root: File) : NodeLocationAwareGenerator {
@set:Inject(optional = true) var outlineService: OutlineFormatService? = null
- @set:Inject lateinit var formatService: FormatService
+ @set:Inject(optional = true) lateinit var formatService: FormatService
@set:Inject(optional = true) lateinit var dokkaConfiguration: DokkaConfiguration
@set:Inject(optional = true) var packageListService: PackageListService? = null