From 09d42533efd91cbf2d56a27c69b70da7eb5346c1 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Thu, 31 Aug 2023 17:36:59 +0200 Subject: chore(build): replce deprecated Gradle API use --- subprojects/frontend/build.gradle.kts | 10 +++++----- subprojects/language/build.gradle.kts | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'subprojects') diff --git a/subprojects/frontend/build.gradle.kts b/subprojects/frontend/build.gradle.kts index d0839371..286dd05c 100644 --- a/subprojects/frontend/build.gradle.kts +++ b/subprojects/frontend/build.gradle.kts @@ -16,9 +16,9 @@ frontend { assembleScript.set("run build") } -val viteOutputDir = "$buildDir/vite" +val viteOutputDir = layout.buildDirectory.dir("vite") -val productionResources = file("$viteOutputDir/production") +val productionResources = viteOutputDir.map { it.dir("production") } val productionAssets: Configuration by configurations.creating { isCanBeConsumed = true @@ -81,7 +81,7 @@ tasks { dependsOn(installFrontend) dependsOn(generateXStateTypes) inputs.files(lintingFiles) - outputs.dir("$buildDir/typescript") + outputs.dir(layout.buildDirectory.dir("typescript")) script.set("run typecheck") group = "verification" description = "Check for TypeScript type errors." @@ -92,7 +92,7 @@ tasks { dependsOn(generateXStateTypes) dependsOn(typeCheckFrontend) inputs.files(lintingFiles) - outputs.file("$buildDir/eslint.json") + outputs.file(layout.buildDirectory.file("eslint.json")) script.set("run lint") group = "verification" description = "Check for TypeScript lint errors and warnings." @@ -140,5 +140,5 @@ artifacts { sonarqube.properties { SonarPropertiesUtils.addToList(properties, "sonar.sources", "src") property("sonar.nodejs.executable", "${frontend.nodeInstallDirectory.get()}/bin/node") - property("sonar.eslint.reportPaths", "$buildDir/eslint.json") + property("sonar.eslint.reportPaths", "${layout.buildDirectory.get()}/eslint.json") } diff --git a/subprojects/language/build.gradle.kts b/subprojects/language/build.gradle.kts index bac1e586..a6324e03 100644 --- a/subprojects/language/build.gradle.kts +++ b/subprojects/language/build.gradle.kts @@ -51,8 +51,8 @@ val generateXtextLanguage by tasks.registering(JavaExec::class) { inputs.file("../language-model/src/main/resources/model/problem.genmodel") outputs.dir("src/main/xtext-gen") outputs.dir("src/testFixtures/xtext-gen") - outputs.dir("$buildDir/generated/sources/xtext/ide") - outputs.dir("$buildDir/generated/sources/xtext/web") + outputs.dir(layout.buildDirectory.dir("generated/sources/xtext/ide")) + outputs.dir(layout.buildDirectory.dir("generated/sources/xtext/web")) args("src/main/java/tools/refinery/language/GenerateProblem.mwe2", "-p", "rootPath=/$projectDir/..") } @@ -85,11 +85,11 @@ tasks { } artifacts { - add(generatedIdeSources.name, file("$buildDir/generated/sources/xtext/ide")) { + add(generatedIdeSources.name, layout.buildDirectory.dir("generated/sources/xtext/ide")) { builtBy(generateXtextLanguage) } - add(generatedWebSources.name, file("$buildDir/generated/sources/xtext/web")) { + add(generatedWebSources.name, layout.buildDirectory.dir("generated/sources/xtext/web")) { builtBy(generateXtextLanguage) } } -- cgit v1.2.3-70-g09d2