Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
276 commits
Select commit Hold shift + click to select a range
4b77829
Reload build scripts from disk
sergej-koscejev Jul 26, 2024
ff2f18f
Merge pull request #892 from JetBrains/feature/reload-build-scripts
sergej-koscejev Jul 26, 2024
c317bb5
Merge remote-tracking branch 'origin/maintenance/mps20232' into merge…
sergej-koscejev Jul 26, 2024
1cd46da
Run migrations
sergej-koscejev Jul 26, 2024
33374a8
Merge remote-tracking branch 'origin/master' into merge/mps20232
sergej-koscejev Jul 26, 2024
d3ad976
Merge pull request #890 from JetBrains/merge/mps20232
sergej-koscejev Jul 26, 2024
c4b5c93
Merge master into merge/mps20232
github-actions[bot] Jul 28, 2024
6882e9c
Merge pull request #895 from JetBrains/merge/mps20232
Jul 28, 2024
2067cb0
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Jul 29, 2024
aa58cb7
Merge pull request #899 from JetBrains/dependabot/gradle/com.jetbrain…
sergej-koscejev Aug 1, 2024
e594a71
Merge master into merge/mps20232
github-actions[bot] Aug 2, 2024
915233f
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Aug 5, 2024
2da361a
build(deps): bump de.itemis.mps.gradle.launcher
dependabot[bot] Aug 5, 2024
1dab3cc
Merge pull request #906 from JetBrains/merge/mps20232
Aug 6, 2024
2fc6d08
Merge pull request #910 from JetBrains/dependabot/gradle/com.jetbrain…
Aug 6, 2024
003b6c5
Merge pull request #911 from JetBrains/dependabot/gradle/de.itemis.mp…
Aug 6, 2024
9f85703
Merge remote-tracking branch 'origin/merge/mps20232'
sergej-koscejev Aug 9, 2024
e3018a1
Run migrations/MPS file updates
sergej-koscejev Aug 12, 2024
00efdb1
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Aug 12, 2024
023095b
Merge pull request #922 from JetBrains/dependabot/gradle/com.jetbrain…
Aug 13, 2024
7b3eb73
Merge remote-tracking branch 'refs/remotes/origin/maintenance/mps2023…
Aug 13, 2024
3b1dc09
Merge remote-tracking branch 'refs/remotes/origin/master' into merge/…
Aug 13, 2024
16fb582
Merge branch 'master' into merge/mps20232
Aug 13, 2024
224ce84
Merge pull request #912 from JetBrains/merge/mps20232
Aug 13, 2024
e5ff7b6
blutil: PerformanceProfiler - Statement vs StatementList
artem-tikhomirov Aug 13, 2024
77962ae
Merge pull request #924 from JetBrains/merge/blutil-statement-child
Aug 13, 2024
c854959
hacks.editor: EditorExtensionRegistry is now CC
artem-tikhomirov Aug 14, 2024
84e8c43
Replace deprecated hacks.editor.EditorComponentCreationListener
artem-tikhomirov Aug 14, 2024
bcab7dd
Merge pull request #926 from JetBrains/merge/EditorComponentCreationL…
Aug 19, 2024
6f56872
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Aug 19, 2024
ab933f6
Merge pull request #927 from JetBrains/dependabot/gradle/com.jetbrain…
Aug 20, 2024
0ff52e9
Access ReloadManager impl through interface and getInstance()
artem-tikhomirov Aug 20, 2024
a48077c
Merge pull request #928 from JetBrains/merge/ReloadManager
Aug 21, 2024
82be768
build(deps): bump org.eclipse.emf:org.eclipse.emf.ecore.xmi
dependabot[bot] Aug 26, 2024
f733d7f
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Aug 26, 2024
6e89b75
build(deps): bump org.eclipse.emf:org.eclipse.emf.common
dependabot[bot] Aug 26, 2024
04e33da
Merge pull request #931 from JetBrains/dependabot/gradle/org.eclipse.…
Aug 27, 2024
8ce7d36
Merge pull request #934 from JetBrains/dependabot/gradle/org.eclipse.…
Aug 27, 2024
56ae100
build(deps): bump org.eclipse.emf:org.eclipse.emf.ecore
dependabot[bot] Aug 27, 2024
7962dec
Merge pull request #932 from JetBrains/dependabot/gradle/org.eclipse.…
Aug 27, 2024
1e86967
Add mps-testing plugin
sergej-koscejev Sep 2, 2024
e6f2dee
Run migrations
sergej-koscejev Sep 2, 2024
1af78c7
Merge pull request #933 from JetBrains/dependabot/gradle/com.jetbrain…
sergej-koscejev Sep 2, 2024
70b5e9e
build(deps): bump org.apache.ant:ant-junit4 from 1.10.14 to 1.10.15
dependabot[bot] Sep 2, 2024
c5855a4
build(deps): bump org.apache.ant:ant-junit from 1.10.14 to 1.10.15
dependabot[bot] Sep 2, 2024
3cfd4df
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Sep 2, 2024
8fabf55
editor.diagram: remove the flaky activity collapse test
Sep 3, 2024
855b7e0
Merge pull request #940 from JetBrains/dependabot/gradle/com.jetbrain…
sergej-koscejev Sep 5, 2024
f1e8198
Merge pull request #939 from JetBrains/dependabot/gradle/org.apache.a…
sergej-koscejev Sep 5, 2024
7042edb
Merge pull request #938 from JetBrains/dependabot/gradle/org.apache.a…
sergej-koscejev Sep 5, 2024
4f9a6ad
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Sep 9, 2024
6ceab3d
MPS file updates
sergej-koscejev Sep 11, 2024
bb48bd0
Merge pull request #943 from JetBrains/dependabot/gradle/com.jetbrain…
sergej-koscejev Sep 11, 2024
3e9f438
Merge remote-tracking branch 'refs/remotes/origin/master' into merge/…
Sep 11, 2024
f47fd32
update the Kotlin stubs
Sep 11, 2024
2a777a6
force save all
Sep 11, 2024
9929ed9
Merge pull request #925 from JetBrains/merge/mps20232
Sep 11, 2024
b394077
Merge master into merge/mps20232
github-actions[bot] Sep 12, 2024
cbade73
Merge pull request #948 from JetBrains/merge/mps20232
Sep 12, 2024
490d319
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Sep 16, 2024
bf0472f
Run resources migration (version change only)
sergej-koscejev Sep 18, 2024
339c8c0
Merge pull request #950 from JetBrains/dependabot/gradle/com.jetbrain…
sergej-koscejev Sep 18, 2024
a74a9e3
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Sep 23, 2024
b76fd28
Merge pull request #957 from JetBrains/dependabot/gradle/com.jetbrain…
sergej-koscejev Sep 28, 2024
133bb9f
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Sep 30, 2024
ff608f0
Merge pull request #959 from JetBrains/dependabot/gradle/com.jetbrain…
sergej-koscejev Oct 3, 2024
d4f14a5
Merge remote-tracking branch 'refs/remotes/origin/master' into merge/…
Oct 6, 2024
63c2b49
run migrations
Oct 6, 2024
78121a9
Merge pull request #964 from JetBrains/merge/mps20232
Oct 6, 2024
a62abd0
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Oct 7, 2024
d086d3d
Merge master into merge/mps20232
github-actions[bot] Oct 8, 2024
8ca780b
Merge pull request #968 from JetBrains/merge/mps20232
Oct 8, 2024
3145473
Merge pull request #965 from JetBrains/dependabot/gradle/com.jetbrain…
sergej-koscejev Oct 8, 2024
f5fa6e5
Merge master into merge/mps20232
github-actions[bot] Oct 9, 2024
b898377
Merge pull request #972 from JetBrains/merge/mps20232
Oct 9, 2024
c3cafbe
Merge master into merge/mps20232
github-actions[bot] Oct 10, 2024
573ea54
Merge maintenance/mps20232 into merge/mps20232
github-actions[bot] Oct 14, 2024
45150a5
run migrations
Oct 14, 2024
78943f2
Merge pull request #976 from JetBrains/merge/mps20232
Oct 14, 2024
041e90f
build(deps): bump org.apache.xmlgraphics:batik-svggen from 1.17 to 1.18
dependabot[bot] Oct 14, 2024
a5d8b56
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Oct 14, 2024
883937c
Merge master into merge/mps20232
github-actions[bot] Oct 16, 2024
a59277d
Merge pull request #985 from JetBrains/merge/mps20232
Oct 16, 2024
33d63f5
Merge master into merge/mps20232
github-actions[bot] Oct 17, 2024
35b1162
Merge pull request #987 from JetBrains/merge/mps20232
Oct 17, 2024
2dd2c2c
Merge pull request #982 from JetBrains/dependabot/gradle/com.jetbrain…
sergej-koscejev Oct 17, 2024
a13ea13
Merge pull request #981 from JetBrains/dependabot/gradle/org.apache.x…
sergej-koscejev Oct 17, 2024
1aafed9
build(deps): bump org.apache.xmlgraphics:batik-dom from 1.17 to 1.18
dependabot[bot] Oct 17, 2024
5dff62d
Merge pull request #980 from JetBrains/dependabot/gradle/org.apache.x…
sergej-koscejev Oct 17, 2024
3910ffe
Merge master into merge/mps20232
github-actions[bot] Oct 18, 2024
c35e63c
Update references to the ConsoleTool to retrieve it as a proper tool …
vaclav Oct 16, 2024
dc36732
Upgrade MPS version
sergej-koscejev Oct 22, 2024
148115c
Merge pull request #983 from JetBrains/243/vaclavServices
sergej-koscejev Oct 22, 2024
a615c65
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Oct 22, 2024
6404bfb
Merge pull request #993 from JetBrains/dependabot/gradle/com.jetbrain…
sergej-koscejev Oct 22, 2024
c73f95a
Merge maintenance/mps20232 into merge/mps20232
github-actions[bot] Oct 24, 2024
cffcbc3
Merge master into merge/mps20232
github-actions[bot] Oct 24, 2024
7d23f21
Merge maintenance/mps20232 into merge/mps20232
github-actions[bot] Oct 24, 2024
2531c94
Merge maintenance/mps20232 into merge/mps20232
github-actions[bot] Oct 29, 2024
7aa1c5d
Merge maintenance/mps20232 into merge/mps20232
github-actions[bot] Oct 31, 2024
5cc1d8f
Merge maintenance/mps20232 into merge/mps20232
github-actions[bot] Nov 4, 2024
fcae8ac
Merge remote-tracking branch 'origin/merge/mps20232' into merge/mps20232
Nov 5, 2024
2d6136d
run migrations
Nov 5, 2024
4ff035e
Merge pull request #990 from JetBrains/merge/mps20232
Nov 5, 2024
68af78c
update the changelog
Nov 5, 2024
53ea545
debug.runtime.plugin: fix the reference to the ConsoleTool
Nov 5, 2024
4a2289e
Fix reference in UseStuffFromAppJar.
mvlassiev Oct 30, 2024
c4cc88b
Use JDK 21.0.5b631.8 for MPS 2024.3 EAP
mvlassiev Oct 29, 2024
158fe43
Bump MPS version
sergej-koscejev Nov 8, 2024
387d99f
Run migrations
sergej-koscejev Nov 8, 2024
0e42d6c
Remove jdk_home computation, always use the downloaded JBR
sergej-koscejev Nov 8, 2024
337c42f
Merge pull request #1008 from JetBrains/mps/2024.3
sergej-koscejev Nov 8, 2024
62250e4
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Nov 8, 2024
13f7e2f
extensions.changelog: reactivate compilation and loading for the solu…
Nov 5, 2024
04d8453
mps.changelog: handle the case when the timestamp is null in the header
Nov 5, 2024
128066d
remove unmaintained native libs loader plugin
Nov 5, 2024
20b1306
remove broken xmodelgen language
Nov 5, 2024
69d0a55
langvis: open the tool on the EDT thread
Nov 5, 2024
ce618a6
fix a wrong reference
Nov 5, 2024
46cc122
statistics.plugin: fix naming violation in action name
Nov 5, 2024
a717112
remove unneeded test solution de.slisson.mps.testutils
Nov 5, 2024
c59015c
build: use MPS 2024.1.1 and corresponding JBR
Nov 5, 2024
683c874
retrieve the EditorExtensionRegistry from the MPS project
Nov 6, 2024
1928a0d
editor.diagram: update actions in the background
Nov 6, 2024
ae23faf
tables.runtime: update TableActions group in the background
Nov 6, 2024
114f156
linenumbers: don't install line numbers if the editor component is al…
Nov 6, 2024
280fdbd
MPS.ThirdParty: also expose util.jar
Nov 6, 2024
b46fe15
stubs.batik: expose the stubs correctly and ship full batik-all jar
Nov 6, 2024
ae4edb9
build: use MPS 2024.1.1 and corresponding JBR
Nov 5, 2024
74b677a
Merge pull request #1010 from JetBrains/feature/version-2024-1
sergej-koscejev Nov 9, 2024
d1be3a1
Merge remote-tracking branch 'origin/master' into merge/mps20241
sergej-koscejev Nov 9, 2024
cbccc5b
Merge pull request #1006 from JetBrains/merge/mps20241
sergej-koscejev Nov 9, 2024
6310a18
Merge pull request #1009 from JetBrains/dependabot/gradle/com.jetbrai…
sergej-koscejev Nov 9, 2024
0c4035c
introduce a new plugin de.itemis.stubs.xml for XML libraries
Nov 7, 2024
6439f9a
run migrations
Nov 11, 2024
52c618c
remove xml-resolver entry
Nov 11, 2024
27bb8ec
Merge pull request #1005 from JetBrains/feature/migrate_to_2024_1
Nov 11, 2024
fc193ba
Merge master into merge/mps20241
github-actions[bot] Nov 11, 2024
1963fe3
Merge maintenance/mps20241 into merge/mps20232
github-actions[bot] Nov 11, 2024
51b7586
Merge pull request #1012 from JetBrains/merge/mps20241
sergej-koscejev Nov 11, 2024
8e9d7c8
Bump version number to 9999.9 again
sergej-koscejev Nov 11, 2024
b604d1d
Merge pull request #1014 from JetBrains/feature/update-versions-again
sergej-koscejev Nov 11, 2024
2b5df81
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Nov 11, 2024
c8207b6
fix batik stubs
Nov 12, 2024
091bd44
Merge pull request #1016 from JetBrains/bugfix/batik_stubs
Nov 12, 2024
6567730
Merge master into merge/mps20241
github-actions[bot] Nov 12, 2024
b836826
Merge pull request #1013 from JetBrains/merge/mps20232
Nov 12, 2024
154eedb
Merge maintenance/mps20241 into merge/mps20241
github-actions[bot] Nov 12, 2024
3f7f387
Merge pull request #1015 from JetBrains/dependabot/gradle/com.jetbrai…
Nov 12, 2024
ec21b2f
Revert "build(deps): bump com.jetbrains.mps:mps-prerelease from 243.2…
Nov 12, 2024
9a69ba5
Merge pull request #1018 from JetBrains/revert-1015-dependabot/gradle…
Nov 12, 2024
dd0bc69
Merge maintenance/mps20241 into merge/mps20232
github-actions[bot] Nov 13, 2024
3426b6d
Merge remote-tracking branch 'origin/master' into merge/mps20241
sergej-koscejev Nov 13, 2024
065918e
Run migrations, fix newline in batik stubs
sergej-koscejev Nov 13, 2024
107b036
Merge pull request #1017 from JetBrains/merge/mps20241
sergej-koscejev Nov 13, 2024
f1884d3
de.itemis.stubs.batik.msd: fix newline at EOF
sergej-koscejev Nov 13, 2024
1affa7b
Merge pull request #1020 from JetBrains/merge/mps20232
sergej-koscejev Nov 13, 2024
8b8653d
Merge master into merge/mps20241
github-actions[bot] Nov 13, 2024
c36a6d4
Merge pull request #1021 from JetBrains/merge/mps20241
sergej-koscejev Nov 13, 2024
806eecf
diagram.runtime: remove a debug statement
Nov 18, 2024
1d28b8f
Merge master into merge/mps20241
github-actions[bot] Nov 18, 2024
7d5ab52
Merge pull request #1025 from JetBrains/merge/mps20241
Nov 18, 2024
fa813e8
Merge remote-tracking branch 'refs/remotes/origin/maintenance/mps2024…
Nov 18, 2024
836ced2
force save all
Nov 18, 2024
112d5a5
linenumbers: also check that the idea project is not disposed
Nov 18, 2024
c7fa28d
Merge master into merge/mps20241
github-actions[bot] Nov 18, 2024
45b3af8
Merge pull request #1024 from JetBrains/merge/mps20232
Nov 18, 2024
99b4046
Merge maintenance/mps20241 into merge/mps20241
github-actions[bot] Nov 18, 2024
d9a75c7
run pending migrations
Nov 18, 2024
2c30bbd
Merge pull request #1026 from JetBrains/merge/mps20241
Nov 18, 2024
cd8fb99
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Nov 18, 2024
db3e523
build(deps): bump org.eclipse.emf:org.eclipse.emf.common
dependabot[bot] Nov 18, 2024
15c9b39
Merge pull request #1027 from JetBrains/dependabot/gradle/com.jetbrai…
sergej-koscejev Nov 19, 2024
bc7f9b4
Merge pull request #1028 from JetBrains/dependabot/gradle/org.eclipse…
sergej-koscejev Nov 19, 2024
9346596
build(deps): bump org.eclipse.emf:org.eclipse.emf.ecore
dependabot[bot] Nov 19, 2024
2035a9f
Merge pull request #1029 from JetBrains/dependabot/gradle/org.eclipse…
sergej-koscejev Nov 19, 2024
83ce459
delete all TestInfo nodes and set project path in tests build script
Nov 19, 2024
26fcbf6
diagram.runtime: dispose editor component only if it isn't null
Nov 19, 2024
2f7de97
model.merge.test: call ProjectManager with project argument
Nov 19, 2024
d42224f
editor.diagram: don't initialize the viewer in headless mode
Nov 19, 2024
f480e39
Merge pull request #1030 from JetBrains/bugfix/remove_TestInfo-nodes
Nov 19, 2024
da9a629
Merge master into merge/mps20241
github-actions[bot] Nov 19, 2024
706fd29
Merge pull request #1031 from JetBrains/merge/mps20241
sergej-koscejev Nov 19, 2024
36ea779
Merge pull request #1036 from JetBrains/merge/mps20241
mps-ci-buildbot Nov 20, 2024
2c80db9
Merge pull request #1037 from JetBrains/merge/master
mps-ci-buildbot Nov 20, 2024
75a97c2
build: use MPS 2024.3-EAP1
sergej-koscejev Nov 21, 2024
9a1242a
Merge branch 'merge/master'
sergej-koscejev Nov 21, 2024
9d8c683
Merge pull request #1038 from JetBrains/merge/master
sergej-koscejev Nov 21, 2024
d548e14
Add renovate.json
renovate[bot] Nov 22, 2024
67a30b0
Remove error messages in tests
mfsoliveira Nov 6, 2024
60ae630
Renaming
mfsoliveira Nov 25, 2024
1491af7
Merge pull request #1042 from JetBrains/merge/mps20241
mps-ci-buildbot Nov 25, 2024
2c44bb1
Merge pull request #1045 from JetBrains/merge/mps20241
mps-ci-buildbot Nov 25, 2024
cf0f67e
Merge pull request #1043 from JetBrains/merge/mps20243
mps-ci-buildbot Nov 25, 2024
2c82c4b
Merge pull request #1046 from JetBrains/merge/master
mps-ci-buildbot Nov 25, 2024
a4099c0
build(deps): bump com.jetbrains.mps:mps-prerelease
dependabot[bot] Nov 25, 2024
688a9e5
Update README.md
Nov 26, 2024
eea8707
Update README.md
Nov 26, 2024
9c07520
Merge pull request #1049 from JetBrains/merge/mps20241
mps-ci-buildbot Nov 26, 2024
30144b7
Merge pull request #1050 from JetBrains/merge/mps20243
mps-ci-buildbot Nov 26, 2024
db01f68
Merge pull request #1051 from JetBrains/merge/master
mps-ci-buildbot Nov 26, 2024
8051af7
Remove dependabot config
sergej-koscejev Nov 27, 2024
551237b
renovate: use JSON5, group Eclipse libraries
sergej-koscejev Nov 27, 2024
74cdbc9
Merge pull request #1047 from JetBrains/dependabot/gradle/com.jetbrai…
sergej-koscejev Nov 27, 2024
f46442c
Merge pull request #1039 from JetBrains/renovate/configure
sergej-koscejev Nov 27, 2024
df15fc0
chore(deps): update dependency autolink-references-mkdocs-plugin to v…
renovate[bot] Nov 27, 2024
9f370de
fix(deps): update dependency com.jetbrains.mps:mps-prerelease to v243…
renovate[bot] Nov 27, 2024
e0bedeb
Merge pull request #1052 from JetBrains/renovate/autolink-references-…
sergej-koscejev Nov 27, 2024
ce3be08
chore(deps): update dependency gradle to v8.11.1
renovate[bot] Nov 27, 2024
3f66cf6
chore(deps): update dependency mkdocs-autolinks-plugin to v0.7.1
renovate[bot] Nov 27, 2024
00ef5c5
Merge pull request #1056 from JetBrains/renovate/mkdocs-autolinks-plu…
sergej-koscejev Nov 27, 2024
0b1f31f
Merge pull request #1055 from JetBrains/renovate/gradle-8.x
sergej-koscejev Nov 27, 2024
e0627c6
Merge pull request #1053 from JetBrains/renovate/com.jetbrains.mps-mp…
sergej-koscejev Nov 27, 2024
a19671d
chore(deps): update dependency mkdocs-material to v9.5.46
renovate[bot] Nov 27, 2024
b562121
Merge pull request #1057 from JetBrains/renovate/mkdocs-material-9.x
Nov 28, 2024
0d9d803
Merge pull request #1062 from JetBrains/merge/mps20241
mps-ci-buildbot Nov 30, 2024
a4a3279
Merge pull request #1063 from JetBrains/merge/mps20243
mps-ci-buildbot Nov 30, 2024
a682798
Merge pull request #1064 from JetBrains/merge/master
mps-ci-buildbot Nov 30, 2024
19d229b
chore(deps): update dependency mkdocs-material to v9.5.47
renovate[bot] Dec 1, 2024
96f1d33
fix(deps): update dependency com.jetbrains.mps:mps-prerelease to v243…
renovate[bot] Dec 1, 2024
a096204
Merge pull request #1059 from JetBrains/renovate/com.jetbrains.mps-mp…
sergej-koscejev Dec 2, 2024
55772ce
shadowmodels: only activate the logical view extension if shadowmodel…
Dec 2, 2024
cd023d9
Merge pull request #1066 from JetBrains/bugfix/shadowmodels_extension
Dec 2, 2024
72c5653
Merge pull request #1065 from JetBrains/renovate/mkdocs-material-9.x
Dec 3, 2024
3fd7d2f
Merge branch 'maintenance/mps20243' into merge/mps20243
Dec 3, 2024
233b319
Merge pull request #1067 from JetBrains/merge/mps20243
mps-ci-buildbot Dec 3, 2024
490c83a
Merge pull request #1070 from JetBrains/merge/master
mps-ci-buildbot Dec 3, 2024
2774931
fix(deps): update dependency com.jetbrains.mps:mps-prerelease to v243…
renovate[bot] Dec 4, 2024
ac08e10
Merge pull request #1072 from JetBrains/merge/mps20241
mps-ci-buildbot Dec 4, 2024
3cc9bf5
Merge pull request #1073 from JetBrains/merge/mps20243
mps-ci-buildbot Dec 4, 2024
0a6277c
Merge pull request #1074 from JetBrains/merge/master
mps-ci-buildbot Dec 4, 2024
9892ed3
include a GitHub workflow for vulnerability scanning
Dec 4, 2024
db1964d
temporarily test it for pull requests
Dec 4, 2024
db59397
exclude the mps dependency when scanning
Dec 4, 2024
1b53d73
only call the dependencies task
Dec 4, 2024
b0241c5
use the github workspace variable to exclude a folder
Dec 4, 2024
2b274fb
use specific versions for the used GitHub actions
Dec 4, 2024
3725443
Merge pull request #1075 from JetBrains/feature/enable_vulnerability_…
Dec 4, 2024
af3f247
chore(deps): pin dependencies
renovate[bot] Dec 4, 2024
2469455
Merge pull request #1076 from JetBrains/renovate/pin-dependencies
Dec 4, 2024
e43a444
Merge pull request #1068 from JetBrains/renovate/com.jetbrains.mps-mp…
Dec 4, 2024
a833d9c
Reduce errors to warnings when finding missing policies.
mfsoliveira Dec 4, 2024
2554663
fix(deps): update dependency com.jetbrains.mps:mps-prerelease to v243…
renovate[bot] Dec 5, 2024
cf4150b
Merge pull request #1077 from JetBrains/renovate/com.jetbrains.mps-mp…
HeikoBecker Dec 5, 2024
f3b5c9e
Clean up
mfsoliveira Dec 5, 2024
3f0cffe
Add example with enumeration and changelog
mfsoliveira Dec 6, 2024
2d403d8
Update change log
mfsoliveira Dec 6, 2024
90d6369
update script
mfsoliveira Dec 6, 2024
26ca7f1
Merge branch 'master' into feature/ModelMerge_UseOnlyConceptsExisting…
mfsoliveira Dec 6, 2024
676a762
Apply remigrate
mfsoliveira Dec 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 0 additions & 12 deletions .github/dependabot.yml

