From 0533ef9a56ae34138a3f8a5e996805713c48c384 Mon Sep 17 00:00:00 2001
From: Paweł Marks <pmarks@virtuslab.com>
Date: Wed, 1 Jul 2020 17:36:50 +0200
Subject: Add overrides to provided plugins

---
 plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt | 13 +++++--------
 1 file changed, 5 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 6e467542..7b4aa64d 100644
--- a/plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt
+++ b/plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt
@@ -15,13 +15,10 @@ class JavadocPlugin : DokkaPlugin() {
     val locationProviderFactory by extensionPoint<JavadocLocationProviderFactory>()
 
     val dokkaJavadocPlugin by extending {
-        CoreExtensions.renderer providing { ctx ->
-            KorteJavadocRenderer(
-                dokkaBasePlugin.querySingle { outputWriter },
-                ctx,
-                "views"
-            )
-        } applyIf { format == "javadoc" }
+        (CoreExtensions.renderer
+                providing { ctx -> KorteJavadocRenderer(dokkaBasePlugin.querySingle { outputWriter }, ctx, "views") }
+                applyIf { format == "javadoc" }
+                override dokkaBasePlugin.htmlRenderer)
     }
 
     val pageTranslator by extending {
@@ -31,7 +28,7 @@ class JavadocPlugin : DokkaPlugin() {
                 dokkaBasePlugin.querySingle { signatureProvider },
                 context.logger
             )
-        }
+        } override dokkaBasePlugin.documentableToPageTranslator
     }
 
     val javadocLocationProviderFactory by extending {
-- 
cgit