Skip to content

Commit

Permalink
Merge pull request #606 from hexagonkt/develop
Browse files Browse the repository at this point in the history
Chores
  • Loading branch information
jaguililla authored Mar 1, 2023
2 parents 547a6ac + 5d5ae52 commit cbb7e57
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ org.gradle.warning.mode=all
org.gradle.console=plain

# Gradle
version=2.6.1
version=2.6.2
group=com.hexagonkt
description=The atoms of your platform

Expand Down Expand Up @@ -39,13 +39,13 @@ mockkVersion=1.13.4
junitVersion=5.9.2
gatlingVersion=3.9.1
jmhVersion=1.36
mkdocsMaterialVersion=9.0.13
mkdocsMaterialVersion=9.0.15
mermaidDokkaVersion=0.4.4
nativeToolsVersion=0.9.20

# http_server_servlet
servletVersion=5.0.0
jettyVersion=11.0.13
jettyVersion=11.0.14

# http_server_netty
nettyVersion=4.1.89.Final
Expand Down
3 changes: 1 addition & 2 deletions gradle/dokka.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ setUpDokka(dokkaHtmlPartial)
setUpDokka(dokkaJavadoc)

private void setUpDokka(final Object dokkaTask) {
dokkaTask.dependsOn(test)
dokkaTask.moduleName.set(project.name)
dokkaTask.offlineMode.set(true)
dokkaTask.dokkaSourceSets {
Expand All @@ -42,7 +41,7 @@ private void setUpDokka(final Object dokkaTask) {
}

dependencies {
final String mermaidDokkaVersion = findProperty("mermaidDokkaVersion") ?: "0.4.0"
final String mermaidDokkaVersion = findProperty("mermaidDokkaVersion") ?: "0.4.4"

dokkaHtmlPartialPlugin("com.glureau:html-mermaid-dokka-plugin:$mermaidDokkaVersion")
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
# TODO Use Gradle 8 when Dokka support it
#distributionUrl=https://services.gradle.org/distributions/gradle-8.0.1-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-7.6-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-7.6.1-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit cbb7e57

Please sign in to comment.