commit bffd4822e48f50512df6123646d8771b8ec04cd1
parent ff823ec830c93a6616181e0ee52ed0c81f6c9326
Author: Antoine A <>
Date: Mon, 21 Jul 2025 10:40:24 +0200
common: update ktor and fix update dokka
Diffstat:
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
@@ -121,8 +121,8 @@ testbench: install-nobuild-files
.PHONY: doc
doc:
- ./gradlew dokkaHtmlMultiModule
- echo "Open build/dokka/htmlMultiModule/index.html"
+ ./gradlew :dokkaGeneratePublicationHtml
+ echo "Open build/dokka/html/index.html"
.PHONY: ci
ci:
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)){
allprojects {
ext {
set("kotlin_version", "2.2.0")
- set("ktor_version", "3.2.0")
+ set("ktor_version", "3.2.2")
set("clikt_version", "5.0.3")
set("coroutines_version", "1.10.2")
set("postgres_version", "42.7.7")
@@ -48,17 +48,14 @@ subprojects {
}
ext.getVersionWithGitHash = { ->
- def stdout = new ByteArrayOutputStream()
- exec {
- commandLine 'git', 'rev-parse', '--short', 'HEAD'
- standardOutput = stdout
- }
- def gitHash = stdout.toString().trim()
+ def gitHash = 'git rev-parse --short HEAD'.execute().text.trim()
return "v${project.version}-git-$gitHash"
}
task versionFile() {
- new File("${projectDir}/common/src/main/resources", "version.txt").text = getVersionWithGitHash()
+ doLast {
+ new File("${projectDir}/common/src/main/resources", "version.txt").text = getVersionWithGitHash()
+ }
}
task libeufinVersion {
@@ -70,3 +67,9 @@ task libeufinVersion {
classes {
dependsOn versionFile
}
+
+dependencies {
+ dokka(project(":common:"))
+ dokka(project(":bank:"))
+ dokka(project(":nexus:"))
+}
+\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,6 @@
kotlin.code.style=official
-org.gradle.caching=true
-\ No newline at end of file
+org.gradle.caching=true
+#org.gradle.parallel=true
+#org.gradle.configuration-cache=true
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
+\ No newline at end of file