Skip to content

Commit 5e87326

Browse files
author
Oleksandr Dzhychko
committed
build: replace deprecated Project.buildDir usage in Gradle
see https://docs.gradle.org/current/userguide/upgrading_version_8.html#deprecations_2
1 parent 6c8f96a commit 5e87326

File tree

9 files changed

+18
-16
lines changed

9 files changed

+18
-16
lines changed

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ subprojects {
101101
reports {
102102
sarif.required.set(true)
103103
// This is required for the GitHub upload action to easily find all sarif files in a single directory.
104-
sarif.outputLocation.set(parentProject.buildDir.resolve("reports/detekt/${project.name}.sarif"))
104+
sarif.outputLocation.set(parentProject.layout.buildDirectory.file("reports/detekt/${project.name}.sarif"))
105105
html.required.set(true)
106106
}
107107
}
@@ -237,7 +237,7 @@ fun MavenPublication.setMetadata() {
237237
tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask> {
238238
dependsOn(":ts-model-api:npm_run_build")
239239
}
240-
val docsDir = buildDir.resolve("dokka")
240+
val docsDir = project.layout.buildDirectory.dir("dokka").get().asFile
241241

242242
tasks.dokkaHtmlMultiModule {
243243
outputDirectory.set(docsDir.resolve("$version"))

bulk-model-sync-gradle-test/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ repositories {
4242
}
4343

4444
val mps by configurations.creating
45-
val mpsDir = buildDir.resolve("mps").apply { mkdirs() }
46-
val kotlinGenDir = buildDir.resolve("metamodel/kotlin").apply { mkdirs() }
45+
val mpsDir = project.layout.buildDirectory.dir("mps").get().asFile.apply { mkdirs() }
46+
val kotlinGenDir = project.layout.buildDirectory.dir("metamodel/kotlin").get().asFile.apply { mkdirs() }
4747

4848
dependencies {
4949
mps("com.jetbrains:mps:2021.2.5")
@@ -82,7 +82,7 @@ val resolveMps by tasks.registering(Copy::class) {
8282
into(mpsDir)
8383
}
8484

85-
val repoDir = buildDir.resolve("test-repo")
85+
val repoDir = project.layout.buildDirectory.dir("test-repo").get().asFile
8686

8787
val copyTestRepo by tasks.registering(Sync::class) {
8888
from(projectDir.resolve("test-repo"))

bulk-model-sync-gradle-test/graph-lang-api/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ val modelixCoreVersion = file("../../version.txt").readText()
1616
version = modelixCoreVersion
1717

1818
val mps: Configuration by configurations.creating
19-
val kotlinGenDir = buildDir.resolve("metamodel/kotlin").apply { mkdirs() }
19+
val kotlinGenDir = project.layout.buildDirectory.dir("metamodel/kotlin").get().asFile.apply { mkdirs() }
2020

2121
dependencies {
2222
mps("com.jetbrains:mps:2021.2.5")
2323
api("org.modelix:model-api-gen-runtime:$modelixCoreVersion")
2424
}
2525

26-
val mpsDir = buildDir.resolve("mps").apply { mkdirs() }
26+
val mpsDir = project.layout.buildDirectory.dir("mps").get().asFile.apply { mkdirs() }
2727

2828
val resolveMps by tasks.registering(Copy::class) {
2929
from(mps.resolve().map { zipTree(it) })

model-api/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ description = "API to access models stored in Modelix"
99
ktlint {
1010
filter {
1111
exclude {
12-
it.file.toPath().toAbsolutePath().startsWith(project(":ts-model-api").buildDir.toPath().toAbsolutePath())
12+
val kotlinGeneratedFromTypeScript =
13+
project(":ts-model-api").layout.buildDirectory.get().asFile.toPath().toAbsolutePath()
14+
it.file.toPath().toAbsolutePath().startsWith(kotlinGeneratedFromTypeScript)
1315
}
1416
}
1517
}

model-client/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ kotlin {
9595
}
9696

9797
tasks.jacocoTestReport {
98-
classDirectories.setFrom("$buildDir/classes/kotlin/jvm/")
98+
classDirectories.setFrom(project.layout.buildDirectory.dir("classes/kotlin/jvm/"))
9999
sourceDirectories.setFrom(files("src/commonMain/kotlin", "src/jvmMain/kotlin"))
100-
executionData.setFrom(files("$buildDir/jacoco/jvmTest.exec"))
100+
executionData.setFrom(project.layout.buildDirectory.file("jacoco/jvmTest.exec"))
101101

102102
reports {
103103
xml.required.set(true)

model-server/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ tasks.named<ShadowJar>("shadowJar") {
9292
}
9393
}
9494

95-
val fatJarFile = file("$buildDir/libs/model-server-latest-fatJar.jar")
95+
val fatJarFile = project.layout.buildDirectory.file("libs/model-server-latest-fatJar.jar")
9696
val fatJarArtifact = artifacts.add("archives", fatJarFile) {
9797
type = "jar"
9898
builtBy("shadowJar")
@@ -116,7 +116,7 @@ tasks.named("build") {
116116
}
117117

118118
task("copyLibs", Sync::class) {
119-
into("$buildDir/dependency-libs")
119+
into(project.layout.buildDirectory.dir("dependency-libs"))
120120
from(configurations.runtimeClasspath)
121121
}
122122

modelql-core/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ kotlin {
4242
implementation(libs.kotlin.serialization.json)
4343
api(libs.kotlin.coroutines.core)
4444
}
45-
kotlin.srcDir(buildDir.resolve("version_gen"))
45+
kotlin.srcDir(project.layout.buildDirectory.dir("version_gen"))
4646
}
4747
val commonTest by getting {
4848
dependencies {
@@ -71,7 +71,7 @@ kotlin {
7171

7272
val generateVersionVariable by tasks.creating {
7373
doLast {
74-
val outputDir = buildDir.resolve("version_gen/org/modelix/modelql/core")
74+
val outputDir = project.layout.buildDirectory.dir("version_gen/org/modelix/modelql/core").get().asFile
7575
outputDir.mkdirs()
7676
outputDir.resolve("Version.kt").writeText(
7777
"""

mps-model-server-plugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ tasks {
8787
if (mpsPluginDir != null && mpsPluginDir.isDirectory) {
8888
create<Sync>("installMpsPlugin") {
8989
dependsOn(prepareSandbox)
90-
from(buildDir.resolve("idea-sandbox/plugins/mps-model-server-plugin"))
90+
from(project.layout.buildDirectory.dir("idea-sandbox/plugins/mps-model-server-plugin"))
9191
into(mpsPluginDir.resolve("mps-model-server-plugin"))
9292
}
9393
}

ts-model-api/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ val patchKotlinExternals = tasks.create("patchKotlinExternals") {
1818
dependsOn("npm_run_generateKotlin")
1919
doLast {
2020
val annotationLine = """@file:JsModule("@modelix/ts-model-api") @file:JsNonModule"""
21-
val dukatDir = buildDir.resolve("dukat")
21+
val dukatDir = project.layout.buildDirectory.dir("dukat").get().asFile
2222
val files = dukatDir.listFiles()?.toList() ?: emptyList()
2323
val matchingFiles = files.filter { it.name.contains("@modelix_ts-model-api") }
2424
if (matchingFiles.isEmpty()) throw RuntimeException("No files found for patching in $dukatDir")

0 commit comments

Comments
 (0)