From b099b6d62ce9a8e9704bfe33bfe2b158d1a0c318 Mon Sep 17 00:00:00 2001 From: Florian Hussonnois Date: Wed, 24 Apr 2024 23:44:08 +0200 Subject: [PATCH] refactor: migrate to Java ServiceLoader for plugin registration --- .github/workflows/main.yml | 2 +- build.gradle | 17 +++++------------ gradle.properties | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 208e0ba..c196a03 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 17 + java-version: 21 - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@v2 diff --git a/build.gradle b/build.gradle index 890106c..73b5ea5 100644 --- a/build.gradle +++ b/build.gradle @@ -21,8 +21,8 @@ repositories { } } -sourceCompatibility = 17 -targetCompatibility = 17 +sourceCompatibility = 21 +targetCompatibility = 21 group "io.kestra.plugin" description 'Plugin Dataform for Kestra' @@ -36,17 +36,9 @@ dependencies { // lombok annotationProcessor "org.projectlombok:lombok:$lombokVersion" compileOnly "org.projectlombok:lombok:$lombokVersion" - - // micronaut - annotationProcessor platform("io.micronaut.platform:micronaut-platform:$micronautVersion") - annotationProcessor "io.micronaut:micronaut-inject-java" - annotationProcessor "io.micronaut.validation:micronaut-validation-processor" - - compileOnly platform("io.micronaut.platform:micronaut-platform:$micronautVersion") - compileOnly "io.micronaut:micronaut-inject" - compileOnly "io.micronaut.validation:micronaut-validation" - + // kestra + annotationProcessor group: "io.kestra", name: "processor", version: kestraVersion compileOnly group: "io.kestra", name: "core", version: kestraVersion implementation group: "io.kestra.plugin", name: "plugin-script", version: kestraVersion } @@ -82,6 +74,7 @@ dependencies { testImplementation "io.micronaut.test:micronaut-test-junit5" // 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: "repository-memory", version: kestraVersion testImplementation group: "io.kestra", name: "runner-memory", version: kestraVersion diff --git a/gradle.properties b/gradle.properties index 7a14be6..ce7f3f5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ version=0.17.0-SNAPSHOT -kestraVersion=[0.16,) +kestraVersion=[0.17,) micronautVersion=4.3.7 lombokVersion=1.18.32