From a52eaf816a353622478616794bbf779ae8bf79cb Mon Sep 17 00:00:00 2001 From: Casey Brooks Date: Mon, 11 Mar 2019 11:48:30 -0500 Subject: [PATCH] Updates Orchid plugin version and adds Jackson module to code docs --- site/build.gradle.kts | 15 +++------------ site/src/orchid/resources/config.yml | 6 ++++-- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/site/build.gradle.kts b/site/build.gradle.kts index 4269d2f6..79800144 100644 --- a/site/build.gradle.kts +++ b/site/build.gradle.kts @@ -18,14 +18,11 @@ Commands: plugins { id("nebula.kotlin") - id("com.eden.orchidPlugin") version "0.15.4" + id("com.eden.orchidPlugin") version "0.16.4" } repositories { jcenter() - maven(url = "https://dl.bintray.com/javaeden/Orchid/") - maven(url = "https://dl.bintray.com/javaeden/Eden/") - maven(url = "https://jitpack.io") maven(url = "https://kotlin.bintray.com/kotlinx") } @@ -43,26 +40,20 @@ open class OrchidAlignmentRule : ComponentMetadataRule { dependencies { components.all(OrchidAlignmentRule::class.java) orchidCompile("io.github.javaeden.orchid:OrchidCore:+") - orchidRuntime("io.github.javaeden.orchid:OrchidCore:+") - orchidRuntime("io.github.javaeden.orchid:OrchidPages:+") + orchidRuntime("io.github.javaeden.orchid:OrchidDocs:+") orchidRuntime("io.github.javaeden.orchid:OrchidPluginDocs:+") - orchidRuntime("io.github.javaeden.orchid:OrchidSearch:+") orchidRuntime("io.github.javaeden.orchid:OrchidKotlindoc:+") - orchidRuntime("io.github.javaeden.orchid:OrchidSyntaxHighlighter:+") - orchidRuntime("io.github.javaeden.orchid:OrchidWiki:+") - orchidRuntime("io.github.javaeden.orchid:OrchidChangelog:+") } project.version = "${project.version}" orchid { theme = "StriktTheme" + baseUrl = "https://strikt.io/" if (project.hasProperty("env") && project.property("env") == "prod") { - baseUrl = "https://strikt.io/" environment = "prod" } else { - baseUrl = "http://localhost:8080" environment = "debug" } diff --git a/site/src/orchid/resources/config.yml b/site/src/orchid/resources/config.yml index 096c879f..20cc6ed9 100644 --- a/site/src/orchid/resources/config.yml +++ b/site/src/orchid/resources/config.yml @@ -43,6 +43,9 @@ theme: - type: 'page' title: 'Java Time Module' itemId: 'strikt.time' + - type: 'page' + title: 'Jackson Module' + itemId: 'strikt.jackson' - type: 'submenu' title: 'Information' icon: 'info-circle' @@ -71,8 +74,6 @@ services: # - type: requireChangelogVersion - type: ghPages branch: gh-pages - latestDirName: latest - publishType: CleanBranch username: robfletcher repo: strikt @@ -81,3 +82,4 @@ kotlindoc: - '../../../../strikt-core/src/main/kotlin/' - '../../../../strikt-protobuf/src/main/kotlin/' - '../../../../strikt-java-time/src/main/kotlin/' + - '../../../../strikt-jackson/src/main/kotlin/'