Skip to content

Commit 3fd9deb

Browse files
authored
Merge pull request #148 from ModelingValueGroup/develop
Develop
2 parents 26b7783 + 2d8e57f commit 3fd9deb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+8802
-1807
lines changed

.github/workflows/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ jobs:
2727
JETBRAINS_PUBLISH_TOKEN: "${{secrets.JETBRAINS_PUBLISH_TOKEN}}"
2828
CI: "true"
2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131
with:
3232
fetch-depth: 0
3333

3434
- uses: actions/setup-java@v3
3535
with:
36-
java-version: 11
37-
distribution: zulu
36+
java-version: 17
37+
distribution: temurin
3838

3939
################################################################################
4040
- name: "bootstrap"

.github/workflows/to-wiki.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
TOKEN: "${{secrets.ALLREP_TOKEN}}"
2727
CI: "true"
2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030
with:
3131
path: 'source'
3232

33-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4
3434
with:
3535
repository: "${{github.repository}}.wiki"
3636
ref: master

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.mps/migration.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<entry key="jetbrains.mps.ide.mpsmigration.v_2019_3.DefaultFacetExplicitPersistence" value="executed" />
99
<entry key="jetbrains.mps.ide.mpsmigration.v_2021_2.SplitMPSCoreStub" value="executed" />
1010
<entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
11-
<entry key="project.migrated.version" value="213" />
11+
<entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
12+
<entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
13+
<entry key="project.migrated.version" value="223" />
1214
</component>
1315
</project>

build.gradle.kts

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ defaultTasks(
2121
)
2222
plugins {
2323
id("org.modelingvalue.gradle.mvgplugin") version "1.1.3"
24-
id("com.dorongold.task-tree") version "2.1.1" // to get a task-tree generation task
2524
}
2625

