Merge pull request #681 from IETS3/refactor/cleanup_jul_2023_2022_2

Cleanup + model checker + linters (2022 branch)

README.md

@@ -3,8 +3,8 @@
 ## Build instructions
 
 ### Using Gradle
-If you just want to build the project, no prerequisites are required. Just run `./gradlew build` from the checkout
-directory. This will download required version of the mbeddr platform language library from the itemis Nexus repository.
+
+If you just want to build the project, no prerequisites are required. Just run `./gradlew build` from the checkout directory. This will download required version of the mbeddr platform language library from the itemis Nexus repository.
 When the build has finished, you can open the project in MPS from the folder `<iets3.opensource>/code/languages/org.iets3.opensource`
 
 To publish this project's artifacts to the Maven local repository run `./gradlew publishToMavenLocal`.
@@ -27,6 +27,11 @@ For details see [wiki](https://github.com/IETS3/iets3.opensource/wiki/Supported-
 - MPS 2021.1 (branch: [maintenance/mps20211](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20211)) 
 - MPS 2020.3 (branch: [maintenance/mps20203](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20203)) 
 
+## Documentation
+
+- [KernelF | MPS Platform Docs](http://mbeddr.com/mps-platform-docs/languages/kernelf/)
+- [Platform essentials | MPS Platform Docs](http://mbeddr.com/mps-platform-docs/platform_essentials/)
+
 ## Community
 
 ### Slack

build.gradle

@@ -10,7 +10,7 @@ buildscript {
         maven { url 'https://artifacts.itemis.cloud/repository/maven-mps/' }
     }
     dependencies {
-        classpath 'de.itemis.mps:mps-gradle-plugin:1.16.352.17eae3e'
+        classpath 'de.itemis.mps:mps-gradle-plugin:1.18.356.90f1a8c'
     }
 }
 
@@ -123,6 +123,7 @@ configurations {
 
 dependencies {
     mps "com.jetbrains:mps:$mpsVersion"
+    languageLibs "org.mpsqa:all-in-one:$mpsVersion+"
     languageLibs "com.mbeddr:platform:$mbeddrVersionSelector"
     junitAnt 'org.apache.ant:ant-junit:1.10.6'
     pcollections 'org.pcollections:pcollections:3.1.4'
@@ -211,6 +212,36 @@ task buildAndRunTests(type: TestLanguages, dependsOn: buildLanguages) {
 
 check.dependsOn buildAndRunTests
 
+apply plugin: 'modelcheck'
+
+File modelcheckresult = new File("$buildDir/TEST-checkProject.xml")
+
+def pluginsList = []
+
+modelcheck {
+    projectLocation =  new File("$projectDir/code")
+    mpsLocation = new File("$buildDir/mps")
+    plugins = pluginsList
+    mpsConfig = configurations.mps
+    macros = [new Macro("iets3.github.opensource.home", "$projectDir")]
+    junitFile = modelcheckresult
+    junitFormat = "message"
+    errorNoFail = true
+    debug = false
+    maxHeap = "4G"
+}
+
+
+afterEvaluate {  project -> 
+    check.configure {
+        dependsOn tasks.named('checkmodels')
+    }
+}
+
+checkmodels {
+    dependsOn(resolveMps)
+}
+
 task packageLanguages(type: Zip, dependsOn: buildLanguages) {
     archiveBaseName = 'org.iets3.opensource'
     from artifactsDir

code/languages/org.iets3.opensource/.mps/libraries.xml

@@ -11,6 +11,14 @@
             </Library>
           </value>
         </entry>
+        <entry key='org.mpsqa.allInOne'>
+          <value>
+            <Library>
+              <option name='name' value='org.mpsqa.allInOne' />
+              <option name='path' value='$PROJECT_DIR$/../../../build/dependencies/org.mpsqa.allInOne' />
+            </Library>
+          </value>
+        </entry>
       </map>
     </option>
   </component>

code/languages/org.iets3.opensource/.mps/modules.xml

@@ -128,6 +128,7 @@
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.allScripts.build/org.iets3.opensource.allScripts.build.msd" folder="_build" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.build.gentests.rt/org.iets3.opensource.build.gentests.rt.msd" folder="_build" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.build/org.iets3.opensource.build.msd" folder="_build" />
+      <modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.linters/org.iets3.opensource.linters.msd" folder="linters" />
       <modulePath path="$PROJECT_DIR$/solutions/playground/playground.msd" folder="expr.tests" />
       <modulePath path="$PROJECT_DIR$/solutions/test.ex.core.expr.genjava/test.ex.core.expr.genjava.msd" folder="expr.genjava" />
       <modulePath path="$PROJECT_DIR$/solutions/test.iets3.core.assessment/test.iets3.core.tracequery.msd" folder="trace" />

code/languages/org.iets3.opensource/devkits/org.iets3.core.expr.genjava.stateMachineExample.devkit/org.iets3.core.expr.genjava.stateMachineExample.devkit.devkit

@@ -3,6 +3,10 @@
   <exported-language name="a15685d6-531e-45b7-9e72-af80302071ea(org.iets3.core.expr.genjava.stateMachineExample)" />
   <exported-language name="2f7e2e35-6e74-4c43-9fa5-2465d68f5996(org.iets3.core.expr.collections)" />
   <exported-language name="6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)" />
+  <exported-language name="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" />
+  <exported-language name="30254c5b-f87e-4bb3-a60a-77a7ec6ed411(org.iets3.core.expr.genjava.base)" />
+  <exported-language name="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" />
+  <exported-language name="5a0b0b9c-ca67-4d27-9caa-ec974d9cfa40(org.iets3.core.expr.genjava.simpleTypes)" />
   <extendedDevKits>
     <extendedDevKit>ffc660b2-672c-4f91-9291-8426ed4e58de(org.iets3.core.expr.genjava.advanced.devkit)</extendedDevKit>
   </extendedDevKits>

code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps

@@ -10,7 +10,6 @@
   </languages>
   <imports>
     <import index="l80j" ref="r:9e71c0de-f9ab-4b67-96cc-7d9c857513f6(org.iets3.analysis.base.structure)" />
-    <import index="ich0" ref="r:2c56c15d-9645-459e-8807-414df4bb772a(org.iets3.analysis.base.typesystem)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
   </imports>
   <registry>