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/base/src/main/kotlin/DokkaBase.kt                | 16 ++++++++--------
 .../kotlin/renderers/html/HtmlRenderingOnlyTestBase.kt   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins/base/src')

diff --git a/plugins/base/src/main/kotlin/DokkaBase.kt b/plugins/base/src/main/kotlin/DokkaBase.kt
index 8fed0afd..bcd2c93e 100644
--- a/plugins/base/src/main/kotlin/DokkaBase.kt
+++ b/plugins/base/src/main/kotlin/DokkaBase.kt
@@ -135,7 +135,7 @@ class DokkaBase : DokkaPlugin() {
     }
 
     val htmlRenderer by extending {
-        CoreExtensions.renderer providing ::HtmlRenderer applyIf { format == "html" }
+        CoreExtensions.renderer providing ::HtmlRenderer
     }
 
     val defaultKotlinAnalysis by extending {
@@ -159,7 +159,7 @@ class DokkaBase : DokkaPlugin() {
     }
 
     val rootCreator by extending {
-        htmlPreprocessors with RootCreator applyIf { format == "html" }
+        htmlPreprocessors with RootCreator
     }
 
     val defaultSamplesTransformer by extending {
@@ -182,19 +182,19 @@ class DokkaBase : DokkaPlugin() {
     }
 
     val navigationPageInstaller by extending {
-        htmlPreprocessors with NavigationPageInstaller order { after(rootCreator) } applyIf { format == "html" }
+        htmlPreprocessors with NavigationPageInstaller order { after(rootCreator) }
     }
 
     val searchPageInstaller by extending {
-        htmlPreprocessors with SearchPageInstaller order { after(rootCreator) } applyIf { format == "html" }
+        htmlPreprocessors with SearchPageInstaller order { after(rootCreator) }
     }
 
     val resourceInstaller by extending {
-        htmlPreprocessors with ResourceInstaller order { after(rootCreator) } applyIf { format == "html" }
+        htmlPreprocessors with ResourceInstaller order { after(rootCreator) }
     }
 
     val styleAndScriptsAppender by extending {
-        htmlPreprocessors with StyleAndScriptsAppender order { after(rootCreator) } applyIf { format == "html" }
+        htmlPreprocessors with StyleAndScriptsAppender order { after(rootCreator) }
     }
 
     val packageListCreator by extending {
@@ -204,7 +204,7 @@ class DokkaBase : DokkaPlugin() {
                 "html",
                 "html"
             )
-        } order { after(rootCreator) } applyIf { format == "html" }
+        } order { after(rootCreator) }
     }
 
     val sourcesetDependencyAppender by extending {
@@ -216,4 +216,4 @@ class DokkaBase : DokkaPlugin() {
             MultimodulePageCreator(it)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/renderers/html/HtmlRenderingOnlyTestBase.kt b/plugins/base/src/test/kotlin/renderers/html/HtmlRenderingOnlyTestBase.kt
index 5ac5aafa..397a9c45 100644
--- a/plugins/base/src/test/kotlin/renderers/html/HtmlRenderingOnlyTestBase.kt
+++ b/plugins/base/src/test/kotlin/renderers/html/HtmlRenderingOnlyTestBase.kt
@@ -24,7 +24,7 @@ abstract class HtmlRenderingOnlyTestBase : RenderingOnlyTestBase<Element>() {
         DokkaBase().externalLocationProviderFactory to { ::JavadocExternalLocationProviderFactory },
         DokkaBase().externalLocationProviderFactory to { ::DokkaExternalLocationProviderFactory },
         testConfiguration = DokkaConfigurationImpl(
-            "", "", null, false, emptyList(), emptyList(), emptyMap(), emptyList(), false
+            "", null, false, emptyList(), emptyList(), emptyMap(), emptyList(), false
         )
     )
 
-- 
cgit