From 67649e3f54eed34ee406d608d135d1d6224540b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= Date: Fri, 21 Jun 2024 12:52:55 +0200 Subject: [PATCH] chore: Kestra Platform --- build.gradle | 32 +++++++++++++++++++++----------- gradle.properties | 4 +--- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index a07405a..747c3a9 100644 --- a/build.gradle +++ b/build.gradle @@ -34,12 +34,16 @@ 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" // Micronaut - compileOnly platform("io.micronaut.platform:micronaut-platform:$micronautVersion") compileOnly "io.micronaut.reactor:micronaut-reactor" // Kestra @@ -67,16 +71,17 @@ 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" // kestra @@ -87,15 +92,15 @@ dependencies { // 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" } @@ -139,6 +144,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 b80f54c..6b04bf0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,2 @@ version=0.18.0-SNAPSHOT -kestraVersion=[0.17,) -micronautVersion=4.4.3 -lombokVersion=1.18.32 +kestraVersion=[0.18,)