From 285f5ae08a98cfd4a1aab15e3b75380ff459aa2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= Date: Fri, 21 Jun 2024 14:19:38 +0200 Subject: [PATCH] chore: use Kestra Platform --- build.gradle | 56 +++++++++++++++++++++++++++-------------------- gradle.properties | 6 ++--- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index a27dfc6..1372544 100644 --- a/build.gradle +++ b/build.gradle @@ -34,20 +34,25 @@ tasks.withType(JavaCompile) { } dependencies { + // Platform + annotationProcessor enforcedPlatform("io.kestra:platform:$kestraVersion") + implementation enforcedPlatform("io.kestra:platform:$kestraVersion") + api enforcedPlatform("io.kestra:platform:$kestraVersion") + // lombok - annotationProcessor "org.projectlombok:lombok:$lombokVersion" - compileOnly "org.projectlombok:lombok:$lombokVersion" + annotationProcessor "org.projectlombok:lombok" + compileOnly "org.projectlombok:lombok" // Kestra - annotationProcessor group: "io.kestra", name: "processor", version: kestraVersion - compileOnly group: "io.kestra", name: "core", version: kestraVersion - annotationProcessor group: "io.kestra", name: "processor", version: kestraVersion + annotationProcessor "io.kestra:processor" + compileOnly "io.kestra:core" // Logs - compileOnly'org.slf4j:slf4j-api:2.0.13' + compileOnly "org.slf4j:slf4j-api" // libs included in the final jar - api group: 'com.google.code.gson', name: 'gson', version: '2.11.0' + // TODO remove it after using the GitHub template as your plugin may not need it + api "com.google.code.gson:gson:2.11.0" } @@ -68,41 +73,39 @@ testlogger { } dependencies { + // Platform + testAnnotationProcessor enforcedPlatform("io.kestra:platform:$kestraVersion") + testImplementation enforcedPlatform("io.kestra:platform:$kestraVersion") + // lombok - testAnnotationProcessor "org.projectlombok:lombok:" + lombokVersion - testCompileOnly 'org.projectlombok:lombok:' + lombokVersion + testAnnotationProcessor "org.projectlombok:lombok" + testCompileOnly "org.projectlombok:lombok" // micronaut - testAnnotationProcessor platform("io.micronaut.platform:micronaut-platform:$micronautVersion") testAnnotationProcessor "io.micronaut:micronaut-inject-java" testAnnotationProcessor "io.micronaut.validation:micronaut-validation-processor" - - testImplementation platform("io.micronaut.platform:micronaut-platform:$micronautVersion") testImplementation "io.micronaut.test:micronaut-test-junit5" testImplementation "io.micronaut:micronaut-jackson-databind" // Kestra - testAnnotationProcessor group: "io.kestra", name: "processor", version: kestraVersion - - // test deps needed only for to have a runner - testAnnotationProcessor group: "io.kestra", name: "processor", version: kestraVersion - testImplementation group: "io.kestra", name: "core", version: kestraVersion - testImplementation group: "io.kestra", name: "tests", version: kestraVersion - testImplementation group: "io.kestra", name: "repository-memory", version: kestraVersion - testImplementation group: "io.kestra", name: "runner-memory", version: kestraVersion - testImplementation group: "io.kestra", name: "storage-local", version: kestraVersion + testAnnotationProcessor "io.kestra:processor" + testImplementation "io.kestra:tests" + // Kestra deps needed only to have a runner for unit tests + testImplementation "io.kestra:repository-memory" + testImplementation "io.kestra:runner-memory" + testImplementation "io.kestra:storage-local" // test testImplementation "org.junit.jupiter:junit-jupiter-engine" - testImplementation "org.hamcrest:hamcrest:2.2" - testImplementation "org.hamcrest:hamcrest-library:2.2" + testImplementation "org.hamcrest:hamcrest" + testImplementation "org.hamcrest:hamcrest-library" } /**********************************************************************************************************************\ * Allure Reports **********************************************************************************************************************/ dependencies { - testImplementation platform("io.qameta.allure:allure-bom:2.27.0") + testImplementation enforcedPlatform("io.kestra:platform:$kestraVersion") testImplementation "io.qameta.allure:allure-junit5" } @@ -146,6 +149,11 @@ nexusPublishing { } } +tasks.withType(GenerateModuleMetadata).configureEach { + // Suppression this validation error as we want to enforce the Kestra platform + suppressedValidationErrors.add('enforced-platform') +} + jar { manifest { attributes( diff --git a/gradle.properties b/gradle.properties index cd1c336..6b04bf0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,2 @@ -version=0.17.0-SNAPSHOT -kestraVersion=[0.17,) -micronautVersion=4.4.1 -lombokVersion=1.18.32 +version=0.18.0-SNAPSHOT +kestraVersion=[0.18,)