Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {
id 'maven-publish'
id 'de.itemis.mps.gradle.common' version '1.29.+'
id "com.github.breadmoirai.github-release" version "2.5.2"
id 'de.itemis.mps.gradle.launcher' version '2.7.0.+'
id 'de.itemis.mps.gradle.launcher' version '2.8.0.+'
id "org.cyclonedx.bom" version "2.4.1"
}

Expand Down Expand Up @@ -47,8 +47,7 @@ def minor = "9"
// Dependency versions



ext.mpsVersion = "252.26199.10506"
ext.mpsVersion = "253.28294.10044"
def mpsQAVersion = "$major.$minor+"


Expand Down Expand Up @@ -122,7 +121,7 @@ dependencies {
// For a release version of MPS, use this dependency:
//mps "com.jetbrains:mps:$mpsBuild"
mps "com.jetbrains.mps:mps-prerelease:$mpsVersion"
rerunMigrationsBackend("de.itemis.mps.build-backends:remigrate:0.3.0.+")
rerunMigrationsBackend("de.itemis.mps.build-backends:remigrate:1.0.0.+")
languageLibs "org.mpsqa:all-in-one:$mpsQAVersion"
languageLibs "com.mbeddr:platform:$mbeddrVersion"
junitAnt 'org.apache.ant:ant-junit:1.10.15'
Expand Down Expand Up @@ -316,9 +315,11 @@ tasks.register('remigrate', Remigrate) {
mpsHome = mpsHomeDir
projectDirectories.from('code/languages/org.iets3.opensource')
folderMacros['iets3.github.opensource.home'] = rootProject.layout.projectDirectory

pluginRoots.from(new File(mpsHomeDir, 'plugins'))
maxHeapSize = '4G'
excludeModuleMigration("de.itemis.mps.editor.diagram", 0)
// not rerunnable until MPS-39315 is fixed
excludeModuleMigration("jetbrains.mps.baseLanguage.javadoc", 0)
}

File modelcheckresult = new File("$buildDir/TEST-checkProject.xml")
Expand Down
17 changes: 15 additions & 2 deletions build/scripts/build-allScripts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<property name="com.mbeddr.platform.minor.version" value="${import.com.mbeddr.platform.com.mbeddr.platform.minor.version}" />
<property name="com.mbeddr.platform.build" value="${import.com.mbeddr.platform.com.mbeddr.platform.build}" />
<property name="com.mbeddr.platform.mbeddr.version" value="${import.com.mbeddr.platform.com.mbeddr.platform.mbeddr.version}" />
<property name="de.itemis.mps.extensions.versionNumber" value="${import.com.mbeddr.platform.de.itemis.mps.extensions.versionNumber}" />
<property name="de.itemis.mps.extensions.version" value="${import.com.mbeddr.platform.de.itemis.mps.extensions.version}" />
<property name="com.mbeddr.mpsutil.actionsfilter.major.version" value="${import.com.mbeddr.platform.com.mbeddr.mpsutil.actionsfilter.major.version}" />
<property name="com.mbeddr.mpsutil.actionsfilter.minor.version" value="${import.com.mbeddr.platform.com.mbeddr.mpsutil.actionsfilter.minor.version}" />
<property name="com.mbeddr.mpsutil.actionsfilter.build" value="${import.com.mbeddr.platform.com.mbeddr.mpsutil.actionsfilter.build}" />
Expand Down Expand Up @@ -94,7 +94,7 @@
<copy todir="${build.layout}/lib">
<fileset dir="${iets3.lang.opensource}/solutions/org.iets3.opensource.build.gentests.rt/lib" />
</copy>
<echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mps.runtimeBuild=${mps.runtimeBuild}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}${line.separator}de.itemis.mps.extensions.versionNumber=${de.itemis.mps.extensions.versionNumber}${line.separator}com.mbeddr.mpsutil.actionsfilter.major.version=${com.mbeddr.mpsutil.actionsfilter.major.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.minor.version=${com.mbeddr.mpsutil.actionsfilter.minor.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.build=${com.mbeddr.mpsutil.actionsfilter.build}${line.separator}com.mbeddr.mpsutil.actionsfilter.mbeddr.version=${com.mbeddr.mpsutil.actionsfilter.mbeddr.version}</echo>
<echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mps.runtimeBuild=${mps.runtimeBuild}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}${line.separator}de.itemis.mps.extensions.version=${de.itemis.mps.extensions.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.major.version=${com.mbeddr.mpsutil.actionsfilter.major.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.minor.version=${com.mbeddr.mpsutil.actionsfilter.minor.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.build=${com.mbeddr.mpsutil.actionsfilter.build}${line.separator}com.mbeddr.mpsutil.actionsfilter.mbeddr.version=${com.mbeddr.mpsutil.actionsfilter.mbeddr.version}</echo>
</target>

<target name="buildDependents" />
Expand Down Expand Up @@ -220,6 +220,12 @@
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
<fileset file="${artifacts.mps}/lib/stats.jar" />
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
<fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
<fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
<fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
<fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
<fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
<fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
<fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
Expand Down Expand Up @@ -291,6 +297,12 @@
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
<fileset file="${artifacts.mps}/lib/stats.jar" />
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
<fileset file="${artifacts.mps}/lib/module-intellij.libraries.asm.jar" />
<fileset file="${artifacts.mps}/lib/module-intellij.libraries.gson.jar" />
<fileset file="${artifacts.mps}/lib/module-intellij.libraries.miglayout.swing.jar" />
<fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.jar" />
<fileset file="${artifacts.mps}/lib/module-intellij.platform.vcs.core.jar" />
<fileset file="${artifacts.mps}/lib/module-intellij.xml.parser.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.mps.jar" />
Expand Down Expand Up @@ -323,6 +335,7 @@
<fileset file="${artifacts.mps}/lib/mps-references.jar" />
<fileset file="${iets3.lang.opensource}/solutions/org.iets3.opensource.build.gentests.rt/lib/takari-cpsuite.jar" />
<fileset file="${artifacts.mps}/lib/junit4.jar" />
<fileset file="${artifacts.mps}/lib/lib.jar" />
</classpath>
</javac>
<copy todir="${build.tmp}/java/out/org.iets3.opensource.build.gentests.rt">
Expand Down
2 changes: 1 addition & 1 deletion code/languages/org.iets3.opensource/.mps/migration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
<entry key="jetbrains.mps.ide.mpsmigration.v_2024_3.LangResourceImport4Migration" value="executed" />
<entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
<entry key="jetbrains.mps.v8_elimination" value="executed" />
<entry key="project.migrated.version" value="252" />
<entry key="project.migrated.version" value="253" />
</component>
</project>
Loading