diff options
-rw-r--r-- | subprojects/frontend/build.gradle.kts | 10 | ||||
-rw-r--r-- | subprojects/language/build.gradle.kts | 8 |
2 files changed, 9 insertions, 9 deletions
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 { | |||
16 | assembleScript.set("run build") | 16 | assembleScript.set("run build") |
17 | } | 17 | } |
18 | 18 | ||
19 | val viteOutputDir = "$buildDir/vite" | 19 | val viteOutputDir = layout.buildDirectory.dir("vite") |
20 | 20 | ||
21 | val productionResources = file("$viteOutputDir/production") | 21 | val productionResources = viteOutputDir.map { it.dir("production") } |
22 | 22 | ||
23 | val productionAssets: Configuration by configurations.creating { | 23 | val productionAssets: Configuration by configurations.creating { |
24 | isCanBeConsumed = true | 24 | isCanBeConsumed = true |
@@ -81,7 +81,7 @@ tasks { | |||
81 | dependsOn(installFrontend) | 81 | dependsOn(installFrontend) |
82 | dependsOn(generateXStateTypes) | 82 | dependsOn(generateXStateTypes) |
83 | inputs.files(lintingFiles) | 83 | inputs.files(lintingFiles) |
84 | outputs.dir("$buildDir/typescript") | 84 | outputs.dir(layout.buildDirectory.dir("typescript")) |
85 | script.set("run typecheck") | 85 | script.set("run typecheck") |
86 | group = "verification" | 86 | group = "verification" |
87 | description = "Check for TypeScript type errors." | 87 | description = "Check for TypeScript type errors." |
@@ -92,7 +92,7 @@ tasks { | |||
92 | dependsOn(generateXStateTypes) | 92 | dependsOn(generateXStateTypes) |
93 | dependsOn(typeCheckFrontend) | 93 | dependsOn(typeCheckFrontend) |
94 | inputs.files(lintingFiles) | 94 | inputs.files(lintingFiles) |
95 | outputs.file("$buildDir/eslint.json") | 95 | outputs.file(layout.buildDirectory.file("eslint.json")) |
96 | script.set("run lint") | 96 | script.set("run lint") |
97 | group = "verification" | 97 | group = "verification" |
98 | description = "Check for TypeScript lint errors and warnings." | 98 | description = "Check for TypeScript lint errors and warnings." |
@@ -140,5 +140,5 @@ artifacts { | |||
140 | sonarqube.properties { | 140 | sonarqube.properties { |
141 | SonarPropertiesUtils.addToList(properties, "sonar.sources", "src") | 141 | SonarPropertiesUtils.addToList(properties, "sonar.sources", "src") |
142 | property("sonar.nodejs.executable", "${frontend.nodeInstallDirectory.get()}/bin/node") | 142 | property("sonar.nodejs.executable", "${frontend.nodeInstallDirectory.get()}/bin/node") |
143 | property("sonar.eslint.reportPaths", "$buildDir/eslint.json") | 143 | property("sonar.eslint.reportPaths", "${layout.buildDirectory.get()}/eslint.json") |
144 | } | 144 | } |
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) { | |||
51 | inputs.file("../language-model/src/main/resources/model/problem.genmodel") | 51 | inputs.file("../language-model/src/main/resources/model/problem.genmodel") |
52 | outputs.dir("src/main/xtext-gen") | 52 | outputs.dir("src/main/xtext-gen") |
53 | outputs.dir("src/testFixtures/xtext-gen") | 53 | outputs.dir("src/testFixtures/xtext-gen") |
54 | outputs.dir("$buildDir/generated/sources/xtext/ide") | 54 | outputs.dir(layout.buildDirectory.dir("generated/sources/xtext/ide")) |
55 | outputs.dir("$buildDir/generated/sources/xtext/web") | 55 | outputs.dir(layout.buildDirectory.dir("generated/sources/xtext/web")) |
56 | args("src/main/java/tools/refinery/language/GenerateProblem.mwe2", "-p", "rootPath=/$projectDir/..") | 56 | args("src/main/java/tools/refinery/language/GenerateProblem.mwe2", "-p", "rootPath=/$projectDir/..") |
57 | } | 57 | } |
58 | 58 | ||
@@ -85,11 +85,11 @@ tasks { | |||
85 | } | 85 | } |
86 | 86 | ||
87 | artifacts { | 87 | artifacts { |
88 | add(generatedIdeSources.name, file("$buildDir/generated/sources/xtext/ide")) { | 88 | add(generatedIdeSources.name, layout.buildDirectory.dir("generated/sources/xtext/ide")) { |
89 | builtBy(generateXtextLanguage) | 89 | builtBy(generateXtextLanguage) |
90 | } | 90 | } |
91 | 91 | ||
92 | add(generatedWebSources.name, file("$buildDir/generated/sources/xtext/web")) { | 92 | add(generatedWebSources.name, layout.buildDirectory.dir("generated/sources/xtext/web")) { |
93 | builtBy(generateXtextLanguage) | 93 | builtBy(generateXtextLanguage) |
94 | } | 94 | } |
95 | } | 95 | } |