This file was deleted.

18 changes: 18 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:best-practices"
],

"packageRules": [
{
"matchPackageNames": ["download-jbr:download-jbr.gradle.plugin", "de.itemis.mps.gradle.common:de.itemis.mps.gradle.common.gradle.plugin"],
"groupName": "mps-gradle-plugin",
"allowedVersions": "< 2.0"
},
{
"matchPackageNames": ["org.eclipse*"],
"groupName": "eclipse"
},
]
}
35 changes: 35 additions & 0 deletions .github/workflows/vulnerability-scanning.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
on: [pull_request]

jobs:
depchecktest:
runs-on: ubuntu-latest
name: depecheck_test
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- name: Setup Java
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4
with:
distribution: temurin
java-version: 17
- name: Setup Gradle
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4
- name: Call setup
run: ./gradlew dependencies
- name: Depcheck
uses: dependency-check/Dependency-Check_Action@3102a65fd5f36d0000297576acc56a475b0de98d
env:
# actions/setup-java changes JAVA_HOME, so it needs to be reset to match the depcheck image
JAVA_HOME: /opt/jdk
id: Depcheck
with:
project: 'MPS-extensions'
format: 'HTML'
out: 'reports'
args: >
--exclude ${{github.workspace}}/build/mps/**
- name: Upload Test results
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
with:
name: Depcheck report
path: ${{github.workspace}}/reports
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ All notable changes to this project are documented in this file.

The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) .The project does *not* follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.

## November 2024

### Changed

- The project was migrated to 2024.1.

### Removed

- *de.itemis.mps.nativelibs* : This unmaintained language was removed.
- *de.itemis.mps.hacks.xmodelgen* : This unmaintained (and broken) language was removed.

## October 2024

### Added
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MPS Extensions

<a href="https://mps.builds.itemis.cloud/project.html?projectId=Mbeddr2_Mbeddr_Gradle_MpsExtensions&tab=projectOverview"><img src="https://mps.builds.itemis.cloud/app/rest/builds/buildType:(id:Mbeddr2_Mbeddr_Gradle_MpsExtenstions)/statusIcon"/></a>
![JetBrains MPS 2023.2](https://img.shields.io/badge/JetBrains%20MPS-2023.2-orange)
![JetBrains MPS 2024.1](https://img.shields.io/badge/JetBrains%20MPS-2024.1-orange)

[![official JetBrains project](http://jb.gg/badges/official-flat-square.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)

Expand All @@ -17,7 +17,9 @@ To use MPS Extensions in your project, add one of the following dependencies to

| MPS version | nexus status |
| --------------- | --------------- |
| 2023.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/de/itemis/mps/extensions/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/latest)](https://artifacts.itemis.cloud/#browse/browse:maven-mps:de%2Fitemis%2Fmps%2Fextensions) |
| Master | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/de/itemis/mps/extensions/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/latest)](https://artifacts.itemis.cloud/#browse/browse:maven-mps:de%2Fitemis%2Fmps%2Fextensions) |
| 2024.1 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/de/itemis/mps/extensions/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2024.1')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:de%2Fitemis%2Fmps%2Fextensions) |
| 2023.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/de/itemis/mps/extensions/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2023.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:de%2Fitemis%2Fmps%2Fextensions) |
| 2022.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/de/itemis/mps/extensions/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2022.3')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:de%2Fitemis%2Fmps%2Fextensions) |
| 2022.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/de/itemis/mps/extensions/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2022.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:de%2Fitemis%2Fmps%2Fextensions) |
| 2021.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/de/itemis/mps/extensions/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2021.3')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:de%2Fitemis%2Fmps%2Fextensions) |
Expand Down
71 changes: 41 additions & 30 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id "com.github.breadmoirai.github-release" version "2.5.2"
id 'maven-publish'
id 'base'
id 'de.itemis.mps.gradle.launcher' version '2.4.2.+'
id 'de.itemis.mps.gradle.launcher' version '2.5.2.+'
}

import de.itemis.mps.gradle.*
Expand All @@ -17,7 +17,7 @@ import java.time.LocalDateTime
apply plugin: 'download-jbr'

downloadJbr {
jbrVersion = '17.0.8.1-b1000.32'
jbrVersion = '21.0.5-b631.8'
}

// detect if we are in a CI build
Expand All @@ -42,9 +42,9 @@ logger.info 'Repository username: {}', project.nexusUsername
// Dependency versions

// major version, e.g. '2021.1', '2021.2'
ext.mpsMajor = '2023.2'
ext.mpsMajor = '9999.9'
// optional minor/bugfix number (not added to the final build version)
ext.mpsMinor = '1'
ext.mpsMinor = ''
// e.g. Beta, EAP, RC
ext.mpsReleaseType = ''

Expand All @@ -60,8 +60,7 @@ if (ciBuild) {
if (branch.matches(/(maintenance|mps)[\/-](mps)?\d+(\.\d+)*/)) {
version = "$buildMajor.$buildMinor.$buildNumber.${GitBasedVersioning.gitShortCommitHash}"
} else {
def isSnapshot = !(branch.equals("master"))
version = GitBasedVersioning.getVersionWithCount(buildMajor, buildMinor, buildNumber) + (isSnapshot ? "-SNAPSHOT" : "")
version = GitBasedVersioning.getVersionWithCount(buildMajor, buildMinor, buildNumber) + "-SNAPSHOT"
}

