Change "useSilk" convention to change whether or not silk is a depend…

…ency
varabyte · Jan 7, 2022 · 52a4baa · 52a4baa
1 parent 71db160
commit 52a4baa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...ns/markdown/src/main/kotlin/com/varabyte/kobwebx/gradle/markdown/KobwebxMarkdownPlugin.kt b/...ns/markdown/src/main/kotlin/com/varabyte/kobwebx/gradle/markdown/KobwebxMarkdownPlugin.kt
@@ -15,10 +15,8 @@ class KobwebxMarkdownPlugin : Plugin<Project> {
         val kobwebxBlock = (project.extensions["kobwebx"] as ExtensionAware)
 
         val markdownConfig = kobwebxBlock.extensions.create("markdown", MarkdownConfig::class.java)
-        (markdownConfig as ExtensionAware).extensions.apply {
-            create("components", MarkdownComponents::class.java)
-            create("features", MarkdownFeatures::class.java)
-        }
+        val markdownComponents = (markdownConfig as ExtensionAware).extensions.create("components", MarkdownComponents::class.java)
+        (markdownConfig as ExtensionAware).extensions.create("features", MarkdownFeatures::class.java)
 
         val convertTask = project.tasks.register(
             "kobwebxMarkdownConvert",
@@ -28,6 +26,11 @@ class KobwebxMarkdownPlugin : Plugin<Project> {
         )
 
         project.afterEvaluate {
+            markdownComponents.useSilk.convention(project.configurations.asSequence()
+                .flatMap { config -> config.dependencies }
+                .any { dependency -> dependency.name == "kobweb-silk" }
+            )
+
             project.tasks.named("kobwebGenSite") {
                 dependsOn(convertTask)
             }

diff --git a/...xtensions/markdown/src/main/kotlin/com/varabyte/kobwebx/gradle/markdown/MarkdownConfig.kt b/...xtensions/markdown/src/main/kotlin/com/varabyte/kobwebx/gradle/markdown/MarkdownConfig.kt
@@ -168,8 +168,6 @@ abstract class MarkdownComponents {
     abstract val th: Property<NodeScope.(TableCell) -> String>
 
     init {
-        useSilk.convention(true)
-
         text.convention { text ->
             if (useSilk.get()) {
                 "$SILK.text.Text(\"${text.literal}\")"