diff options
| author | aleksZubakov <aleks.zubakov@gmail.com> | 2018-07-16 16:56:11 +0300 |
|---|---|---|
| committer | aleksZubakov <aleks.zubakov@gmail.com> | 2018-07-16 17:05:25 +0300 |
| commit | 755b701a4720bf1d0690935898f46dd36c205936 (patch) | |
| tree | ec2af23fc2a4c28c1b0e4f1d73ee55bd26845cf4 /core/src/main/kotlin/Utilities/DokkaModules.kt | |
| parent | b3e33f620a387d4623ed7f6d7665fcbed98efffb (diff) | |
| parent | f30807f4e78939fb59f8e46c39b3e538070aacfd (diff) | |
| download | dokka-755b701a4720bf1d0690935898f46dd36c205936.tar.gz dokka-755b701a4720bf1d0690935898f46dd36c205936.tar.bz2 dokka-755b701a4720bf1d0690935898f46dd36c205936.zip | |
Merge branch 'devsite-fixes-backport' into dev-multiplatf
# Conflicts:
# core/src/main/kotlin/Analysis/AnalysisEnvironment.kt
# core/src/test/kotlin/TestAPI.kt
Diffstat (limited to 'core/src/main/kotlin/Utilities/DokkaModules.kt')
| -rw-r--r-- | core/src/main/kotlin/Utilities/DokkaModules.kt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/src/main/kotlin/Utilities/DokkaModules.kt b/core/src/main/kotlin/Utilities/DokkaModules.kt index 36704918..732cbc48 100644 --- a/core/src/main/kotlin/Utilities/DokkaModules.kt +++ b/core/src/main/kotlin/Utilities/DokkaModules.kt @@ -2,14 +2,11 @@ package org.jetbrains.dokka.Utilities import com.google.inject.Binder import com.google.inject.Module -import com.google.inject.Provider import com.google.inject.TypeLiteral import com.google.inject.binder.AnnotatedBindingBuilder import com.google.inject.name.Names import org.jetbrains.dokka.* import org.jetbrains.dokka.Formats.FormatDescriptor -import org.jetbrains.dokka.Model.DescriptorSignatureProvider -import org.jetbrains.dokka.Samples.SampleProcessingService import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import java.io.File import kotlin.reflect.KClass @@ -27,8 +24,9 @@ class DokkaAnalysisModule(val environment: AnalysisEnvironment, val coreEnvironment = environment.createCoreEnvironment() binder.bind<KotlinCoreEnvironment>().toInstance(coreEnvironment) - val dokkaResolutionFacade = environment.createResolutionFacade(coreEnvironment) + val (dokkaResolutionFacade, libraryResolutionFacade) = environment.createResolutionFacade(coreEnvironment) binder.bind<DokkaResolutionFacade>().toInstance(dokkaResolutionFacade) + binder.bind<DokkaResolutionFacade>().annotatedWith(Names.named("libraryResolutionFacade")).toInstance(libraryResolutionFacade) binder.bind<DocumentationOptions>().toInstance(options) |