@@ -15,20 +15,14 @@ val modelixCoreVersion = file("../../version.txt").readText()
15
15
16
16
version = modelixCoreVersion
17
17
18
- val mps by configurations.creating
18
+ val mps: Configuration by configurations.creating
19
19
val kotlinGenDir = buildDir.resolve(" metamodel/kotlin" ).apply { mkdirs() }
20
20
21
21
dependencies {
22
22
mps(" com.jetbrains:mps:2021.1.4" )
23
23
api(" org.modelix:model-api-gen-runtime:$modelixCoreVersion " )
24
24
}
25
25
26
- val copyGeneratedApiToSrc by tasks.registering(Sync ::class ) {
27
- dependsOn(tasks.named(" generateMetaModelSources" ))
28
- from(kotlinGenDir)
29
- into(" src/main/kotlin" )
30
- }
31
-
32
26
val mpsDir = buildDir.resolve(" mps" ).apply { mkdirs() }
33
27
34
28
val resolveMps by tasks.registering(Copy ::class ) {
@@ -43,6 +37,12 @@ val copyMetamodelToMpsHome by tasks.registering(Copy::class) {
43
37
into(file(mpsDir.resolve(" languages" ).apply { mkdirs() }))
44
38
}
45
39
40
+ kotlin {
41
+ sourceSets.named(" main" ) {
42
+ kotlin.srcDir(kotlinGenDir)
43
+ }
44
+ }
45
+
46
46
metamodel {
47
47
dependsOn(resolveMps)
48
48
dependsOn(copyMetamodelToMpsHome)
@@ -63,6 +63,10 @@ publishing {
63
63
}
64
64
}
65
65
66
+ tasks.named(" processResources" ) {
67
+ dependsOn(" generateMetaModelSources" )
68
+ }
69
+
66
70
tasks.named(" compileKotlin" ) {
67
- dependsOn(copyGeneratedApiToSrc )
71
+ dependsOn(" generateMetaModelSources " )
68
72
}
0 commit comments