diff --git a/CHANGELOG.md b/CHANGELOG.md index 47974dc..a8171ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 1.24.3 + +- Upgrade to project-loader 4.0.0 +- Backends are now only tested against 2023.2 and above (up from 2022.2) due to a bug in MPS + (https://youtrack.jetbrains.com/issue/MPS-39248/Cant-find-property-constraints-errors-for-base-language) + which makes newer MPS versions break when opening projects from old MPS versions. + ## 1.24.2 - `execute` now applies the indexing workaround like `modelcheck` and `generate`. diff --git a/gradle.properties b/gradle.properties index 34c035b..06eeda3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ org.gradle.parallel=true -version.backend=1.24.2 -version.project-loader=4.0.0 +version.backend=1.24.3 +version.project-loader=5.0.0 # A comma-separated list of MPS releases or prereleases to test against. # Also used in the GitHub workflow to test each version in parallel -supportedMpsVersions=2022.3.3,2023.2.2,2024.1.2,2024.3.1,251.23774.10091 +supportedMpsVersions=2023.2.2,2024.1.2,2025.1.1,253.28294.219 diff --git a/launcher/CHANGELOG.md b/launcher/CHANGELOG.md index 37918e0..2bb4111 100644 --- a/launcher/CHANGELOG.md +++ b/launcher/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 2.8.0 + +### Added + +- `--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED` is now passed to the JVM to support MPS 2025.3 prerelease. + ## 2.7.0 ### Changed diff --git a/launcher/gradle.properties b/launcher/gradle.properties index da302ef..b15e607 100644 --- a/launcher/gradle.properties +++ b/launcher/gradle.properties @@ -1 +1 @@ -version.launcher=2.7.0 +version.launcher=2.8.0 diff --git a/launcher/src/main/java/de/itemis/mps/gradle/launcher/MpsBackendBuilder.java b/launcher/src/main/java/de/itemis/mps/gradle/launcher/MpsBackendBuilder.java index f8589b8..04b39cc 100644 --- a/launcher/src/main/java/de/itemis/mps/gradle/launcher/MpsBackendBuilder.java +++ b/launcher/src/main/java/de/itemis/mps/gradle/launcher/MpsBackendBuilder.java @@ -23,7 +23,6 @@ import javax.annotation.Nonnull; import javax.inject.Inject; import java.io.File; -import java.io.Serializable; import java.util.ArrayList; public class MpsBackendBuilder { @@ -193,6 +192,7 @@ private static void configureOpens(JavaForkOptions options) { "java.base/java.util", "java.base/java.util.concurrent", "java.base/java.util.concurrent.atomic", + "java.base/jdk.internal.ref", "java.base/jdk.internal.vm", "java.base/sun.nio.ch", "java.base/sun.nio.fs", diff --git a/project-loader/CHANGELOG.md b/project-loader/CHANGELOG.md index a6cc74f..816550b 100644 --- a/project-loader/CHANGELOG.md +++ b/project-loader/CHANGELOG.md @@ -7,6 +7,17 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). Changes in versions before 2.0.0 are documented in the [root changelog](../CHANGELOG.md). +## 5.0.0 + +### Added + +- `ProjectLoader#executeWithProjects` to execute an action for multiple projects, applying the indexing workaround + to each, according to arguments. + +### Changed + +- `Args#forceIndexing` moved up to `EnvironmentArgs`. + ## 4.0.0 ### Added diff --git a/project-loader/api/project-loader.api b/project-loader/api/project-loader.api index 44286dd..bf7d528 100644 --- a/project-loader/api/project-loader.api +++ b/project-loader/api/project-loader.api @@ -20,7 +20,6 @@ public final class de/itemis/mps/gradle/logging/LoggingFactoryKt { public class de/itemis/mps/gradle/project/loader/Args : de/itemis/mps/gradle/project/loader/EnvironmentArgs { public fun (Lcom/xenomachina/argparser/ArgParser;)V public fun configureProjectLoader (Lde/itemis/mps/gradle/project/loader/ProjectLoader$Builder;)V - public final fun getForceIndexing ()Ljava/lang/Boolean; public final fun getProject ()Ljava/io/File; } @@ -34,6 +33,7 @@ public class de/itemis/mps/gradle/project/loader/EnvironmentArgs { public fun configureProjectLoader (Lde/itemis/mps/gradle/project/loader/ProjectLoader$Builder;)V public final fun getBuildNumber ()Ljava/lang/String; public final fun getEnvironmentKind ()Lde/itemis/mps/gradle/project/loader/EnvironmentKind; + public final fun getForceIndexing ()Ljava/lang/Boolean; public final fun getLogLevel ()Lde/itemis/mps/gradle/logging/LogLevel; public final fun getMacros ()Ljava/util/List; public final fun getPluginLocation ()Ljava/io/File; @@ -120,6 +120,7 @@ public final class de/itemis/mps/gradle/project/loader/ProjectLoader { public static final field Companion Lde/itemis/mps/gradle/project/loader/ProjectLoader$Companion; public synthetic fun (Ljetbrains/mps/tool/environment/EnvironmentConfig;Lde/itemis/mps/gradle/project/loader/EnvironmentKind;Ljava/io/File;Ljava/lang/String;Lde/itemis/mps/gradle/logging/LogLevel;Ljava/lang/Boolean;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun execute (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; + public final fun executeForEachProject (Ljava/util/List;Lkotlin/jvm/functions/Function2;)Ljava/util/List; public final fun executeWithProject (Ljava/io/File;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object; } diff --git a/project-loader/src/main/kotlin/de/itemis/mps/gradle/project/loader/Args.kt b/project-loader/src/main/kotlin/de/itemis/mps/gradle/project/loader/Args.kt index c71fd7f..7187f0f 100644 --- a/project-loader/src/main/kotlin/de/itemis/mps/gradle/project/loader/Args.kt +++ b/project-loader/src/main/kotlin/de/itemis/mps/gradle/project/loader/Args.kt @@ -56,6 +56,17 @@ public open class EnvironmentArgs(parser: ArgParser) { public val skipLibraries: Boolean by parser.flagging("--no-libraries", help = "do not load project libraries under MPS environment") + public val forceIndexing: Boolean? by parser.storing( + "--force-indexing", help = "whether to force full indexing at startup to work around MPS-37926." + + " Supported values: always, never, auto. Default: auto.") { + when (this) { + "always" -> true + "never" -> false + "auto" -> null + else -> throw InvalidArgumentException("Unsupported value '$this'. Supported values are always, never, auto") + } + }.default(null) + public open fun configureProjectLoader(builder: ProjectLoader.Builder) { builder.environmentConfig { plugins.addAll(this@EnvironmentArgs.plugins) @@ -69,6 +80,8 @@ public open class EnvironmentArgs(parser: ArgParser) { builder.environmentKind = environmentKind builder.buildNumber = buildNumber builder.logLevel = de.itemis.mps.gradle.logging.LogLevel.valueOf(logLevel.toString()) + + builder.forceIndexing = forceIndexing } public fun buildLoader(): ProjectLoader = ProjectLoader.build(this::configureProjectLoader) @@ -84,22 +97,9 @@ public open class Args(parser: ArgParser) : EnvironmentArgs(parser) { public val project: File by parser.storing("--project", help = "project to generate from") { File(this) } - public val forceIndexing: Boolean? by parser.storing( - "--force-indexing", help = "whether to force full indexing at startup to work around MPS-37926." + - " Supported values: always, never, auto. Default: auto.") { - when (this) { - "always" -> true - "never" -> false - "auto" -> null - else -> throw InvalidArgumentException("Unsupported value '$this'. Supported values are always, never, auto") - } - }.default(null) - override fun configureProjectLoader(builder: ProjectLoader.Builder) { super.configureProjectLoader(builder) - builder.forceIndexing = forceIndexing - if (!skipLibraries && environmentKind == EnvironmentKind.MPS) { builder.environmentConfig { findProjectLibraries(project, macros, libraries::addAll) diff --git a/project-loader/src/main/kotlin/de/itemis/mps/gradle/project/loader/ProjectLoader.kt b/project-loader/src/main/kotlin/de/itemis/mps/gradle/project/loader/ProjectLoader.kt index 222e81a..fb7e792 100644 --- a/project-loader/src/main/kotlin/de/itemis/mps/gradle/project/loader/ProjectLoader.kt +++ b/project-loader/src/main/kotlin/de/itemis/mps/gradle/project/loader/ProjectLoader.kt @@ -159,7 +159,10 @@ public class ProjectLoader private constructor( /** * Execute [action] in the context of an initialized MPS/IDEA environment and project located in [projectDir]. - * Closes the project and shuts down the environment after the action finishes, even if it throws an exception. + * Closes the project after the action even if it throws an exception. Shuts down the environment after actions + * finish, even if it throws an exception. + * + * If an action for a project throws an exception, actions for further projects in the list are not performed. * * @param projectDir the directory to open as a MPS project * @param action action to execute. @@ -167,6 +170,21 @@ public class ProjectLoader private constructor( public fun executeWithProject(projectDir: File, action: (Environment, Project) -> T): T = execute { env -> withOpenProject(env, projectDir, action) } + /** + * Execute [action] in the manner of [executeWithProject] for each project in [projectDirs]. The environment is + * opened once, projects are opened sequentially, each project being closed before opening the next one. + * + * If [action] throws an exception for one of the projects, further projects in the list will not be processed. + * Closes the project and shuts down the environment after the action finishes, even if it throws an exception. + * + * @param projectDirs the directories to open as MPS projects + * @param action action to execute. + */ + public fun executeForEachProject(projectDirs: List, action: (Environment, Project) -> T): List = + execute { env -> + projectDirs.map { withOpenProject(env, it, action) } + } + /** * Opens the project in [projectDir], executes [action] and disposes of the project regardless of whether [action] * succeeds or throws an exception. diff --git a/remigrate/CHANGELOG.md b/remigrate/CHANGELOG.md index e6674aa..9b71767 100644 --- a/remigrate/CHANGELOG.md +++ b/remigrate/CHANGELOG.md @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) after reaching version 1.0.0. Until then any version may contain breaking changes. +# 1.0.0 + +## Added + +- The backend will now wait until project indices are built for each project before running migrations. + # 0.3.0 ## Added diff --git a/remigrate/gradle.properties b/remigrate/gradle.properties index 39999e9..dae8115 100644 --- a/remigrate/gradle.properties +++ b/remigrate/gradle.properties @@ -1 +1 @@ -version.backend=0.3.0 +version.backend=1.0.0 diff --git a/remigrate/src/main/kotlin/de/itemis/mps/gradle/remigrate/WorkFromIdeaPlugin.kt b/remigrate/src/main/kotlin/de/itemis/mps/gradle/remigrate/WorkFromIdeaPlugin.kt index 7505080..4e9c8bd 100644 --- a/remigrate/src/main/kotlin/de/itemis/mps/gradle/remigrate/WorkFromIdeaPlugin.kt +++ b/remigrate/src/main/kotlin/de/itemis/mps/gradle/remigrate/WorkFromIdeaPlugin.kt @@ -85,7 +85,7 @@ private fun runProjectMigrations(project: Project, migrationsToExclude: Set + loader.executeForEachProject(projectDirs) { environment, project -> val pluginId = PluginId.getId(PLUGIN_ID) - val pluginDescriptor = PluginManager.getInstance() - .findEnabledPlugin(pluginId) - - if (pluginDescriptor == null) { - throw Exception("Plugin $pluginId not loaded or not enabled, cannot proceed") - } - - for (projectDir in args.projects) { - val project = environment.openProject(File(projectDir)) - try { - val helperClass = - pluginDescriptor.pluginClassLoader!!.loadClass(WorkFromIdeaPlugin.javaClass.name) - - val method = helperClass.getMethod("work", - Project::class.java, - Set::class.java, - Set::class.java) - - method.invoke(null, project, projectMigrationsToExclude, moduleMigrationsToExclude) - } finally { - environment.closeProject(project) - } - environment.flushAllEvents() - } + val pluginDescriptor = PluginManager.getInstance().findEnabledPlugin(pluginId) + ?: throw Exception("Plugin $pluginId not loaded or not enabled, cannot proceed") + + val helperClass = pluginDescriptor.pluginClassLoader!!.loadClass(WorkFromIdeaPlugin.javaClass.name) + val method = helperClass.getMethod("work", Project::class.java, Set::class.java, Set::class.java) + + method.invoke(null, project, projectMigrationsToExclude, moduleMigrationsToExclude) + + environment.flushAllEvents() } } diff --git a/test-projects/execute-method/.mps/migration.xml b/test-projects/execute-method/.mps/migration.xml new file mode 100644 index 0000000..537dcfa --- /dev/null +++ b/test-projects/execute-method/.mps/migration.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test-projects/execute-method/.mps/vcs.xml b/test-projects/execute-method/.mps/vcs.xml index c2365ab..b2bdec2 100644 --- a/test-projects/execute-method/.mps/vcs.xml +++ b/test-projects/execute-method/.mps/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/test-projects/execute-method/solutions/my.solution/models/my.solution.java.mps b/test-projects/execute-method/solutions/my.solution/models/my.solution.java.mps index 2033bc9..bf06389 100644 --- a/test-projects/execute-method/solutions/my.solution/models/my.solution.java.mps +++ b/test-projects/execute-method/solutions/my.solution/models/my.solution.java.mps @@ -51,7 +51,7 @@ - + @@ -61,13 +61,13 @@ - + - + diff --git a/test-projects/execute-method/solutions/my.solution/my.solution.msd b/test-projects/execute-method/solutions/my.solution/my.solution.msd index 02015b9..4f68033 100644 --- a/test-projects/execute-method/solutions/my.solution/my.solution.msd +++ b/test-projects/execute-method/solutions/my.solution/my.solution.msd @@ -1,16 +1,15 @@ - + - + - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) @@ -18,7 +17,7 @@ - + diff --git a/test-projects/generate-build-solution/.mps/migration.xml b/test-projects/generate-build-solution/.mps/migration.xml index 349b4d7..d62e30e 100644 --- a/test-projects/generate-build-solution/.mps/migration.xml +++ b/test-projects/generate-build-solution/.mps/migration.xml @@ -5,5 +5,12 @@ + + + + + + + \ No newline at end of file diff --git a/test-projects/generate-build-solution/.mps/vcs.xml b/test-projects/generate-build-solution/.mps/vcs.xml index c2365ab..b2bdec2 100644 --- a/test-projects/generate-build-solution/.mps/vcs.xml +++ b/test-projects/generate-build-solution/.mps/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/test-projects/generate-build-solution/solutions/my.build/models/script.mps b/test-projects/generate-build-solution/solutions/my.build/models/script.mps index c14df3f..81ebc53 100644 --- a/test-projects/generate-build-solution/solutions/my.build/models/script.mps +++ b/test-projects/generate-build-solution/solutions/my.build/models/script.mps @@ -40,12 +40,12 @@ - + - + diff --git a/test-projects/generate-build-solution/solutions/my.build/my.build.msd b/test-projects/generate-build-solution/solutions/my.build/my.build.msd index 17a1644..207214b 100644 --- a/test-projects/generate-build-solution/solutions/my.build/my.build.msd +++ b/test-projects/generate-build-solution/solutions/my.build/my.build.msd @@ -1,16 +1,15 @@ - + - + - 422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build) diff --git a/test-projects/generate-build-solution/solutions/my.solution/models/java.mps b/test-projects/generate-build-solution/solutions/my.solution/models/java.mps index 8ca23e2..e68e5f9 100644 --- a/test-projects/generate-build-solution/solutions/my.solution/models/java.mps +++ b/test-projects/generate-build-solution/solutions/my.solution/models/java.mps @@ -51,7 +51,7 @@ - + @@ -61,13 +61,13 @@ - + - + diff --git a/test-projects/generate-build-solution/solutions/my.solution/my.solution.msd b/test-projects/generate-build-solution/solutions/my.solution/my.solution.msd index 39d6709..0c4073a 100644 --- a/test-projects/generate-build-solution/solutions/my.solution/my.solution.msd +++ b/test-projects/generate-build-solution/solutions/my.solution/my.solution.msd @@ -1,30 +1,29 @@ - + - + - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - + - + - + diff --git a/test-projects/generate-simple/.mps/migration.xml b/test-projects/generate-simple/.mps/migration.xml index 349b4d7..d62e30e 100644 --- a/test-projects/generate-simple/.mps/migration.xml +++ b/test-projects/generate-simple/.mps/migration.xml @@ -5,5 +5,12 @@ + + + + + + + \ No newline at end of file diff --git a/test-projects/generate-simple/.mps/vcs.xml b/test-projects/generate-simple/.mps/vcs.xml index c2365ab..b2bdec2 100644 --- a/test-projects/generate-simple/.mps/vcs.xml +++ b/test-projects/generate-simple/.mps/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/test-projects/generate-simple/solutions/my.solution/models/java.mps b/test-projects/generate-simple/solutions/my.solution/models/java.mps index aa7a62f..86f360a 100644 --- a/test-projects/generate-simple/solutions/my.solution/models/java.mps +++ b/test-projects/generate-simple/solutions/my.solution/models/java.mps @@ -51,7 +51,7 @@ - + @@ -61,13 +61,13 @@ - + - + diff --git a/test-projects/generate-simple/solutions/my.solution/my.solution.msd b/test-projects/generate-simple/solutions/my.solution/my.solution.msd index 3074ed4..73d10d3 100644 --- a/test-projects/generate-simple/solutions/my.solution/my.solution.msd +++ b/test-projects/generate-simple/solutions/my.solution/my.solution.msd @@ -1,30 +1,29 @@ - + - + - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - + - + - + diff --git a/test-projects/generate-with-errors/.mps/migration.xml b/test-projects/generate-with-errors/.mps/migration.xml index 2ae2a02..0946a12 100644 --- a/test-projects/generate-with-errors/.mps/migration.xml +++ b/test-projects/generate-with-errors/.mps/migration.xml @@ -1,6 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/test-projects/generate-with-errors/.mps/vcs.xml b/test-projects/generate-with-errors/.mps/vcs.xml index e572faa..008a597 100644 --- a/test-projects/generate-with-errors/.mps/vcs.xml +++ b/test-projects/generate-with-errors/.mps/vcs.xml @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/test-projects/generate-with-errors/solutions/correct/correct.msd b/test-projects/generate-with-errors/solutions/correct/correct.msd index 58ed6f5..c93c3dd 100644 --- a/test-projects/generate-with-errors/solutions/correct/correct.msd +++ b/test-projects/generate-with-errors/solutions/correct/correct.msd @@ -1,21 +1,20 @@ - + - + - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - + diff --git a/test-projects/generate-with-errors/solutions/correct/models/correct.model.mps b/test-projects/generate-with-errors/solutions/correct/models/correct.model.mps index 1c54d7f..b19ddc4 100644 --- a/test-projects/generate-with-errors/solutions/correct/models/correct.model.mps +++ b/test-projects/generate-with-errors/solutions/correct/models/correct.model.mps @@ -2,7 +2,7 @@ - + @@ -46,20 +46,20 @@ - + - + - + diff --git a/test-projects/generate-with-errors/solutions/solution.with.errors/models/solution.with.errors.correct.mps b/test-projects/generate-with-errors/solutions/solution.with.errors/models/solution.with.errors.correct.mps index 354f253..eb86c5f 100644 --- a/test-projects/generate-with-errors/solutions/solution.with.errors/models/solution.with.errors.correct.mps +++ b/test-projects/generate-with-errors/solutions/solution.with.errors/models/solution.with.errors.correct.mps @@ -2,7 +2,7 @@ - + @@ -46,20 +46,20 @@ - + - + - + diff --git a/test-projects/generate-with-errors/solutions/solution.with.errors/models/solution.with.errors.incorrect.mps b/test-projects/generate-with-errors/solutions/solution.with.errors/models/solution.with.errors.incorrect.mps index 759e894..7797f69 100644 --- a/test-projects/generate-with-errors/solutions/solution.with.errors/models/solution.with.errors.incorrect.mps +++ b/test-projects/generate-with-errors/solutions/solution.with.errors/models/solution.with.errors.incorrect.mps @@ -2,7 +2,7 @@ - + @@ -40,13 +40,13 @@ - + - + diff --git a/test-projects/generate-with-errors/solutions/solution.with.errors/solution.with.errors.msd b/test-projects/generate-with-errors/solutions/solution.with.errors/solution.with.errors.msd index c8e9c11..cfffc56 100644 --- a/test-projects/generate-with-errors/solutions/solution.with.errors/solution.with.errors.msd +++ b/test-projects/generate-with-errors/solutions/solution.with.errors/solution.with.errors.msd @@ -1,21 +1,20 @@ - + - + - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - + diff --git a/test-projects/modelcheck/.mps/migration.xml b/test-projects/modelcheck/.mps/migration.xml index 349b4d7..d62e30e 100644 --- a/test-projects/modelcheck/.mps/migration.xml +++ b/test-projects/modelcheck/.mps/migration.xml @@ -5,5 +5,12 @@ + + + + + + + \ No newline at end of file diff --git a/test-projects/modelcheck/.mps/vcs.xml b/test-projects/modelcheck/.mps/vcs.xml index c2365ab..b2bdec2 100644 --- a/test-projects/modelcheck/.mps/vcs.xml +++ b/test-projects/modelcheck/.mps/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/test-projects/modelcheck/solutions/my.solution.with.errors/models/java.mps b/test-projects/modelcheck/solutions/my.solution.with.errors/models/java.mps index 0098f15..3424b04 100644 --- a/test-projects/modelcheck/solutions/my.solution.with.errors/models/java.mps +++ b/test-projects/modelcheck/solutions/my.solution.with.errors/models/java.mps @@ -2,7 +2,7 @@ - + @@ -14,13 +14,13 @@ - + - + diff --git a/test-projects/modelcheck/solutions/my.solution.with.errors/models/my.solution.with.errors.brokenref.mps b/test-projects/modelcheck/solutions/my.solution.with.errors/models/my.solution.with.errors.brokenref.mps index 662dc4b..739f6f9 100644 --- a/test-projects/modelcheck/solutions/my.solution.with.errors/models/my.solution.with.errors.brokenref.mps +++ b/test-projects/modelcheck/solutions/my.solution.with.errors/models/my.solution.with.errors.brokenref.mps @@ -2,7 +2,7 @@ - + @@ -22,14 +22,14 @@ - + - + diff --git a/test-projects/modelcheck/solutions/my.solution.with.errors/my.solution.with.errors.msd b/test-projects/modelcheck/solutions/my.solution.with.errors/my.solution.with.errors.msd index 66083fa..d8b44a4 100644 --- a/test-projects/modelcheck/solutions/my.solution.with.errors/my.solution.with.errors.msd +++ b/test-projects/modelcheck/solutions/my.solution.with.errors/my.solution.with.errors.msd @@ -1,18 +1,17 @@ - + - + - - + diff --git a/test-projects/modelcheck/solutions/my.solution.with.module.errors/my.solution.with.module.errors.msd b/test-projects/modelcheck/solutions/my.solution.with.module.errors/my.solution.with.module.errors.msd index 4759eaa..a5804c8 100644 --- a/test-projects/modelcheck/solutions/my.solution.with.module.errors/my.solution.with.module.errors.msd +++ b/test-projects/modelcheck/solutions/my.solution.with.module.errors/my.solution.with.module.errors.msd @@ -1,16 +1,15 @@ - + - + - 86530839-2a21-40f5-8fea-f98ec8d7d852(my.solution.non.existing) diff --git a/test-projects/modelcheck/solutions/my.solution/models/java.mps b/test-projects/modelcheck/solutions/my.solution/models/java.mps index 17a5867..0b6922c 100644 --- a/test-projects/modelcheck/solutions/my.solution/models/java.mps +++ b/test-projects/modelcheck/solutions/my.solution/models/java.mps @@ -51,7 +51,7 @@ - + @@ -61,13 +61,13 @@ - + - + diff --git a/test-projects/modelcheck/solutions/my.solution/my.solution.msd b/test-projects/modelcheck/solutions/my.solution/my.solution.msd index 5a8e218..2a3d756 100644 --- a/test-projects/modelcheck/solutions/my.solution/my.solution.msd +++ b/test-projects/modelcheck/solutions/my.solution/my.solution.msd @@ -1,30 +1,29 @@ - + - + - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - + - + - +