Skip to content

Commit a9dcab0

Browse files
slissonmhuster23
slisson
authored and
mhuster23
committed
fix(mps-model-adapters): reverted dependency on MPS to compileOnly
1 parent 06d65b1 commit a9dcab0

File tree

15 files changed

+240
-38
lines changed

15 files changed

+240
-38
lines changed

‎build.gradle.kts‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import kotlinx.html.unsafe
1717
import org.jetbrains.dokka.base.DokkaBase
1818
import org.jetbrains.dokka.base.DokkaBaseConfiguration
1919
import org.jetbrains.dokka.gradle.DokkaTaskPartial
20+
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
21+
import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
2022
import org.semver.Version
2123

2224
buildscript {
@@ -76,12 +78,25 @@ subprojects {
7678
version.set("0.50.0")
7779
}
7880

81+
val kotlinApiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_6
7982
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
8083
if (!name.lowercase().contains("test")) {
8184
kotlinOptions {
8285
jvmTarget = "11"
8386
freeCompilerArgs += listOf("-Xjvm-default=all-compatibility")
84-
apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_6.version
87+
apiVersion = kotlinApiVersion.version
88+
}
89+
}
90+
}
91+
92+
plugins.withType<KotlinMultiplatformPluginWrapper> {
93+
project.extensions.configure<KotlinMultiplatformExtension> {
94+
sourceSets.all {
95+
if (!name.lowercase().contains("test")) {
96+
languageSettings {
97+
apiVersion = kotlinApiVersion.version
98+
}
99+
}
85100
}
86101
}
87102
}

