Skip to content

Commit 84290a0

Browse files
committed
test(bulk-model-sync-gradle): use build dir as sourceset instead of copying
1 parent 8279625 commit 84290a0

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

bulk-model-sync-gradle-test/graph-lang-api/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,14 @@ val modelixCoreVersion = file("../../version.txt").readText()
1515

1616
version = modelixCoreVersion
1717

18-
val mps by configurations.creating
18+
val mps: Configuration by configurations.creating
1919
val kotlinGenDir = buildDir.resolve("metamodel/kotlin").apply { mkdirs() }
2020

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

26-
val copyGeneratedApiToSrc by tasks.registering(Sync::class) {
27-
dependsOn(tasks.named("generateMetaModelSources"))
28-
from(kotlinGenDir)
29-
into("src/main/kotlin")
30-
}
31-
3226
val mpsDir = buildDir.resolve("mps").apply { mkdirs() }
3327

3428
val resolveMps by tasks.registering(Copy::class) {
@@ -43,6 +37,12 @@ val copyMetamodelToMpsHome by tasks.registering(Copy::class) {
4337
into(file(mpsDir.resolve("languages").apply { mkdirs() }))
4438
}
4539

40+
kotlin {
41+
sourceSets.named("main") {
42+
kotlin.srcDir(kotlinGenDir)
43+
}
44+
}
45+
4646
metamodel {
4747
dependsOn(resolveMps)
4848
dependsOn(copyMetamodelToMpsHome)
@@ -63,6 +63,10 @@ publishing {
6363
}
6464
}
6565

66+
tasks.named("processResources") {
67+
dependsOn("generateMetaModelSources")
68+
}
69+
6670
tasks.named("compileKotlin") {
67-
dependsOn(copyGeneratedApiToSrc)
71+
dependsOn("generateMetaModelSources")
6872
}

0 commit comments

Comments
 (0)