Skip to content

Commit 3edba25

Browse files
author
Oleksandr Dzhychko
committed
fix(bulk-model-sync-gradle): replace deprecated Project.buildDir usage in Gradle
see https://docs.gradle.org/current/userguide/upgrading_version_8.html#deprecations_2
1 parent 5e87326 commit 3edba25

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,23 @@ class ModelSyncGradlePlugin : Plugin<Project> {
4646
getBaseDir(project).mkdirs()
4747

4848
project.afterEvaluate {
49-
val validateSyncSettings = project.tasks.register("validateSyncSettings", ValidateSyncSettings::class.java) {
50-
settings.taskDependencies.forEach { dependency ->
51-
it.dependsOn(dependency)
49+
val validateSyncSettings =
50+
project.tasks.register("validateSyncSettings", ValidateSyncSettings::class.java) {
51+
settings.taskDependencies.forEach { dependency ->
52+
it.dependsOn(dependency)
53+
}
54+
it.settings.set(settings)
5255
}
53-
it.settings.set(settings)
54-
}
5556
val modelixCoreVersion = readModelixCoreVersion()
5657
?: throw RuntimeException("modelix.core version not found. Try running the writeVersionFile task.")
5758
val antDependencies = project.configurations.create(antDependenciesConfigName)
5859
project.dependencies.add(antDependencies.name, "org.apache.ant:ant-junit:1.10.12")
5960

6061
val mpsDependencies = project.configurations.create("modelSyncMpsDependencies")
61-
project.dependencies.add(mpsDependencies.name, "org.modelix.mps:bulk-model-sync-solution:$modelixCoreVersion")
62+
project.dependencies.add(
63+
mpsDependencies.name,
64+
"org.modelix.mps:bulk-model-sync-solution:$modelixCoreVersion",
65+
)
6266

6367
val copyMpsDependencies = project.tasks.register("copyMpsDependencies", Sync::class.java) { sync ->
6468
sync.dependsOn(validateSyncSettings)
@@ -79,7 +83,7 @@ class ModelSyncGradlePlugin : Plugin<Project> {
7983
project: Project,
8084
previousTask: TaskProvider<*>,
8185
) {
82-
val baseDir = project.buildDir.resolve("model-sync").apply { mkdirs() }
86+
val baseDir = project.layout.buildDirectory.dir("model-sync").get().asFile.apply { mkdirs() }
8387
val jsonDir = baseDir.resolve(syncDirection.name).apply { mkdir() }
8488
val sourceTask = when (syncDirection.source) {
8589
is LocalSource -> registerTasksForLocalSource(syncDirection, project, previousTask, jsonDir)
@@ -221,7 +225,7 @@ class ModelSyncGradlePlugin : Plugin<Project> {
221225
}
222226

223227
private fun getBaseDir(project: Project): File {
224-
return project.buildDir.resolve("model-sync")
228+
return project.layout.buildDirectory.dir("model-sync").get().asFile
225229
}
226230

227231
private fun getDependenciesDir(project: Project): File {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ modelSync {
131131
registerLanguage(L_MyGeneratedLanguage)
132132
includeModule("MySolution")
133133
fromLocal {
134-
mpsHome = buildDir.resolve("mps")
134+
mpsHome = project.layout.buildDirectory.dir("mps").get().asFile
135135
mpsHeapSize = "4g"
136136
repositoryDir = projectDir.resolve("my-repo")
137137
}

0 commit comments

Comments
 (0)