‎bulk-model-sync-gradle-test/src/test/kotlin/org/modelix/model/sync/gradle/test/PushTest.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ import org.modelix.metamodel.typed
1111
import org.modelix.model.ModelFacade
1212
import org.modelix.model.api.ConceptReference
1313
import org.modelix.model.api.IBranch
14-
import org.modelix.model.api.ILanguageRepository
1514
import org.modelix.model.api.getDescendants
1615
import org.modelix.model.api.getRootNode
1716
import org.modelix.model.client2.ModelClientV2PlatformSpecificBuilder
1817
import org.modelix.model.client2.getReplicatedModel
1918
import org.modelix.model.data.ModelData
2019
import org.modelix.model.data.NodeData
2120
import org.modelix.model.lazy.RepositoryId
22-
import org.modelix.model.mpsadapters.RepositoryLanguage
2321
import org.modelix.model.server.Main
2422
import org.modelix.model.sleep
2523
import org.modelix.model.sync.bulk.asExported
@@ -38,7 +36,6 @@ class PushTest {
3836

3937
TypedLanguagesRegistry.register(L_GraphLang)
4038
TypedLanguagesRegistry.register(L_jetbrains_mps_lang_core)
41-
ILanguageRepository.default.registerLanguage(RepositoryLanguage)
4239

4340
val repoId = RepositoryId("ci-test")
4441
val branchName = "master"

‎bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/config/ModelSyncGradleSettings.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package org.modelix.model.sync.bulk.gradle.config
1818

1919
import org.gradle.api.Action
2020
import org.modelix.model.api.ILanguage
21-
import org.modelix.model.mpsadapters.RepositoryLanguage
2221
import java.io.File
2322

2423
open class ModelSyncGradleSettings {
@@ -41,7 +40,7 @@ data class SyncDirection(
4140
internal var source: SyncEndPoint? = null,
4241
internal var target: SyncEndPoint? = null,
4342
internal val includedModules: Set<String> = mutableSetOf(),
44-
internal val registeredLanguages: Set<ILanguage> = mutableSetOf(RepositoryLanguage),
43+
internal val registeredLanguages: Set<ILanguage> = mutableSetOf(),
4544
) {
4645
fun fromModelServer(action: Action<ServerSource>) {
4746
val endpoint = ServerSource()

‎bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,15 @@ import org.gradle.api.tasks.Optional
2626
import org.gradle.api.tasks.OutputDirectory
2727
import org.gradle.api.tasks.TaskAction
2828
import org.modelix.model.ModelFacade
29+
import org.modelix.model.api.BuiltinLanguages
2930
import org.modelix.model.api.IBranch
30-
import org.modelix.model.api.IProperty
3131
import org.modelix.model.api.PBranch
3232
import org.modelix.model.api.getRootNode
3333
import org.modelix.model.client2.IModelClientV2
3434
import org.modelix.model.client2.ModelClientV2
3535
import org.modelix.model.client2.ModelClientV2PlatformSpecificBuilder
3636
import org.modelix.model.client2.getReplicatedModel
3737
import org.modelix.model.lazy.RepositoryId
38-
import org.modelix.model.mpsadapters.RepositoryLanguage
3938
import org.modelix.model.sync.bulk.ModelExporter
4039
import javax.inject.Inject
4140

@@ -73,8 +72,9 @@ abstract class ExportFromModelServer @Inject constructor(of: ObjectFactory) : De
7372
logger.info("Got root node: {}", root)
7473
val outputDir = outputDir.get().asFile
7574
root.allChildren.forEach {
76-
val nameRole = IProperty.fromName(RepositoryLanguage.NamePropertyUID)
77-
val outputFile = outputDir.resolve("${it.getPropertyValue(nameRole)}.json")
75+
val nameRole = BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name
76+
val fileName = it.getPropertyValue(nameRole)
77+
val outputFile = outputDir.resolve("$fileName.json")
7878
ModelExporter(it).export(outputFile)
7979
}
8080
}

‎bulk-model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/bulk/ModelExporter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fun INode.asExported(): NodeData {
3333
val idKey = NodeData.idPropertyKey
3434
return NodeData(
3535
id = getPropertyValue(idKey) ?: reference.serialize(),
36-
concept = concept?.getUID(),
36+
concept = getConceptReference()?.getUID(),
3737
role = roleInParent,
3838
properties = getPropertyRoles().associateWithNotNull { getPropertyValue(it) }.filterKeys { it != idKey },
3939
references = getReferenceRoles().associateWithNotNull {

‎bulk-model-sync-solution/solutions/org.modelix.mps.model.sync.bulk/models/org.modelix.mps.model.sync.bulk.mps‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
1313
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
1414
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
15-
<import index="lui3" ref="ac6b4971-2a89-49fb-9c30-c2f0e85de741/java:org.jetbrains.mps.openapi.module(org.modelix.model.sync.mps/)" />
1615
<import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
1716
<import index="vgv4" ref="ac6b4971-2a89-49fb-9c30-c2f0e85de741/java:org.modelix.model.sync.bulk(org.modelix.mps.model.sync.bulk/)" />
1817
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
@@ -214,11 +213,11 @@
214213
</node>
215214
</node>
216215
<node concept="liA8E" id="7gc0jqT50Zl" role="2OqNvi">
217-
<ref role="37wK5l" to="lui3:~SRepository.getModelAccess()" resolve="getModelAccess" />
216+
<ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
218217
</node>
219218
</node>
220219
<node concept="liA8E" id="7gc0jqT51ES" role="2OqNvi">
221-
<ref role="37wK5l" to="lui3:~ModelAccess.runReadAction(java.lang.Runnable)" resolve="runReadAction" />
220+
<ref role="37wK5l" to="lui2:~ModelAccess.runReadAction(java.lang.Runnable)" resolve="runReadAction" />
222221
<node concept="1bVj0M" id="7gc0jqT52FG" role="37wK5m">
223222
<node concept="3clFbS" id="7gc0jqT52FH" role="1bW5cS">
224223
<node concept="2Gpval" id="7gc0jqT4L4n" role="3cqZAp">
@@ -292,7 +291,7 @@
292291
<ref role="2Gs0qQ" node="7gc0jqT4L4p" resolve="module" />
293292
</node>
294293
<node concept="liA8E" id="7gc0jqT4VGG" role="2OqNvi">
295-
<ref role="37wK5l" to="lui3:~SModule.getModuleName()" resolve="getModuleName" />
294+
<ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
296295
</node>
297296
</node>
298297
</node>
@@ -325,7 +324,7 @@
325324
<ref role="2Gs0qQ" node="7gc0jqT4L4p" resolve="module" />
326325
</node>
327326
<node concept="liA8E" id="7gc0jqT4Pxy" role="2OqNvi">
328-
<ref role="37wK5l" to="lui3:~SModule.getModuleName()" resolve="getModuleName" />
327+
<ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
329328
</node>
330329
</node>
331330
</node>
@@ -342,7 +341,7 @@
342341
</node>
343342
</node>
344343
<node concept="liA8E" id="2rlXDkQHjK2" role="2OqNvi">
345-
<ref role="37wK5l" to="lui3:~SRepository.getModules()" resolve="getModules" />
344+
<ref role="37wK5l" to="lui2:~SRepository.getModules()" resolve="getModules" />
346345
</node>
347346
</node>
348347
</node>
@@ -393,7 +392,7 @@
393392
<node concept="3cpWsn" id="5hPHAtnuNfe" role="3cpWs9">
394393
<property role="TrG5h" value="access" />
395394
<node concept="3uibUv" id="5hPHAtnuNff" role="1tU5fm">
396-
<ref role="3uigEE" to="lui3:~ModelAccess" resolve="ModelAccess" />
395+
<ref role="3uigEE" to="lui2:~ModelAccess" resolve="ModelAccess" />
397396
</node>
398397
<node concept="2OqwBi" id="5hPHAtnuPZo" role="33vP2m">
399398
<node concept="2OqwBi" id="5hPHAtnuP3e" role="2Oq$k0">
@@ -405,15 +404,15 @@
405404
</node>
406405
</node>
407406
<node concept="liA8E" id="5hPHAtnuQzp" role="2OqNvi">
408-
<ref role="37wK5l" to="lui3:~SRepository.getModelAccess()" resolve="getModelAccess" />
407+
<ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
409408
</node>
410409
</node>
411410
</node>
412411
</node>
413412
<node concept="3clFbF" id="7gc0jqT4cDu" role="3cqZAp">
414413
<node concept="2OqwBi" id="7gc0jqT4duu" role="3clFbG">
415414
<node concept="liA8E" id="7gc0jqT4dK5" role="2OqNvi">
416-
<ref role="37wK5l" to="lui3:~ModelAccess.runWriteInEDT(java.lang.Runnable)" resolve="runWriteInEDT" />
415+
<ref role="37wK5l" to="lui2:~ModelAccess.runWriteInEDT(java.lang.Runnable)" resolve="runWriteInEDT" />
417416
<node concept="1bVj0M" id="2rlXDkQJYC6" role="37wK5m">
418417
<node concept="3clFbS" id="2rlXDkQJYC7" role="1bW5cS">
419418
<node concept="3clFbH" id="5hPHAtnv11y" role="3cqZAp" />
@@ -423,7 +422,7 @@
423422
<ref role="3cqZAo" node="5hPHAtnuNfe" resolve="access" />
424423
</node>
425424
<node concept="liA8E" id="5hPHAtnuXkz" role="2OqNvi">
426-
<ref role="37wK5l" to="lui3:~ModelAccess.executeCommand(java.lang.Runnable)" resolve="executeCommand" />
425+
<ref role="37wK5l" to="lui2:~ModelAccess.executeCommand(java.lang.Runnable)" resolve="executeCommand" />
427426
<node concept="1bVj0M" id="5hPHAtnuXKQ" role="37wK5m">
428427
<node concept="3clFbS" id="5hPHAtnuXKR" role="1bW5cS">
429428
<node concept="2Gpval" id="2rlXDkQJYPO" role="3cqZAp">
@@ -440,7 +439,7 @@
440439
</node>
441440
</node>
442441
<node concept="liA8E" id="2rlXDkQJZK3" role="2OqNvi">
443-
<ref role="37wK5l" to="lui3:~SRepository.getModules()" resolve="getModules" />
442+
<ref role="37wK5l" to="lui2:~SRepository.getModules()" resolve="getModules" />
444443
</node>
445444
</node>
446445
<node concept="3clFbS" id="2rlXDkQJYPU" role="2LFqv$">
@@ -472,7 +471,7 @@
472471
<ref role="2Gs0qQ" node="2rlXDkQJYPQ" resolve="module" />
473472
</node>
474473
<node concept="liA8E" id="2rlXDkQK56z" role="2OqNvi">
475-
<ref role="37wK5l" to="lui3:~SModule.getModuleName()" resolve="getModuleName" />
474+
<ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
476475
</node>
477476
</node>
478477
</node>
@@ -564,11 +563,11 @@
564563
</node>
565564
</node>
566565
<node concept="liA8E" id="5hPHAtnunD1" role="2OqNvi">
567-
<ref role="37wK5l" to="lui3:~SRepository.getModelAccess()" resolve="getModelAccess" />
566+
<ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
568567
</node>
569568
</node>
570569
<node concept="liA8E" id="5hPHAtnuoMh" role="2OqNvi">
571-
<ref role="37wK5l" to="lui3:~ModelAccess.runWriteAction(java.lang.Runnable)" resolve="runWriteAction" />
570+
<ref role="37wK5l" to="lui2:~ModelAccess.runWriteAction(java.lang.Runnable)" resolve="runWriteAction" />
572571
<node concept="1bVj0M" id="5hPHAtnupBD" role="37wK5m">
573572
<node concept="3clFbS" id="5hPHAtnupBE" role="1bW5cS">
574573
<node concept="3clFbF" id="5hPHAtnuqbK" role="3cqZAp">
@@ -582,7 +581,7 @@
582581
</node>
583582
</node>
584583
<node concept="liA8E" id="5hPHAtnuseN" role="2OqNvi">
585-
<ref role="37wK5l" to="lui3:~SRepository.saveAll()" resolve="saveAll" />
584+
<ref role="37wK5l" to="lui2:~SRepository.saveAll()" resolve="saveAll" />
586585
</node>
587586
</node>
588587
</node>

‎model-api-gen-runtime/src/commonMain/kotlin/org/modelix/metamodel/TypedLanguagesRegistry.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ object TypedLanguagesRegistry : ILanguageRepository {
4545
?: return UnknownConceptInstance(node)
4646
return concept.wrap(node)
4747
}
48+
49+
override fun getPriority(): Int = 2000
4850
}
4951

5052
fun <NodeT : ITypedNode> INode.typed(nodeClass: KClass<NodeT>): NodeT = nodeClass.cast(TypedLanguagesRegistry.wrapNode(this))

0 commit comments

Comments
 (0)