println "##teamcity[buildNumber '${version}']"
Expand Down Expand Up @@ -94,7 +93,9 @@ configurations {
}

dependencies {
mps "com.jetbrains:mps:$mpsVersion"
// For published releases adjust ext.mpsMajor and ext.mpsMinor above and use this dependency:
// mps "com.jetbrains:mps:$mpsVersion"
mps "com.jetbrains.mps:mps-prerelease:243.21565.10033"
}

repositories {
Expand Down Expand Up @@ -170,15 +171,18 @@ configurations {
exclude(group: 'com.google.guava')
attributes.attribute(Attribute.of('org.gradle.jvm.environment', String), 'standard-jvm')
}
xml_lib {
exclude(group: 'system')
exclude(module: 'xml-apis')
}
batik {
exclude(group: 'xml-apis')
exclude(group: 'commons-io')
exclude(group: 'commons-logging')
}
}

dependencies {
ant_lib "org.apache.ant:ant-junit:1.10.14"
ant_lib "org.apache.ant:ant-junit:1.10.15"

def elkVersion = "0.9.1"
diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.common:$elkVersion")
Expand All @@ -192,12 +196,14 @@ dependencies {
diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.topdownpacking:$elkVersion")
diagram_lib ("org.eclipse.elk:org.eclipse.elk.core:$elkVersion")
diagram_lib ("org.eclipse.elk:org.eclipse.elk.graph:$elkVersion")
diagram_lib ("org.eclipse.emf:org.eclipse.emf.common:2.30.0")
diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore:2.36.0")
diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.37.0")
diagram_lib ("org.eclipse.emf:org.eclipse.emf.common:2.40.0")
diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore:2.38.0")
diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.38.0")

xml_lib("xerces:xercesImpl:2.12.2")
xml_lib("xml-apis:xml-apis-ext:1.3.04")

batik ("org.apache.xmlgraphics:batik-svggen:1.17")
batik ("org.apache.xmlgraphics:batik-dom:1.17")
batik ("org.apache.xmlgraphics:batik-all:1.18")
}


Expand Down Expand Up @@ -225,19 +231,6 @@ def defaultScriptArgs = [mps_home, build_dir, artifacts_dir, ext.buildDate, ext.

afterEvaluate {
project.ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = tasks.getByName('downloadJbr').javaExecutable
def jdk_home = null
if (ext.has('java17_home')) {
jdk_home = ext.get('java17_home')
} else if (System.getenv('JB_JAVA17_HOME') != null) {
jdk_home = System.getenv('JB_JAVA17_HOME')
}
if(jdk_home != null) {
if (!new File(jdk_home, "lib").exists()) {
throw new GradleException("Unable to locate JDK home folder. Detected folder is: $jdk_home")
} else {
ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = new File(jdk_home, 'bin/java')
}
}
}

// enables https://github.com/mbeddr/mps-gradle-plugin#providing-global-defaults
Expand Down Expand Up @@ -278,8 +271,25 @@ task resolved_batik_dependencies(type: Sync) {
}
}

task resolved_xml_dependencies(type: Sync) {
from configurations.xml_lib
into file('code/xml/solutions/lib')

// Strip version numbers from file names
rename { filename ->
def ra = configurations.xml_lib.resolvedConfiguration.resolvedArtifacts.find { ResolvedArtifact ra -> ra.file.name == filename }
String finalName
if (ra.classifier != null) {
finalName = "${ra.name}-${ra.classifier}.${ra.extension}"
} else {
finalName = "${ra.name}.${ra.extension}"
}
return finalName
}
}

tasks.register('build_allScripts', BuildLanguages) {
dependsOn 'downloadJbr', resolveMps, copyModelApi, resolved_diagram_dependencies, resolved_batik_dependencies
dependsOn 'downloadJbr', resolveMps, copyModelApi, resolved_diagram_dependencies, resolved_batik_dependencies, resolved_xml_dependencies
script "$rootDir/scripts/build.xml"
}

Expand Down Expand Up @@ -365,10 +375,10 @@ configurations {
}
dependencies {
junitAnt 'junit:junit:4.13.2'
junitAnt('org.apache.ant:ant-junit:1.10.14') {
junitAnt('org.apache.ant:ant-junit:1.10.15') {
transitive = false
}
junitAnt('org.apache.ant:ant-junit4:1.10.14') {
junitAnt('org.apache.ant:ant-junit4:1.10.15') {
transitive = false
}
}
Expand Down Expand Up @@ -526,6 +536,7 @@ def usedPluginRoots = [
new File(mpsHomeDir, 'plugins/mps-vcs'),
new File(mpsHomeDir, 'plugins/mps-git4idea'),
new File(mpsHomeDir, 'plugins/mps-httpsupport'),
new File(mpsHomeDir, 'plugins/mps-testing'),
new File(mpsHomeDir, 'plugins/mps-spellcheck')
]

Expand Down
3 changes: 2 additions & 1 deletion code/.mps/migration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
<entry key="project.migrated.version" value="232" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
<entry key="project.migrated.version" value="243" />
</component>
</project>
8 changes: 3 additions & 5 deletions code/.mps/modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,7 @@
<modulePath path="$PROJECT_DIR$/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/com.mbeddr.mpsutil.grammarcells.runtime.msd" folder="grammarcells" />
<modulePath path="$PROJECT_DIR$/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.sandbox/com.mbeddr.mpsutil.grammarcells.sandbox.msd" folder="grammarcells" />
<modulePath path="$PROJECT_DIR$/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/com.mbeddr.mpsutil.grammarcells.tests.msd" folder="grammarcells" />
<modulePath path="$PROJECT_DIR$/hacks/languages/de.itemis.mps.hacks.xmodelgen/de.itemis.mps.hacks.xmodelgen.mpl" folder="hacks" />
<modulePath path="$PROJECT_DIR$/hacks/languages/de.itemis.mps.nativelibs/de.itemis.mps.nativelibs.mpl" folder="hacks" />
<modulePath path="$PROJECT_DIR$/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl" folder="hacks" />
<modulePath path="$PROJECT_DIR$/hacks/solutions/de.itemis.mps.nativelibs.loader/de.itemis.mps.nativelibs.loader.msd" folder="hacks" />
<modulePath path="$PROJECT_DIR$/hacks/solutions/de.slisson.mps.hacks.editor/de.slisson.mps.hacks.editor.msd" folder="hacks" />
<modulePath path="$PROJECT_DIR$/hacks/solutions/de.slisson.mps.reflection.runtime/de.slisson.mps.reflection.runtime.msd" folder="hacks" />
<modulePath path="$PROJECT_DIR$/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/de.itemis.mps.editor.htmlcell.demolang.mpl" folder="widgets" />
Expand All @@ -80,6 +77,7 @@
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.children/de.itemis.model.simple.demo.children.mpl" folder="modelmerger2.test.language" />
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.collection.keeper/de.itemis.model.simple.demo.collection.keeper.mpl" folder="modelmerger2.test.language" />
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.collection/de.itemis.model.simple.demo.collection.mpl" folder="modelmerger2.test.language" />
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.enums/de.itemis.model.simple.demo.enums.mpl" folder="modelmerger2.test.language" />
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.property/de.itemis.model.simple.demo.property.mpl" folder="modelmerger2.test.language" />
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.reference/de.itemis.model.simple.demo.reference.mpl" folder="modelmerger2.test.language" />
<modulePath path="$PROJECT_DIR$/langvis/languages/com.dslfoundry.langvis.demolang/com.dslfoundry.langvis.demolang.mpl" folder="langvis" />
Expand Down Expand Up @@ -203,7 +201,6 @@
<modulePath path="$PROJECT_DIR$/tables/languages/de.slisson.mps.tables/de.slisson.mps.tables.mpl" folder="tables" />
<modulePath path="$PROJECT_DIR$/tables/languages/de.slisson.mps.tables/runtime/de.slisson.mps.tables.runtime.msd" folder="tables" />
<modulePath path="$PROJECT_DIR$/tables/languages/de.slisson.mps.tables/sandbox/de.slisson.mps.tables.sandbox.msd" folder="tables" />
<modulePath path="$PROJECT_DIR$/tables/solutions/de.slisson.mps.testutils/de.slisson.mps.testutils.msd" folder="tables" />
<modulePath path="$PROJECT_DIR$/tables/solutions/test.de.slisson.mps.tables/test.de.slisson.mps.tables.msd" folder="tables" />
<modulePath path="$PROJECT_DIR$/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd" folder="3rd-party" />
<modulePath path="$PROJECT_DIR$/third-party/solutions/third.party.usage.test/third.party.usage.test.msd" folder="3rd-party" />
Expand Down Expand Up @@ -231,6 +228,7 @@
<modulePath path="$PROJECT_DIR$/widgets/solutions/de.itemis.mps.editor.dropdown.runtime/de.itemis.mps.editor.dropdown.runtime.msd" folder="widgets" />
<modulePath path="$PROJECT_DIR$/widgets/solutions/de.itemis.mps.editor.dropdown.sandbox/de.itemis.mps.editor.dropdown.sandbox.msd" folder="widgets" />
<modulePath path="$PROJECT_DIR$/widgets/solutions/de.itemis.mps.mouselistener.runtime/de.itemis.mps.mouselistener.runtime.msd" folder="widgets" />
<modulePath path="$PROJECT_DIR$/xml/solutions/de.itemis.stubs.xml.msd" folder="" />
</projectModules>
</component>
</project>
</project>
32 changes: 8 additions & 24 deletions code/batik/solutions/de.itemis.stubs.batik.msd
Original file line number Diff line number Diff line change
@@ -1,38 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="de.itemis.stubs.batik" uuid="563a0770-eb88-4f4f-83ed-f708776fc2fe" moduleVersion="0">
<models>
<modelRoot type="java_classes" contentPath="${module}/lib">
<sourceRoot location="batik-awt-util.jar" />
<sourceRoot location="batik-constants.jar" />
<sourceRoot location="batik-css.jar" />
<sourceRoot location="batik-dom.jar" />
<sourceRoot location="batik-ext.jar" />
<sourceRoot location="batik-i18n.jar" />
<sourceRoot location="batik-shared-resources.jar" />
<sourceRoot location="batik-svggen.jar" />
<sourceRoot location="batik-util.jar" />
<sourceRoot location="batik-xml.jar" />
<sourceRoot location="xmlgraphics-commons.jar" />
<modelRoot contentPath="${module}" type="java_classes">
<sourceRoot location="lib/xmlgraphics-commons.jar" />
<sourceRoot location="lib/batik-all.jar" />
</modelRoot>
</models>
<facets>
<facet compile="mps" classes="mps" ext="no" type="java">
<classes generated="true" path="${module}/classes_gen" />
<library location="${module}/lib/batik-awt-util.jar" />
<library location="${module}/lib/batik-constants.jar" />
<library location="${module}/lib/batik-css.jar" />
<library location="${module}/lib/batik-dom.jar" />
<library location="${module}/lib/batik-ext.jar" />
<library location="${module}/lib/batik-i18n.jar" />
<library location="${module}/lib/batik-shared-resources.jar" />
<library location="${module}/lib/batik-svggen.jar" />
<library location="${module}/lib/batik-util.jar" />
<library location="${module}/lib/batik-xml.jar" />
<facet type="java" compile="off" classes="mps" ext="yes">
<classes generated="true" />
<library location="${module}/lib/xmlgraphics-commons.jar" />
<library location="${module}/lib/batik-all.jar" />
</facet>
</facets>
<dependencies>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">124d077c-270f-42ca-8bf8-bee488dc96dc(de.itemis.stubs.xml)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
Expand All @@ -43,6 +26,7 @@
<dependencyVersions>
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="563a0770-eb88-4f4f-83ed-f708776fc2fe(de.itemis.stubs.batik)" version="0" />
<module reference="124d077c-270f-42ca-8bf8-bee488dc96dc(de.itemis.stubs.xml)" version="0" />
</dependencyVersions>
</solution>

Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
<language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
<language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
<language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
Expand Down
Loading
Loading