2726
///////////////////////////////////////////////////////////////////////////////////////////////
2827
// import ant file:
2928
try {
29+
val version_mps: String by project
3030
if (!mvgmps.mpsInstallDir.isDirectory)
3131
throw GradleException("You need to first run './gradlew --build-file bootstrap.gradle.kts' to download MPS")
3232

@@ -35,6 +35,7 @@ try {
3535
ant.setProperty("version", version)
3636
ant.setProperty("versionExtra", mvgmps.versionExtra)
3737
ant.setProperty("versionStamp", mvgmps.versionStamp)
38+
ant.setProperty("version_mps", version_mps)
3839
// WORKAROUND START (see https://youtrack.jetbrains.com/issue/MPS-34059)
3940
// for UTF-8 chars used in MPS: add file.encoding to jvmargs, crude but works for now
4041
val antScript = resources.text.fromString(gradle.rootProject.projectDir.resolve("mps_build.xml").readLines().joinToString(separator = System.lineSeparator()) {
@@ -65,16 +66,24 @@ try {
6566
ant.setProperty("versionStamp", mvgmps.versionStamp)
6667
}
6768
}
68-
val cleanGenDirs = tasks.create("clean_gen_dirs") {
69+
val clean_gen_dirs = tasks.create("clean_gen_dirs") {
6970
group = "build"
7071
doLast {
71-
listOf("languages", "solutions").forEach { d ->
72-
File(d).walkTopDown().filter {
72+
listOf("languages", "solutions").forEach {
73+
val d = project.projectDir.resolve(it)
74+
println("INFO: cleaning all _gen dirs from: $d")
75+
d.walkTopDown().filter {
7376
it.name.contains("_gen")
7477
}.forEach {
7578
it.deleteRecursively()
7679
}
7780
}
81+
val buildDir = project.projectDir.resolve("build")
82+
listOf("tmp", "artifacts").forEach {
83+
val d = buildDir.resolve(it)
84+
println("INFO: cleaning from build dir: $d")
85+
d.deleteRecursively()
86+
}
7887
}
7988
}
8089
tasks.create("build") {
@@ -83,14 +92,14 @@ try {
8392
}
8493
tasks.create("clean") {
8594
group = "build"
86-
dependsOn(cleanGenDirs)
95+
dependsOn(clean_gen_dirs)
8796
}
8897
tasks.create("publish") {
8998
group = "publishing"
9099
dependsOn(tasks.named("mpsant-assemble"))
91100
}
92101
} catch (e: Exception) {
93-
println("problem with importing ant: $e")
102+
println("problem with import of ant file mps_build.xml: " + e)
94103
}
95104
///////////////////////////////////////////////////////////////////////////////////////////////
96105
// upload plugin to jetbrains

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
# suppress inspection "UnusedProperty" for whole file
1717
group = org.modelingvalue
1818
artifact = DclareForMPS
19-
version = 3.1.0
20-
version_java = 11
21-
version_mps = 2021.3.1
19+
version = 4.0.0
20+
version_java = 17
21+
version_mps = 2022.3

languages/DclareGui/DclareGui.mpl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</modelRoot>
77
</models>
88
<facets>
9-
<facet type="java">
9+
<facet type="java" compile="mps" classes="mps" ext="yes">
1010
<classes generated="true" path="${module}/classes_gen" />
1111
</facet>
1212
</facets>
@@ -18,6 +18,7 @@
1818
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
1919
<dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
2020
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
21+
<dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
2122
</dependencies>
2223
<languageVersions>
2324
<language slang="l:c32b788d-8e4b-4023-97f5-3e90d04ed77b:DclareMPS" version="5" />
@@ -52,8 +53,11 @@
5253
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
5354
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
5455
<module reference="cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)" version="0" />
56+
<module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
5557
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
5658
<module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
59+
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
60+
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
5761
</dependencyVersions>
5862
<extendedLanguages />
5963
</language>

languages/DclareGui/models/DclareGui.editor.mps

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,26 @@
1414
</imports>
1515
<registry>
1616
<language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
17-
<concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
17+
<concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi">
18+
<child id="1078153129734" name="inspectedCellModel" index="6VMZX" />
19+
</concept>
1820
<concept id="1140524381322" name="jetbrains.mps.lang.editor.structure.CellModel_ListWithRole" flags="ng" index="2czfm3">
1921
<property id="1140524450557" name="separatorText" index="2czwfO" />
2022
<child id="1140524464360" name="cellLayout" index="2czzBx" />
2123
</concept>
2224
<concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
25+
<concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
2326
<concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
2427
<concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
2528
<concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
29+
<concept id="4242538589859161874" name="jetbrains.mps.lang.editor.structure.ExplicitHintsSpecification" flags="ng" index="2w$q5c" />
2630
<concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
2731
<child id="1080736633877" name="cellModel" index="2wV5jI" />
2832
</concept>
2933
<concept id="1078938745671" name="jetbrains.mps.lang.editor.structure.EditorComponentDeclaration" flags="ig" index="PKFIW" />
34+
<concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
35+
<reference id="1078939183255" name="editorComponent" index="PMmxG" />
36+
</concept>
3037
<concept id="8313721352726366579" name="jetbrains.mps.lang.editor.structure.CellModel_Empty" flags="ng" index="35HoNQ" />
3138
<concept id="1103016434866" name="jetbrains.mps.lang.editor.structure.CellModel_JComponent" flags="sg" stub="8104358048506731196" index="3gTLQM">
3239
<child id="1176475119347" name="componentProvider" index="3FoqZy" />
@@ -44,6 +51,7 @@
4451
</concept>
4552
<concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
4653
<child id="1106270802874" name="cellLayout" index="2iSdaV" />
54+
<child id="4242538589862653897" name="addHints" index="2whIAn" />
4755
<child id="1073389446424" name="childCellModel" index="3EZMnx" />
4856
</concept>
4957
<concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
@@ -298,5 +306,70 @@
298306
</node>
299307
</node>
300308
</node>
309+
<node concept="24kQdi" id="67eN9Qkg3uH">
310+
<property role="3GE5qa" value="concept_diagram" />
311+
<ref role="1XX52x" to="53d4:67eN9Qkg3uD" resolve="ConceptRef" />
312+
<node concept="1iCGBv" id="67eN9Qkg3uJ" role="2wV5jI">
313+
<ref role="1NtTu8" to="53d4:67eN9Qkg3uE" resolve="concept" />
314+
<node concept="1sVBvm" id="67eN9Qkg3uL" role="1sWHZn">
315+
<node concept="3F0A7n" id="67eN9Qkg3uV" role="2wV5jI">
316+
<property role="1Intyy" value="true" />
317+
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
318+
</node>
319+
</node>
320+
</node>
321+
</node>
322+
<node concept="24kQdi" id="67eN9QkCk8_">
323+
<property role="3GE5qa" value="concept_diagram" />
324+
<ref role="1XX52x" to="53d4:67eN9QkffP5" resolve="ConceptDiagram" />
325+
<node concept="3EZMnI" id="4Oa6zNZyZYT" role="2wV5jI">
326+
<node concept="2iRkQZ" id="4Oa6zNZyZYU" role="2iSdaV" />
327+
<node concept="3EZMnI" id="4Oa6zNZyZZ8" role="3EZMnx">
328+
<node concept="2iRfu4" id="4Oa6zNZyZZ9" role="2iSdaV" />
329+
<node concept="3F0ifn" id="4Oa6zNZyZZi" role="3EZMnx">
330+
<property role="3F0ifm" value="diagram" />
331+
</node>
332+
<node concept="3F0A7n" id="4Oa6zNZyZYQ" role="3EZMnx">
333+
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
334+
</node>
335+
</node>
336+
<node concept="PMmxH" id="1CjrrCKbnX3" role="3EZMnx">
337+
<ref role="PMmxG" node="31sbKqyPMrZ" resolve="IEditorComponent" />
338+
</node>
339+
<node concept="2w$q5c" id="6E86S2AAv3q" role="2whIAn" />
340+
</node>
341+
<node concept="3EZMnI" id="67eN9QkViCq" role="6VMZX">
342+
<node concept="2iRkQZ" id="67eN9QkViCr" role="2iSdaV" />
343+
<node concept="3EZMnI" id="67eN9QkViD9" role="3EZMnx">
344+
<node concept="2iRfu4" id="67eN9QkViDa" role="2iSdaV" />
345+
<node concept="3F0ifn" id="67eN9QkViDm" role="3EZMnx">
346+
<property role="3F0ifm" value="manual" />
347+
</node>
348+
<node concept="3F0ifn" id="67eN9QkViDp" role="3EZMnx">
349+
<property role="3F0ifm" value="selection" />
350+
</node>
351+
<node concept="3F0A7n" id="12WXgwl7BMy" role="3EZMnx">
352+
<ref role="1NtTu8" to="53d4:12WXgwl7Bd8" resolve="manual" />
353+
</node>
354+
</node>
355+
<node concept="3F0ifn" id="67eN9QkViCO" role="3EZMnx" />
356+
<node concept="3EZMnI" id="1CjrrCKbDnN" role="3EZMnx">
357+
<node concept="l2Vlx" id="1CjrrCKbDnO" role="2iSdaV" />
358+
<node concept="3F0ifn" id="1CjrrCKbDo0" role="3EZMnx">
359+
<property role="3F0ifm" value="concepts" />
360+
</node>
361+
<node concept="3F0ifn" id="1CjrrCKbDos" role="3EZMnx">
362+
<property role="3F0ifm" value="(" />
363+
</node>
364+
<node concept="3F2HdR" id="1CjrrCKbDnL" role="3EZMnx">
365+
<property role="2czwfO" value="," />
366+
<ref role="1NtTu8" to="53d4:67eN9Qkfp8P" resolve="concepts" />
367+
</node>
368+
<node concept="3F0ifn" id="1CjrrCKbDoi" role="3EZMnx">
369+
<property role="3F0ifm" value=")" />
370+
</node>
371+
</node>
372+
</node>
373+
</node>
301374
</model>
302375

0 commit comments

Comments
 (0)