Simplified jsonSchemas task definition

This commit is contained in:
Era Dorta 2026-03-28 21:57:53 +01:00
parent 1702266b75
commit b4d5da7bf0

View File

@ -88,10 +88,8 @@ dependencies {
excludeFilesByArtifact = excludePatterns excludeFilesByArtifact = excludePatterns
} }
} }
schemaAnnotationProcessor(libs.micronaut.json.schema.processor) schemaAnnotationProcessor(libs.micronaut.json.schema.processor)
schemaAnnotationProcessor(libs.micronaut.inject.java) schemaAnnotationProcessor(libs.micronaut.inject.java)
implementation(libs.bouncycastle) implementation(libs.bouncycastle)
implementation(libs.jackson.databind) implementation(libs.jackson.databind)
implementation(libs.argparse4j) implementation(libs.argparse4j)
@ -153,17 +151,13 @@ tasks.register("fatJar", type = Jar::class) {
with(tasks.jar.get()) with(tasks.jar.get())
} }
val compileJsonSchemas by tasks.registering(JavaCompile::class) { tasks.register<JavaCompile>("jsonSchemas") {
dependsOn(tasks.compileJava) dependsOn(tasks.compileJava)
val schemaBaseUri = "http://localhost:8080/schemas/" val schemaBaseUri = "http://localhost:8080/schemas/"
source = sourceSets.main.get().java source = sourceSets.main.get().java
include("org/asamk/signal/json/**/*.java") include("org/asamk/signal/json/**/*.java")
classpath = sourceSets.main.get().compileClasspath + files(sourceSets.main.get().java.destinationDirectory) classpath = sourceSets.main.get().compileClasspath + files(sourceSets.main.get().java.destinationDirectory)
destinationDirectory.set(layout.buildDirectory.dir("classes/java/schemas")) destinationDirectory.set(layout.buildDirectory.dir("generated"))
options.annotationProcessorPath = schemaAnnotationProcessor options.annotationProcessorPath = schemaAnnotationProcessor
options.compilerArgs.addAll( options.compilerArgs.addAll(
listOf( listOf(
@ -173,7 +167,6 @@ val compileJsonSchemas by tasks.registering(JavaCompile::class) {
"-Amicronaut.jsonschema.baseUri=$schemaBaseUri", "-Amicronaut.jsonschema.baseUri=$schemaBaseUri",
) )
) )
doLast { doLast {
fileTree(destinationDirectory.get().dir("META-INF/schemas").asFile) { fileTree(destinationDirectory.get().dir("META-INF/schemas").asFile) {
include("*.schema.json") include("*.schema.json")
@ -184,9 +177,3 @@ val compileJsonSchemas by tasks.registering(JavaCompile::class) {
} }
} }
} }
tasks.register("jsonSchemas") {
group = "application"
description = "Generate JSON schemas using annotation processing"
dependsOn(compileJsonSchemas)
}