Skip to content

Commit

Permalink
chore: revert "refactor: migrate to Java ServiceLoader for plugin reg…
Browse files Browse the repository at this point in the history
…istration"

This reverts commit 7e23ddf
  • Loading branch information
fhussonnois committed May 6, 2024
1 parent 31b2bae commit 07faa4f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 21
java-version: 17

- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v3
Expand Down
25 changes: 15 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ repositories {
}
}

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

group "io.kestra.plugin"
description 'Plugin template for Kestra'
Expand All @@ -37,12 +37,20 @@ dependencies {
annotationProcessor "org.projectlombok:lombok:$lombokVersion"
compileOnly "org.projectlombok:lombok:$lombokVersion"

// Kestra
// 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"
// uncomment if the plugin uses reactive types
// compileOnly "io.micronaut.reactor:micronaut-reactor"
compileOnly "io.micronaut:micronaut-jackson-databind"

// kestra
compileOnly group: "io.kestra", name: "core", version: kestraVersion
annotationProcessor group: "io.kestra", name: "processor", version: kestraVersion

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

// libs included in the final jar
api group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
Expand Down Expand Up @@ -78,9 +86,6 @@ dependencies {
testImplementation platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
testImplementation "io.micronaut.test:micronaut-test-junit5"

// Kestra
testAnnotationProcessor group: "io.kestra", name: "processor", version: kestraVersion

// test deps needed only for to have a runner
testImplementation group: "io.kestra", name: "core", version: kestraVersion
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.17,)
kestraVersion=[0.16,)
micronautVersion=4.4.1
lombokVersion=1.18.32

0 comments on commit 07faa4f

Please sign in to comment.