Skip to content

Commit

Permalink
Merge master into merge/mps20232
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Sep 12, 2024
2 parents ff3f177 + 9929ed9 commit b394077
Show file tree
Hide file tree
Showing 89 changed files with 16,840 additions and 20,426 deletions.
26 changes: 14 additions & 12 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 Down Expand Up @@ -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:241.19072.10319"
}

repositories {
Expand Down Expand Up @@ -178,7 +179,7 @@ configurations {
}

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,9 +193,9 @@ 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.31.0")
diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore:2.37.0")
diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.38.0")

batik ("org.apache.xmlgraphics:batik-svggen:1.17")
batik ("org.apache.xmlgraphics:batik-dom:1.17")
Expand Down Expand Up @@ -365,10 +366,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 +527,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'),
]

tasks.register('migrate', MpsMigrate) {
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="241" />
</component>
</project>
4 changes: 2 additions & 2 deletions code/batik/solutions/de.itemis.stubs.batik.msd
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?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">
<modelRoot contentPath="${module}/lib" type="java_classes">
<sourceRoot location="batik-awt-util.jar" />
<sourceRoot location="batik-constants.jar" />
<sourceRoot location="batik-css.jar" />
Expand All @@ -16,7 +16,7 @@
</modelRoot>
</models>
<facets>
<facet compile="mps" classes="mps" ext="no" type="java">
<facet type="java" compile="mps" classes="mps" ext="no">
<classes generated="true" path="${module}/classes_gen" />
<library location="${module}/lib/batik-awt-util.jar" />
<library location="${module}/lib/batik-constants.jar" />
Expand Down
1 change: 0 additions & 1 deletion code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
<module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
<module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
<module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7586,14 +7586,19 @@
<node concept="3clFbS" id="2OALdl4V0r7" role="9aQI4">
<node concept="3clFbH" id="2OALdl4V0r6" role="3cqZAp" />
</node>
<node concept="29HgVG" id="2OALdl4V18n" role="lGtFl">
<node concept="3NFfHV" id="2OALdl4V18q" role="3NFExx">
<node concept="3clFbS" id="2OALdl4V18r" role="2VODD2">
<node concept="2b32R4" id="2aDr00AvmKz" role="lGtFl">
<node concept="3JmXsc" id="2aDr00AvmK$" role="2P8S$">
<node concept="3clFbS" id="2aDr00AvmK_" role="2VODD2">
<node concept="3clFbF" id="2OALdl4V19x" role="3cqZAp">
<node concept="2OqwBi" id="2OALdl4V1ce" role="3clFbG">
<node concept="30H73N" id="2OALdl4V19w" role="2Oq$k0" />
<node concept="3TrEf2" id="2OALdl4V6Wt" role="2OqNvi">
<ref role="3Tt5mk" to="hba4:2OALdl52Q47" resolve="profiledStatements" />
<node concept="2OqwBi" id="2aDr00Av8sr" role="3clFbG">
<node concept="2OqwBi" id="2OALdl4V1ce" role="2Oq$k0">
<node concept="30H73N" id="2OALdl4V19w" role="2Oq$k0" />
<node concept="3TrEf2" id="2OALdl4V6Wt" role="2OqNvi">
<ref role="3Tt5mk" to="hba4:2OALdl52Q47" resolve="profiledStatements" />
</node>
</node>
<node concept="3Tsc0h" id="2aDr00AvawI" role="2OqNvi">
<ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
</node>
</node>
</node>
Expand Down
2 changes: 1 addition & 1 deletion code/build/solutions/allScripts/allScripts.msd
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</dependencies>
<languageVersions>
<language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
<language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
<language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="8" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
</languageVersions>
<dependencyVersions>
Expand Down
2 changes: 1 addition & 1 deletion code/build/solutions/allScripts/models/build.mps
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<model ref="r:1a3990a4-de8c-42ac-906e-53de40277d4f(allScripts.build)">
<persistence version="9" />
<languages>
<use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="7" />
<use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="8" />
<use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
</languages>
<imports>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</dependencies>
<languageVersions>
<language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
<language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
<language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="8" />
<language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />
<language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
<concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6" />
<concept id="2105528055260548241" name="jetbrains.mps.build.mps.structure.BuildMpsLayout_FolderWithSources" flags="ng" index="1bldCd" />
<concept id="5253498789149381388" name="jetbrains.mps.build.mps.structure.BuildMps_Module" flags="ng" index="3bQrTs">
<property id="1500819558096356884" name="doNotCompile" index="2GAjPV" />
<property id="2928402740576877067" name="javaCode" index="3vZFNd" />
<child id="5253498789149547825" name="sources" index="3bR31x" />
<child id="5253498789149547704" name="dependencies" index="3bR37C" />
</concept>
Expand Down Expand Up @@ -932,8 +932,8 @@
<node concept="1E1JtA" id="3$A0JaN5bpX" role="2G$12L">
<property role="TrG5h" value="MPS.ThirdParty" />
<property role="3LESm3" value="39983771-4e9b-401b-a1a9-1da6c777c843" />
<property role="2GAjPV" value="true" />
<property role="BnDLt" value="true" />
<property role="3vZFNd" value="3kCd1ud3JDD/compile_ext" />
<node concept="398BVA" id="3$A0JaN5bwY" role="3LF7KH">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="3$A0JaN5chM" role="iGT6I">
Expand Down Expand Up @@ -1060,8 +1060,8 @@
<node concept="1E1JtA" id="5z3whG1oBTp" role="2G$12L">
<property role="TrG5h" value="MPS.Kotlin" />
<property role="3LESm3" value="47198eff-d292-4dcd-85af-227f983426b5" />
<property role="2GAjPV" value="true" />
<property role="BnDLt" value="true" />
<property role="3vZFNd" value="3kCd1ud3JDD/compile_ext" />
<node concept="398BVA" id="5z3whG1oBTq" role="3LF7KH">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="5z3whG1oBTr" role="iGT6I">
Expand Down Expand Up @@ -1151,7 +1151,7 @@
<node concept="2Ry0Ak" id="2PSVZXMBj4t" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="2PSVZXMBj4u" role="2Ry0An">
<property role="2Ry0Am" value="kotlin-stdlib-1.9.0.jar" />
<property role="2Ry0Am" value="kotlin-stdlib-1.9.20.jar" />
</node>
</node>
</node>
Expand All @@ -1173,7 +1173,7 @@
<node concept="2Ry0Ak" id="2PSVZXMBj4$" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="2PSVZXMBj4_" role="2Ry0An">
<property role="2Ry0Am" value="kotlin-stdlib-common-1.9.0.jar" />
<property role="2Ry0Am" value="kotlin-stdlib-common-1.9.20.jar" />
</node>
</node>
</node>
Expand Down Expand Up @@ -13137,8 +13137,8 @@
<property role="BnDLt" value="true" />
<property role="TrG5h" value="de.q60.mps.shadowmodels.examples.input" />
<property role="3LESm3" value="f65cad6f-55b3-4700-8f71-5f4c15c50e34" />
<property role="2GAjPV" value="true" />
<property role="aoJFB" value="77WRb6jODAF/none" />
<property role="3vZFNd" value="3kCd1ud3JDD/compile_ext" />
<node concept="398BVA" id="1RCZH7X6v0z" role="3LF7KH">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="1RCZH7X6v0C" role="iGT6I">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,13 @@
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:de1ad86d-6e50-4a02-b306-d4d17f64c375:jetbrains.mps.console.base" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
<language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
Expand All @@ -66,7 +64,6 @@
<module reference="f3a307cb-7eaa-48a7-aaed-d936d9517fdf(de.itemis.mps.editor.celllayout#2728748097294103221)" version="0" />
<module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
Expand Down Expand Up @@ -159,7 +156,6 @@
<module reference="1919c723-b60b-4592-9318-9ce96d91da44(de.itemis.mps.editor.celllayout)" version="0" />
<module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
<use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="-1" />
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="-1" />
<use id="de1ad86d-6e50-4a02-b306-d4d17f64c375" name="jetbrains.mps.console.base" version="0" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<dependencies>
<dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="true">f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)</dependency>
<dependency reexport="true">24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)</dependency>
</dependencies>
<languageVersions>
Expand Down Expand Up @@ -48,7 +47,6 @@
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
</dependencyVersions>
</solution>
Expand Down
Loading

0 comments on commit b394077

Please sign in to comment.