Merge pull request #119 from modelix/feature/model-api-gen-enum-support

MODELIX-433 Code generator lacks support for enums

Author: mhuster23

metamodel-export/.mps/migration.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="MigrationProperties">
+    <entry key="jetbrains.mps.ide.mpsmigration.v182.ReapplyPatternMigration" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v191.SaveAllJavaStubMethodRefsToShortForeignFormat" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v191.UpdateJavaStubMethodRefs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2019_3.DefaultFacetExplicitPersistence" value="executed" />
   </component>
 </project>

metamodel-export/org.modelix.metamodel.export/models/org.modelix.metamodel.export.mps

@@ -5,8 +5,6 @@
       <sourceRoot location="models" />
     </modelRoot>
     <modelRoot contentPath="${module}/lib" type="java_classes">
-      <sourceRoot location="metamodel-generator.jar" />
-      <sourceRoot location="metamodel-runtime-jvm.jar" />
       <sourceRoot location="model-api-jvm.jar" />
       <sourceRoot location="kaml-jvm.jar" />
       <sourceRoot location="kotlin-logging-jvm.jar" />
@@ -20,6 +18,9 @@
       <sourceRoot location="kotlinx-serialization-core-jvm.jar" />
       <sourceRoot location="kotlinx-serialization-json-jvm.jar" />
       <sourceRoot location="snakeyaml-engine.jar" />
+      <sourceRoot location="model-api-gen-runtime-jvm.jar" />
+      <sourceRoot location="model-api-gen.jar" />
+      <sourceRoot location="slf4j-api.jar" />
     </modelRoot>
   </models>
   <facets>
@@ -28,8 +29,6 @@
     </facet>
   </facets>
   <stubModelEntries>
-    <stubModelEntry path="${module}/lib/metamodel-generator.jar" />
-    <stubModelEntry path="${module}/lib/metamodel-runtime-jvm.jar" />
     <stubModelEntry path="${module}/lib/model-api-jvm.jar" />
     <stubModelEntry path="${module}/lib/kaml-jvm.jar" />
     <stubModelEntry path="${module}/lib/kotlin-logging-jvm.jar" />
@@ -43,6 +42,9 @@
     <stubModelEntry path="${module}/lib/kotlinx-serialization-core-jvm.jar" />
     <stubModelEntry path="${module}/lib/kotlinx-serialization-json-jvm.jar" />
     <stubModelEntry path="${module}/lib/snakeyaml-engine.jar" />
+    <stubModelEntry path="${module}/lib/model-api-gen-runtime-jvm.jar" />
+    <stubModelEntry path="${module}/lib/model-api-gen.jar" />
+    <stubModelEntry path="${module}/lib/slf4j-api.jar" />
   </stubModelEntries>
   <sourcePath />
   <dependencies>
@@ -62,7 +64,7 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="18" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
@@ -73,7 +75,6 @@
     <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="e52a4421-48a2-4de1-8327-d9414e799c67(org.modelix.metamodel.export)" version="0" />

metamodel-export/org.modelix.metamodel.export/org.modelix.metamodel.export.msd

@@ -1,11 +1,3 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * This generated file contains a sample Gradle plugin project to get you started.
- * For more details take a look at the Writing Custom Plugins chapter in the Gradle
- * User Manual available at https://docs.gradle.org/7.5.1/userguide/custom_plugins.html
- * This project uses @Incubating APIs which are subject to change.
- */
 
 plugins {
     // Apply the Java Gradle plugin development plugin to add support for developing Gradle plugins
@@ -32,19 +24,12 @@ dependencies {
     implementation(project(":model-api"))
 }
 
-// ------------- Download MPS for the functional test ------------------------------------------------------------------
-
-val mps = configurations.create("mps")
-
-dependencies {
-    mps("com.jetbrains:mps:2021.3.+")
-}
-
-val mpsDir = buildDir.resolve("mps")
-
-val resolveMps by tasks.registering(Sync::class) {
-    from(mps.resolve().map { zipTree(it) })
-    into(mpsDir)
+gradlePlugin {
+    // Define the plugin
+    val mpsMetaModel by plugins.creating {
+        id = "org.modelix.model-api-gen"
+        implementationClass = "org.modelix.metamodel.gradle.MetaModelGradlePlugin"
+    }
 }
 
 val writeVersionFile by tasks.registering {
@@ -56,56 +41,4 @@ val writeVersionFile by tasks.registering {
 }
 tasks.named("processResources") {
     dependsOn(writeVersionFile)
-}
-
-// ---------------------------------------------------------------------------------------------------------------------
-
-testing {
-    suites {
-        // Configure the built-in test suite
-        val test by getting(JvmTestSuite::class) {
-            // Use Kotlin Test test framework
-            useKotlinTest()
-        }
-
-        // Create a new test suite
-        val functionalTest by registering(JvmTestSuite::class) {
-            useJUnit()
-
-            dependencies {
-                // functionalTest test suite depends on the production code in tests
-                implementation(project(":model-api-gen-gradle"))
-                implementation(project(":model-api"))
-                implementation(project(":model-api-gen"))
-                implementation(project(":metamodel-export"))
-            }
-
-            targets {
-                all {
-                    // This test suite should run after the built-in test suite has run its tests
-                    testTask.configure { shouldRunAfter(test) } 
-                }
-            }
-        }
-    }
-}
-
-gradlePlugin {
-    // Define the plugin
-    val mpsMetaModel by plugins.creating {
-        id = "org.modelix.model-api-gen"
-        implementationClass = "org.modelix.metamodel.gradle.MetaModelGradlePlugin"
-    }
-}
-
-gradlePlugin.testSourceSets(sourceSets["functionalTest"])
-
-tasks.named<Task>("check") {
-    // Include functionalTest as part of the check lifecycle
-    dependsOn(testing.suites.named("functionalTest"))
-}
-
-tasks.named("functionalTest") {
-    dependsOn(resolveMps)
-    dependsOn(":metamodel-export:publish_metamodel-export_PublicationToMavenLocal")
-}
+}