Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates Orchid plugin version and adds Jackson module to code docs #144

Merged
merged 2 commits into from Mar 12, 2019
Merged

Updates Orchid plugin version and adds Jackson module to code docs #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a52eaf8
Updates Orchid plugin version and adds Jackson module to code docs
cjbrooks12 Mar 11, 2019
6892e07
Merge branch 'master' into master
robfletcher Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 2 additions & 11 deletions site/build.gradle.kts
View file
Open in desktop
Expand Up @@ -23,23 +23,15 @@ plugins {

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")
}

dependencies {
orchidCompile("io.github.javaeden.orchid:OrchidCore:0.16.4")

orchidRuntime("io.github.javaeden.orchid:OrchidCore:0.16.4")
orchidRuntime("io.github.javaeden.orchid:OrchidPages:0.16.4")
orchidRuntime("io.github.javaeden.orchid:OrchidDocs:0.16.4")
orchidRuntime("io.github.javaeden.orchid:OrchidPluginDocs:0.16.4")
orchidRuntime("io.github.javaeden.orchid:OrchidSearch:0.16.4")
orchidRuntime("io.github.javaeden.orchid:OrchidKotlindoc:0.16.4")
orchidRuntime("io.github.javaeden.orchid:OrchidSyntaxHighlighter:0.16.4")
orchidRuntime("io.github.javaeden.orchid:OrchidWiki:0.16.4")
orchidRuntime("io.github.javaeden.orchid:OrchidChangelog:0.16.4")
}

project.version = "${project.version}"
Expand All @@ -51,12 +43,11 @@ orchid {
evaluationDependsOn(":strikt-protobuf")

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"
}

Expand Down
2 changes: 0 additions & 2 deletions site/src/orchid/resources/config.yml
View file
Open in desktop
Expand Up @@ -74,8 +74,6 @@ services:
# - type: requireChangelogVersion
- type: ghPages
branch: gh-pages
latestDirName: latest
publishType: CleanBranch
username: robfletcher
repo: strikt

Expand Down