From 51377df14fcbc326a79fcee0975d29b5ca014a85 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Thu, 16 Mar 2017 17:19:30 +0300
Subject: Deprecate old kotlin-website formats

---
 .../src/main/kotlin/Formats/KotlinWebsiteFormatService.kt | 15 +++++++++++++--
 core/src/main/kotlin/Utilities/DokkaModules.kt            |  3 ++-
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'core/src/main/kotlin')

diff --git a/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt b/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt
index eac053aa..08349980 100644
--- a/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt
+++ b/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt
@@ -174,9 +174,14 @@ open class KotlinWebsiteOutputBuilder(to: StringBuilder,
 
 class KotlinWebsiteFormatService @Inject constructor(locationService: LocationService,
                                                      signatureGenerator: LanguageService,
-                                                     @Named(impliedPlatformsName) impliedPlatforms: List<String>)
+                                                     @Named(impliedPlatformsName) impliedPlatforms: List<String>,
+                                                     logger: DokkaLogger)
     : JekyllFormatService(locationService, signatureGenerator, "html", impliedPlatforms)
 {
+    init {
+        logger.warn("Format kotlin-website deprecated and will be removed in next release")
+    }
+
     override fun createOutputBuilder(to: StringBuilder, location: Location) =
         KotlinWebsiteOutputBuilder(to, location, locationService, languageService, extension, impliedPlatforms)
 }
@@ -204,8 +209,14 @@ class KotlinWebsiteRunnableSamplesOutputBuilder(to: StringBuilder,
 
 class KotlinWebsiteRunnableSamplesFormatService @Inject constructor(locationService: LocationService,
                                                                     signatureGenerator: LanguageService,
-                                                                    @Named(impliedPlatformsName) impliedPlatforms: List<String>)
+                                                                    @Named(impliedPlatformsName) impliedPlatforms: List<String>,
+                                                                    logger: DokkaLogger)
     : JekyllFormatService(locationService, signatureGenerator, "html", impliedPlatforms) {
+
+    init {
+        logger.warn("Format kotlin-website-samples deprecated and will be removed in next release")
+    }
+
     override fun createOutputBuilder(to: StringBuilder, location: Location) =
             KotlinWebsiteRunnableSamplesOutputBuilder(to, location, locationService, languageService, extension, impliedPlatforms)
 }
diff --git a/core/src/main/kotlin/Utilities/DokkaModules.kt b/core/src/main/kotlin/Utilities/DokkaModules.kt
index 5982d7dd..e213c0fc 100644
--- a/core/src/main/kotlin/Utilities/DokkaModules.kt
+++ b/core/src/main/kotlin/Utilities/DokkaModules.kt
@@ -19,6 +19,8 @@ class DokkaAnalysisModule(val environment: AnalysisEnvironment,
                           val nodeReferenceGraph: NodeReferenceGraph,
                           val logger: DokkaLogger) : Module {
     override fun configure(binder: Binder) {
+        binder.bind<DokkaLogger>().toInstance(logger)
+
         val descriptor = ServiceLocator.lookup<FormatDescriptor>("format", options.outputFormat)
 
         binder.registerCategory<LanguageService>("language")
@@ -33,7 +35,6 @@ class DokkaAnalysisModule(val environment: AnalysisEnvironment,
         binder.bind<DokkaResolutionFacade>().toInstance(dokkaResolutionFacade)
 
         binder.bind<DocumentationOptions>().toInstance(options)
-        binder.bind<DokkaLogger>().toInstance(logger)
 
         binder.bind<DefaultPlatformsProvider>().toInstance(defaultPlatformsProvider)
 
-- 
cgit