diff --git a/build.gradle b/build.gradle index 3f400c41..92a8e603 100644 --- a/build.gradle +++ b/build.gradle @@ -129,7 +129,7 @@ openapiProcessor { processor 'io.openapiprocessor:openapi-processor-spring:2022.5' apiPath "$projectDir/src/main/resources/api-definition/api-definition.yaml" mapping "$projectDir/src/main/resources/api-definition/api-mappings.yaml" - targetDir "$buildDir/generated/sources/openapi-javax" + targetDir layout.buildDirectory.dir("generated/sources/openapi-javax") showWarnings true openApiNullable true } @@ -138,7 +138,7 @@ openapiProcessor { processor 'io.openapiprocessor:openapi-processor-spring:2022.5' apiPath "$projectDir/src/main/resources/api-definition/rbac/rbac.yaml" mapping "$projectDir/src/main/resources/api-definition/rbac/api-mappings.yaml" - targetDir "$buildDir/generated/sources/openapi-javax" + targetDir layout.buildDirectory.dir("generated/sources/openapi-javax") showWarnings true openApiNullable true } @@ -147,7 +147,7 @@ openapiProcessor { processor 'io.openapiprocessor:openapi-processor-spring:2022.5' apiPath "$projectDir/src/main/resources/api-definition/test/test.yaml" mapping "$projectDir/src/main/resources/api-definition/test/api-mappings.yaml" - targetDir "$buildDir/generated/sources/openapi-javax" + targetDir layout.buildDirectory.dir("generated/sources/openapi-javax") showWarnings true openApiNullable true } @@ -156,7 +156,7 @@ openapiProcessor { processor 'io.openapiprocessor:openapi-processor-spring:2022.5' apiPath "$projectDir/src/main/resources/api-definition/hs-office/hs-office.yaml" mapping "$projectDir/src/main/resources/api-definition/hs-office/api-mappings.yaml" - targetDir "$buildDir/generated/sources/openapi-javax" + targetDir layout.buildDirectory.dir("generated/sources/openapi-javax") showWarnings true openApiNullable true } @@ -165,7 +165,7 @@ openapiProcessor { processor 'io.openapiprocessor:openapi-processor-spring:2022.5' apiPath "$projectDir/src/main/resources/api-definition/hs-booking/hs-booking.yaml" mapping "$projectDir/src/main/resources/api-definition/hs-booking/api-mappings.yaml" - targetDir "$buildDir/generated/sources/openapi-javax" + targetDir layout.buildDirectory.dir("generated/sources/openapi-javax") showWarnings true openApiNullable true } @@ -174,7 +174,7 @@ openapiProcessor { processor 'io.openapiprocessor:openapi-processor-spring:2022.5' apiPath "$projectDir/src/main/resources/api-definition/hs-hosting/hs-hosting.yaml" mapping "$projectDir/src/main/resources/api-definition/hs-hosting/api-mappings.yaml" - targetDir "$buildDir/generated/sources/openapi-javax" + targetDir layout.buildDirectory.dir("generated/sources/openapi-javax") showWarnings true openApiNullable true } @@ -201,11 +201,11 @@ project.tasks.compileJava.dependsOn processSpring // TODO.impl: Upgrade to io.openapiprocessor.openapi-processor >= 2024.2 // and use either `bean-validation: true` in api-mapping.yaml or `useSpringBoot3 true` (not sure where exactly). task openApiGenerate(type: Copy) { - from "$buildDir/generated/sources/openapi-javax" - into "$buildDir/generated/sources/openapi" + from layout.buildDirectory.dir("generated/sources/openapi-javax") + into layout.buildDirectory.dir("generated/sources/openapi") filter { line -> line.replaceAll('javax', 'jakarta') } } -compileJava.source "$buildDir/generated/sources/openapi" +compileJava.source layout.buildDirectory.dir("generated/sources/openapi") compileJava.dependsOn openApiGenerate openApiGenerate.dependsOn processSpring