Replace api-gen v1 with api-gen v2 (PR#48)

Replace api-gen v1 with api-gen v2

.gitignore

@@ -9,6 +9,7 @@ classes_gen
 source_gen
 source_gen.caches
 !mps/solutions/University.Schedule.api/source_gen
+mps/metamodel/src
 
 # generated test code and test results
 test_gen

gradle.properties

@@ -1,14 +1,15 @@
 # MPS
-mps_version=2020.3.6
-mpsExtensions_version=2020.3.2460.1bab41f
+mps_version=2021.3.2
+mpsExtensions_version=2021.3.2496.3b163cd
 
 # modelix
-modelix_version=1.4.10
-mps_model_plugin_version=2020.3.125
+modelix_version=1.4.16
+modelix_metamodel_version=1.4.17
+mps_model_plugin_version=2021.3.127
 
 # modelix MPS components
 api_gen_version=2020.3.65
-json_bulk_access_version=2.5
+json_bulk_access_version=2.5.2
 
 # backend 1 / SPA
 ktor_version=2.0.3

mps/.mps/migration.xml

@@ -2,6 +2,8 @@
 <project version="4">
   <component name="MigrationProperties">
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_2.SplitMPSCoreStub" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
     <entry key="project.baseline.version" value="212" />
+    <entry key="project.migrated.version" value="213" />
   </component>
 </project>

mps/.mps/modules.xml

@@ -4,7 +4,6 @@
     <projectModules>
       <modulePath path="$PROJECT_DIR$/languages/University.Schedule/University.Schedule.mpl" folder="" />
       <modulePath path="$PROJECT_DIR$/languages/University.Schedule/sandbox/University.Schedule.sandbox.msd" folder="" />
-      <modulePath path="$PROJECT_DIR$/solutions/University.Schedule.api/University.Schedule.api.msd" folder="" />
       <modulePath path="$PROJECT_DIR$/solutions/University.Schedule.build/University.Schedule.build.msd" folder="" />
     </projectModules>
   </component>

mps/build.gradle.kts

@@ -2,6 +2,7 @@ import de.itemis.mps.gradle.BuildLanguages
 
 plugins {
     java
+    id("org.modelix.metamodel.gradle")
 }
 
 buildscript {
@@ -32,7 +33,6 @@ dependencies {
     buildDependencies("org.apache.ant:ant-junit:1.10.12")
     mps("com.jetbrains:mps:$mps_version")
     mpsDependencies("de.itemis.mps:extensions:$mpsExtensions_version")
-    mpsDependencies("org.modelix.mps.api-gen:mps-plugin:$api_gen_version")
     mpsDependencies("org.modelix.mps-json-bulk-model-access:mps-plugin:$json_bulk_access_version")
     mpsDependencies("org.modelix:mps-model-plugin:$mps_model_plugin_version")
 }
@@ -81,15 +81,22 @@ val buildLanguages by tasks.registering(BuildLanguages::class) {
     dependsOn(setup)
 }
 
+tasks.getByName("build").dependsOn(buildLanguages)
 
-val genApi by tasks.registering(BuildLanguages::class) {
-    group = "build"
-    description = "Generate the API classes"
-    script = "$projectDir/build-gen-api.xml"
-    inputs.file(file("$projectDir/build-gen-api.xml"))
-    inputs.files(fileTree("$projectDir/solutions").include("**/*.mps", "**/*.msd")).withPropertyName("mps-solution")
-    outputs.dir("$projectDir/solutions/University.Schedule.api/source_gen")
-    dependsOn(buildLanguages)
-}
+// Generate the API classes
+metamodel {
+    dependsOn(extractMps)
+    mpsHome = mpsDir
+
+    modulesFrom(projectDir.resolve("languages"))
+    modulesFrom(projectDir.resolve("solutions"))
+    includeNamespace("University.Schedule.sandbox")
+    includeLanguage("University.Schedule")
+
+    modulesFrom(projectDir.resolve("build/dependencies"))
+    includeLanguage("org.modelix.model.repositoryconcepts")
+
+    kotlinDir = project(":mps:metamodel").projectDir.resolve("src/main/kotlin")
 
-tasks.getByName("build").dependsOn(buildLanguages)
+    registrationHelperName = "University.Schedule.GeneratedLanguages"
+}

mps/languages/University.Schedule/University.Schedule.mpl

@@ -25,7 +25,7 @@
       </facets>
       <external-templates />
       <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -56,7 +56,7 @@
   </generators>
   <sourcePath />
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />

mps/languages/University.Schedule/sandbox/models/University.Schedule.sandbox.mps

@@ -42,7 +42,7 @@
   <node concept="1dfXjb" id="3_cs9tOt5VE">
     <node concept="1dfXj3" id="3_cs9tOt5VF" role="1dfXja">
       <property role="TrG5h" value="Einstein" />
-      <property role="1dfXj0" value="42" />
+      <property role="1dfXj0" value="111111142" />
       <property role="1dfXje" value="true" />
     </node>
     <node concept="1dfXj3" id="3_cs9tOt5VH" role="1dfXja">

mps/metamodel/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    kotlin("jvm")
+}
+
+val modelix_metamodel_version: String by project
+
+dependencies {
+    api("org.modelix:metamodel-runtime:$modelix_metamodel_version")
+}

mps/solutions/University.Schedule.api/build.gradle.kts

@@ -21,7 +21,7 @@ repositories {
 
 dependencies {
     implementation("org.modelix.mps.api-gen:runtime:$api_gen_version")
-    implementation("org.modelix:model-api:1.3.2")
+    implementation("org.modelix:model-api:$modelix_version")
     implementation("org.modelix.mps-json-bulk-model-access:model-client:$json_bulk_access_version")
     implementation("org.modelix.mps-json-bulk-model-access:model-api:$json_bulk_access_version")
     implementation("org.modelix:model-api-jvm:$modelix_version")