00ec94e68 Nueva versión de fr-opensagres-xdocreport-poi-xwpf-converter-pdf = "2.1.0" DataTransferBridge añadido para un acceso más conveniente a la transferencia de datos desde otros módulos (Merlin, negocio, etc.), ThreadLocalUserContext mejorado para su uso dentro de corrutinas Kotlin.
e21feaa61 Juegos de Gradle...
84a5eb6ae WIP: gradle... (todas las pruebas OK).
41e2d26e7 WIP: gradle...
e31db0a87 WIP: gradle...
00ec94e68
Nueva versión de fr-opensagres-xdocreport-poi-xwpf-converter-pdf = "2.1.0" DataTransferBridge añadido para un acceso más conveniente a la transferencia de datos desde otros módulos (Merlin, negocio, etc.), ThreadLocalUserContext mejorado para su uso dentro de corrutinas Kotlin.00ec94e687c6a287947044c9ae70161aade5cb63
diff --git a/plugins/org.projectforge.plugins.merlin/build.gradle.kts b/plugins/org.projectforge.plugins.merlin/build.gradle.kts
index 592c8209a..f9d68dedd 100644
--- a/plugins/org.projectforge.plugins.merlin/build.gradle.kts
+++ b/plugins/org.projectforge.plugins.merlin/build.gradle.kts
@@ -13,7 +13,6 @@ tasks.withType<KotlinCompile> {
dependencies {
api(project(":projectforge-rest"))
- api(project(":org.projectforge.plugins.datatransfer"))
api(libs.fr.opensagres.xdocrepor.poi.xwpf.converter.pdf)
testImplementation(project(":projectforge-business"))
} e21feaa61
Juegos de Gradle...e21feaa61e66e09b312b8dfd9fc870aa0a820cf9
diff --git a/plugins/org.projectforge.plugins.merlin/build.gradle.kts b/plugins/org.projectforge.plugins.merlin/build.gradle.kts
index 2781caeb2..592c8209a 100644
--- a/plugins/org.projectforge.plugins.merlin/build.gradle.kts
+++ b/plugins/org.projectforge.plugins.merlin/build.gradle.kts
@@ -1,5 +1,14 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
plugins {
id("buildlogic.pf-module-conventions")
+ id("org.jetbrains.kotlin.jvm")
+}
+
+tasks.withType<KotlinCompile> {
+ compilerOptions {
+ jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+ }
}
dependencies { 84a5eb6ae
WIP: gradle... (todas las pruebas OK).84a5eb6ae6ade82eb63cb150c9acb51ef0915911
diff --git a/plugins/org.projectforge.plugins.merlin/build.gradle.kts b/plugins/org.projectforge.plugins.merlin/build.gradle.kts
index 48a995d21..2781caeb2 100644
--- a/plugins/org.projectforge.plugins.merlin/build.gradle.kts
+++ b/plugins/org.projectforge.plugins.merlin/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
dependencies {
api(project(":projectforge-rest"))
api(project(":org.projectforge.plugins.datatransfer"))
- api(libs.fr.opensagres.xdocreport.fr.opensagres.poi.xwpf.converter.pdf)
+ api(libs.fr.opensagres.xdocrepor.poi.xwpf.converter.pdf)
testImplementation(project(":projectforge-business"))
}
41e2d26e7
WIP: gradle...41e2d26e73a3c07779f45e21349f0586d840f4e7
diff --git a/plugins/org.projectforge.plugins.merlin/build.gradle.kts b/plugins/org.projectforge.plugins.merlin/build.gradle.kts
index e2949bc6b..48a995d21 100644
--- a/plugins/org.projectforge.plugins.merlin/build.gradle.kts
+++ b/plugins/org.projectforge.plugins.merlin/build.gradle.kts
@@ -1,9 +1,5 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
-
plugins {
- id("java-library")
+ id("buildlogic.pf-module-conventions")
}
dependencies {
@@ -11,7 +7,6 @@ dependencies {
api(project(":org.projectforge.plugins.datatransfer"))
api(libs.fr.opensagres.xdocreport.fr.opensagres.poi.xwpf.converter.pdf)
testImplementation(project(":projectforge-business"))
- testImplementation(libs.org.postgresql.postgresql)
}
description = "org.projectforge.plugins.merlin" e31db0a87
WIP: gradle...e31db0a876e33a067c92924d6714b59368b05a1d
diff --git a/plugins/org.projectforge.plugins.merlin/build.gradle.kts b/plugins/org.projectforge.plugins.merlin/build.gradle.kts
index 52f271d6a..e2949bc6b 100644
--- a/plugins/org.projectforge.plugins.merlin/build.gradle.kts
+++ b/plugins/org.projectforge.plugins.merlin/build.gradle.kts
@@ -3,7 +3,7 @@
*/
plugins {
- id("buildlogic.java-conventions")
+ id("java-library")
}
dependencies {