Merge pull request #293 from modelix/chore/remove-buildDir-usage

replace deprecated Project.buildDir usage in Gradle

Author: Oleksandr Dzhychko

build.gradle.kts

@@ -101,7 +101,7 @@ subprojects {
         reports {
             sarif.required.set(true)
             // This is required for the GitHub upload action to easily find all sarif files in a single directory.
-            sarif.outputLocation.set(parentProject.buildDir.resolve("reports/detekt/${project.name}.sarif"))
+            sarif.outputLocation.set(parentProject.layout.buildDirectory.file("reports/detekt/${project.name}.sarif"))
             html.required.set(true)
         }
     }
@@ -237,7 +237,7 @@ fun MavenPublication.setMetadata() {
 tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask> {
     dependsOn(":ts-model-api:npm_run_build")
 }
-val docsDir = buildDir.resolve("dokka")
+val docsDir = project.layout.buildDirectory.dir("dokka").get().asFile
 
 tasks.dokkaHtmlMultiModule {
     outputDirectory.set(docsDir.resolve("$version"))

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

@@ -42,8 +42,8 @@ repositories {
 }
 
 val mps by configurations.creating
-val mpsDir = buildDir.resolve("mps").apply { mkdirs() }
-val kotlinGenDir = buildDir.resolve("metamodel/kotlin").apply { mkdirs() }
+val mpsDir = project.layout.buildDirectory.dir("mps").get().asFile.apply { mkdirs() }
+val kotlinGenDir = project.layout.buildDirectory.dir("metamodel/kotlin").get().asFile.apply { mkdirs() }
 
 dependencies {
     mps("com.jetbrains:mps:2021.2.5")
@@ -82,7 +82,7 @@ val resolveMps by tasks.registering(Copy::class) {
     into(mpsDir)
 }
 
-val repoDir = buildDir.resolve("test-repo")
+val repoDir = project.layout.buildDirectory.dir("test-repo").get().asFile
 
 val copyTestRepo by tasks.registering(Sync::class) {
     from(projectDir.resolve("test-repo"))

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

@@ -16,14 +16,14 @@ val modelixCoreVersion = file("../../version.txt").readText()
 version = modelixCoreVersion
 
 val mps: Configuration by configurations.creating
-val kotlinGenDir = buildDir.resolve("metamodel/kotlin").apply { mkdirs() }
+val kotlinGenDir = project.layout.buildDirectory.dir("metamodel/kotlin").get().asFile.apply { mkdirs() }
 
 dependencies {
     mps("com.jetbrains:mps:2021.2.5")
     api("org.modelix:model-api-gen-runtime:$modelixCoreVersion")
 }
 
-val mpsDir = buildDir.resolve("mps").apply { mkdirs() }
+val mpsDir = project.layout.buildDirectory.dir("mps").get().asFile.apply { mkdirs() }
 
 val resolveMps by tasks.registering(Copy::class) {
     from(mps.resolve().map { zipTree(it) })

bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/ModelSyncGradlePlugin.kt

@@ -46,19 +46,23 @@ class ModelSyncGradlePlugin : Plugin<Project> {
         getBaseDir(project).mkdirs()
 
         project.afterEvaluate {
-            val validateSyncSettings = project.tasks.register("validateSyncSettings", ValidateSyncSettings::class.java) {
-                settings.taskDependencies.forEach { dependency ->
-                    it.dependsOn(dependency)
+            val validateSyncSettings =
+                project.tasks.register("validateSyncSettings", ValidateSyncSettings::class.java) {
+                    settings.taskDependencies.forEach { dependency ->
+                        it.dependsOn(dependency)
+                    }
+                    it.settings.set(settings)
                 }
-                it.settings.set(settings)
-            }
             val modelixCoreVersion = readModelixCoreVersion()
                 ?: throw RuntimeException("modelix.core version not found. Try running the writeVersionFile task.")
             val antDependencies = project.configurations.create(antDependenciesConfigName)
             project.dependencies.add(antDependencies.name, "org.apache.ant:ant-junit:1.10.12")
 
             val mpsDependencies = project.configurations.create("modelSyncMpsDependencies")
-            project.dependencies.add(mpsDependencies.name, "org.modelix.mps:bulk-model-sync-solution:$modelixCoreVersion")
+            project.dependencies.add(
+                mpsDependencies.name,
+                "org.modelix.mps:bulk-model-sync-solution:$modelixCoreVersion",
+            )
 
             val copyMpsDependencies = project.tasks.register("copyMpsDependencies", Sync::class.java) { sync ->
                 sync.dependsOn(validateSyncSettings)
@@ -79,7 +83,7 @@ class ModelSyncGradlePlugin : Plugin<Project> {
         project: Project,
         previousTask: TaskProvider<*>,
     ) {
-        val baseDir = project.buildDir.resolve("model-sync").apply { mkdirs() }
+        val baseDir = project.layout.buildDirectory.dir("model-sync").get().asFile.apply { mkdirs() }
         val jsonDir = baseDir.resolve(syncDirection.name).apply { mkdir() }
         val sourceTask = when (syncDirection.source) {
             is LocalSource -> registerTasksForLocalSource(syncDirection, project, previousTask, jsonDir)
@@ -221,7 +225,7 @@ class ModelSyncGradlePlugin : Plugin<Project> {
     }
 
     private fun getBaseDir(project: Project): File {
-        return project.buildDir.resolve("model-sync")
+        return project.layout.buildDirectory.dir("model-sync").get().asFile
     }
 
     private fun getDependenciesDir(project: Project): File {

docs/global/modules/core/pages/howto/usage-model-api-gen-gradle.adoc

@@ -77,7 +77,7 @@ val mpsVersion: String by rootProject
 val modelixCoreVersion: String by rootProject
 
 // ensure that the MPS directory name is correct
-val mpsDir = buildDir.resolve("mps")
+val mpsDir = project.layout.buildDirectory.dir("mps").get().asFile
 
 val mps by configurations.creating
 val mpsDependencies by configurations.creating

docs/global/modules/core/pages/reference/component-bulk-model-sync-gradle.adoc

@@ -131,7 +131,7 @@ modelSync {
         registerLanguage(L_MyGeneratedLanguage)
         includeModule("MySolution")
         fromLocal {
-            mpsHome = buildDir.resolve("mps")
+            mpsHome = project.layout.buildDirectory.dir("mps").get().asFile
             mpsHeapSize = "4g"
             repositoryDir = projectDir.resolve("my-repo")
         }

model-api-gen-gradle/src/main/kotlin/org/modelix/metamodel/gradle/MetaModelGradlePlugin.kt

@@ -17,7 +17,7 @@ class MetaModelGradlePlugin : Plugin<Project> {
     override fun apply(project: Project) {
         this.project = project
         this.settings = project.extensions.create("metamodel", MetaModelGradleSettings::class.java)
-        this.buildDir = project.buildDir
+        this.buildDir = project.layout.buildDirectory.get().asFile
 
         val exporterDependencies = project.configurations.create("metamodel-mps-dependencies")
         val exporterDir = getBuildOutputDir().resolve("mpsExporter")

model-api/build.gradle.kts

@@ -9,7 +9,9 @@ description = "API to access models stored in Modelix"
 ktlint {
     filter {
         exclude {
-            it.file.toPath().toAbsolutePath().startsWith(project(":ts-model-api").buildDir.toPath().toAbsolutePath())
+            val kotlinGeneratedFromTypeScript =
+                project(":ts-model-api").layout.buildDirectory.get().asFile.toPath().toAbsolutePath()
+            it.file.toPath().toAbsolutePath().startsWith(kotlinGeneratedFromTypeScript)
         }
     }
 }

model-client/build.gradle.kts

@@ -97,9 +97,9 @@ kotlin {
 }
 
 tasks.jacocoTestReport {
-    classDirectories.setFrom("$buildDir/classes/kotlin/jvm/")
+    classDirectories.setFrom(project.layout.buildDirectory.dir("classes/kotlin/jvm/"))
     sourceDirectories.setFrom(files("src/commonMain/kotlin", "src/jvmMain/kotlin"))
-    executionData.setFrom(files("$buildDir/jacoco/jvmTest.exec"))
+    executionData.setFrom(project.layout.buildDirectory.file("jacoco/jvmTest.exec"))
 
     reports {
         xml.required.set(true)

model-server/build.gradle.kts

@@ -93,7 +93,7 @@ tasks.named<ShadowJar>("shadowJar") {
     }
 }
 
-val fatJarFile = file("$buildDir/libs/model-server-latest-fatJar.jar")
+val fatJarFile = project.layout.buildDirectory.file("libs/model-server-latest-fatJar.jar")
 val fatJarArtifact = artifacts.add("archives", fatJarFile) {
     type = "jar"
     builtBy("shadowJar")
@@ -117,7 +117,7 @@ tasks.named("build") {
 }
 
 task("copyLibs", Sync::class) {
-    into("$buildDir/dependency-libs")
+    into(project.layout.buildDirectory.dir("dependency-libs"))
     from(configurations.runtimeClasspath)
 }