From 2c967fb5389b0f7891b59d8a9334e4efca546b46 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Thu, 9 Jul 2020 16:30:36 +0200
Subject: Remove `format` from dokka DokkaConfiguration

---
 plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'plugins/javadoc/src/main/kotlin')

diff --git a/plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt b/plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt
index 1a14e97e..8283bd78 100644
--- a/plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt
+++ b/plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt
@@ -20,7 +20,6 @@ class JavadocPlugin : DokkaPlugin() {
     val dokkaJavadocPlugin by extending {
         (CoreExtensions.renderer
                 providing { ctx -> KorteJavadocRenderer(dokkaBasePlugin.querySingle { outputWriter }, ctx, "views") }
-                applyIf { format == javadocFormat }
                 override dokkaBasePlugin.htmlRenderer)
     }
 
@@ -31,13 +30,13 @@ class JavadocPlugin : DokkaPlugin() {
                 dokkaBasePlugin.querySingle { signatureProvider },
                 context.logger
             )
-        } override dokkaBasePlugin.documentableToPageTranslator applyIf { format == javadocFormat }
+        } override dokkaBasePlugin.documentableToPageTranslator
     }
 
     val javadocLocationProviderFactory by extending {
         locationProviderFactory providing { context ->
             JavadocLocationProviderFactory(context)
-        } applyIf { format == javadocFormat }
+        }
     }
 
     val javadocSignatureProvider by extending {
@@ -48,11 +47,7 @@ class JavadocPlugin : DokkaPlugin() {
                     dokkaBasePlugin.commentsToContentConverter
                 ), ctx.logger
             )
-        } override kotinAsJavaPlugin.javaSignatureProvider applyIf { format == javadocFormat }
-    }
-
-    companion object {
-        private val javadocFormat = "javadoc"
+        } override kotinAsJavaPlugin.javaSignatureProvider
     }
 }
 
-- 
cgit