Skip to content

Commit

Permalink
refactor: migrate to Java ServiceLoader for plugin registration
Browse files Browse the repository at this point in the history
  • Loading branch information
fhussonnois committed Apr 24, 2024
1 parent 2902854 commit 50a5356
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,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
Expand Down
19 changes: 9 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ repositories {
}
}

sourceCompatibility = 17
targetCompatibility = 17
sourceCompatibility = 21
targetCompatibility = 21

group "io.kestra.plugin"
description 'Leverage Microsoft Azure services within Kestra data workflows.'
Expand All @@ -37,20 +37,18 @@ dependencies {
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"

// Micronaut
compileOnly platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
compileOnly "io.micronaut:micronaut-inject"
compileOnly "io.micronaut.validation:micronaut-validation"
compileOnly "io.micronaut.reactor:micronaut-reactor"

// kestra
// 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

// Logs
compileOnly'org.slf4j:slf4j-api:2.0.13'

// azure
api platform("com.azure:azure-sdk-bom:1.2.22")
api group: 'com.azure', name: 'azure-identity'
Expand Down Expand Up @@ -98,6 +96,7 @@ dependencies {
testImplementation "io.micronaut.reactor:micronaut-reactor"

// 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: "core", version: kestraVersion, classifier: 'tests'
testImplementation group: "io.kestra", name: "repository-memory", version: kestraVersion
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=0.17.0-SNAPSHOT
kestraVersion=[0.16,)
kestraVersion=[0.17,)
micronautVersion=4.3.7
lombokVersion=1.18.32
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import io.kestra.plugin.azure.batch.models.*;
import io.kestra.plugin.azure.storage.blob.SharedAccess;
import io.kestra.plugin.azure.storage.blob.models.BlobStorageForBatch;
import io.micronaut.core.annotation.Introspected;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.*;
Expand All @@ -27,7 +26,6 @@

import static io.kestra.core.utils.Rethrow.throwFunction;

@Introspected
@SuperBuilder
@ToString
@EqualsAndHashCode
Expand Down

0 comments on commit 50a5356

Please sign in to comment.