update to MC 7.8.0

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    alias(libs.plugins.monticore) apply false
+    id "de.monticore.generator" version "$mc_version" apply false
 }
 
 allprojects {

gradle.properties

@@ -4,7 +4,18 @@ repo=https://nexus.se.rwth-aachen.de/content/groups/public
 
 useLocalRepo=false
 
-version=7.7.0-SNAPSHOT
-
 org.gradle.caching=true
 org.gradle.welcome=never
+org.gradle.jvmargs=-Xms3072m -Dfile.encoding=UTF-8
+
+version=7.8.0-SNAPSHOT
+
+# dependency versions
+mc_version=7.8.0-SNAPSHOT
+emf_version=2.15.0
+shadow_plugin_version=7.1.2
+guava_version=31.1-jre
+junit_version=5.10.3
+google_java_format_version=0.9
+spoon_core_version=10.2.0
+commons_lang3_version=3.9

gradle/corpus.versions.toml

@@ -17,4 +17,4 @@ guava = { module = "com.google.guava:guava", version = "31.1-jre" }
 
 # de.monticore - MontiCore
 # https://github.com/MontiCore/monticore - Java 11
-monticore-runtime = { module = "de.monticore:monticore-runtime", version = "7.6.0-SNAPSHOT" }
+monticore-runtime = { module = "de.monticore:monticore-runtime", version = "7.8.0-SNAPSHOT" }

javaDSL-emf/build.gradle

@@ -6,9 +6,6 @@ def srcTestDir = "$buildDir/copied-sources/test"
 def grammarsDir = "${project(":javaDSL").projectDir}/src/main/grammars"
 
 sourceSets {
-    main.java.srcDirs("$srcMainDir/java", "$buildDir/generated-sources/monticore/sourcecode")
-    test.java.srcDirs("$srcTestDir/java")
-
     grammars {
         resources {
             srcDir(grammarsDir)
@@ -23,62 +20,38 @@ java {
     }
 }
 
-task copyMainSources(type: Copy) {
+tasks.register('copyMainSources', Copy) {
     destinationDir = file srcMainDir
     from "${project(':javaDSL').projectDir}/src/main"
 }
 
-task copyTestSources(type: Copy) {
+tasks.register('copyTestSources', Copy) {
     destinationDir = file srcTestDir
     from "${project(':javaDSL').projectDir}/src/main"
 }
 
-tasks.register("generateTextBlock", MCTask) {
+generateMCGrammars {
     dependsOn(copyMainSources, copyTestSources)
-
-    grammar = file "$grammarsDir/de/monticore/java/TextBlock.mc4"
-    outputDir = file "$buildDir/generated-sources/monticore/sourcecode"
-    handcodedPath "$srcMainDir/java"
-
     script = "de/monticore/monticore_emf.groovy"
-
-    def upToDate = incCheck("de/monticore/java/TextBlock.mc4")
-    outputs.upToDateWhen { upToDate }
-}
-
-tasks.register("generate", MCTask) {
-    dependsOn(tasks.generateTextBlock)
-    dependsOn(copyMainSources, copyTestSources)
-
-    grammar = file "$grammarsDir/de/monticore/java/JavaDSL.mc4"
-    outputDir = file "$buildDir/generated-sources/monticore/sourcecode"
-    modelPath "$grammarsDir"
-    handcodedPath "$srcMainDir/java"
-
-    script = "de/monticore/monticore_emf.groovy"
-
-    def upToDate = incCheck("de/monticore/java/JavaDSL.mc4")
-    outputs.upToDateWhen { upToDate }
 }
 
 dependencies {
-    implementation(platform(libs.junit.bom))
-    implementation "de.monticore.lang:cd4analysis:7.7.0-SNAPSHOT"
+    implementation "de.monticore.lang:cd4analysis:$mc_version"
 
-    api(libs.monticore.grammar.emf)
-    api(libs.monticore.runtime.emf)
+    implementation "org.eclipse.emf:org.eclipse.emf.common:$emf_version"
+    implementation "org.eclipse.emf:org.eclipse.emf.ecore:$emf_version"
+    implementation "org.eclipse.emf:org.eclipse.emf.ecore.xmi:$emf_version"
 
-    api(libs.emf.common)
-    api(libs.emf.ecore)
-    api(libs.emf.ecore.xmi)
+    implementation "de.monticore:monticore-grammar-emf:$mc_version"
+    implementation "de.monticore:monticore-runtime-emf:$mc_version"
 
-    grammar(libs.monticore.grammar) {
+    grammar("de.monticore:monticore-grammar:$mc_version") {
         capabilities {
             requireCapability("de.monticore:monticore-grammar-grammars")
         }
     }
 
-    testImplementation(libs.junit.jupiter.api)
-    testImplementation(libs.junit.jupiter.params)
-    testRuntimeOnly(libs.junit.jupiter.engine)
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
 }

javaDSL/build.gradle

@@ -62,21 +62,20 @@ tasks.withType(Test).configureEach {
 }
 
 dependencies {
-    implementation(platform(libs.junit.bom))
-    implementation "de.monticore.lang:cd4analysis:$version"
+    implementation "de.monticore.lang:cd4analysis:$mc_version"
 
-    api(libs.monticore.grammar)
-    api(libs.monticore.runtime)
+    implementation "de.monticore:monticore-grammar:$mc_version"
+    implementation "de.monticore:monticore-runtime:$mc_version"
 
-    grammar(libs.monticore.grammar) {
+    grammar("de.monticore:monticore-grammar:$mc_version") {
         capabilities {
             requireCapability("de.monticore:monticore-grammar-grammars")
         }
     }
 
-    testImplementation(libs.junit.jupiter.api)
-    testImplementation(libs.junit.jupiter.params)
-    testRuntimeOnly(libs.junit.jupiter.engine)
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
 
     corpus(corpus.guava)
     corpus(corpus.monticore.runtime)

javaDSL/src/main/grammars/de/monticore/java/JavaDSL.mc4

@@ -3,75 +3,83 @@
 package de.monticore.java;
 
 /**
- * The full grammar dependency tree as of 7.4
+ * The full grammar dependency tree as of 7.8
  *
  * JavaDSL
+ * |-> de.monticore.java.TextBlock
+ * |-> de.monticore.literals.MCJavaLiterals
+ *     |-> de.monticore.literals.MCCommonLiterals
+ *         |-> de.monticore.MCBasics
+ *         |-> de.monticore.literals.MCLiteralsBasis
  * |-> de.monticore.JavaLight
  *     |-> de.monticore.expressions.AssignmentExpressions
  *         |-> de.monticore.expressions.ExpressionsBasis
- *             |-> de.monticore.MCBasics
- *             |-> de.monticore.literals.MCLiteralsBasis
+ *             |-> de.monticore.MCBasics (*)
+ *             |-> de.monticore.literals.MCLiteralsBasis (*)
  *     |-> de.monticore.expressions.JavaClassExpressions
  *         |-> de.monticore.expressions.CommonExpressions
  *             |-> de.monticore.expressions.ExpressionsBasis (*)
- *     |-> de.monticore.statements.MCArrayStatements
  *         |-> de.monticore.statements.MCVarDeclarationStatements
+ *             |-> de.monticore.statements.MCStatementBasis
+ *             |-> de.monticore.types.MCBasicTypes
+ *                 |-> de.monticore.MCBasics (*)
  *             |-> de.monticore.expressions.ExpressionsBasis (*)
- *             |-> de.monticore.statements.MCStatementsBasis
  *             |-> de.monticore.symbols.OOSymbols
  *                 |-> de.monticore.symbols.BasicSymbols
  *                     |-> de.monticore.MCBasics (*)
- *             |-> de.monticore.types.MCBasicTypes
- *                 |-> de.monticore.MCBasics (*)
+ *         |-> de.monticore.types.MCFullGenericTypes
+ *             |-> de.monticore.types.MCSimpleGenericTypes
+ *                 |-> de.monticore.types.MCCollectionTypes
+ *                     |-> de.monticore.types.MCBasicTypes (*)
+ *         |-> de.monticore.expressions.UglyExpressions
+ *             |-> de.monticore.types.MCBasicTypes (*)
+ *             |-> de.monticore.expressions.ExpressionsBasis (*)
+ *     |-> de.monticore.statements.MCCommonLiterals (*)
  *     |-> de.monticore.statements.MCCommonStatements
  *         |-> de.monticore.statements.MCVarDeclarationStatements (*)
+ *     |-> de.monticore.statements.MCArrayStatements
+ *         |-> de.monticore.statements.MCVarDeclarationStatements (*)
  *     |-> de.monticore.statements.MCReturnStatements
+ *         |-> de.monticore.statements.MCStatementsBasis
  *         |-> de.monticore.expressions.ExpressionsBasis (*)
- *         |-> de.monticore.statements.MCStatementsBasis (*)
+ *     |-> de.monticore.types.TypeParameters
+ *         |-> de.monticore.symbols.BasicSymbols (*)
+ *         |-> de.monticore.types.MCBasicTypes (*)
  * |-> de.monticore.expressions.BitExpressions
  *     |-> de.monticore.expressions.ExpressionsBasis (*)
  * |-> de.monticore.expressions.LambdaExpressions
- *     |-> de.monticore.expressions.ExpressionsBasis (*)
  *     |-> de.monticore.symbols.BasicSymbols (*)
  *     |-> de.monticore.types.MCBasicTypes (*)
- * |-> de.monticore.literals.MCJavaLiterals
- *     |-> de.monticore.literals.MCCommonLiterals (*)
- *         |-> de.monticore.MCBasics (*)
- *         |-> de.monticore.literals.MCLiteralsBasis (*)
+ *     |-> de.monticore.expressions.ExpressionsBasis (*)
  * |-> de.monticore.statements.MCFullJavaStatements
- *     |-> de.monticore.statements.MCArrayStatements (*)
  *     |-> de.monticore.statements.MCAssertStatements
- *         |-> de.monticore.expressions.ExpressionsBasis (*)
  *         |-> de.monticore.statements.MCStatementsBasis (*)
+ *         |-> de.monticore.expressions.ExpressionsBasis (*)
  *     |-> de.monticore.statements.MCExceptionStatements
  *         |-> de.monticore.statements.MCCommonStatements (*)
  *     |-> de.monticore.statements.MCLowLevelStatements
- *         |-> de.monticore.MCBasics (*)
  *         |-> de.monticore.statements.MCStatementsBasis (*)
+ *         |-> de.monticore.MCBasics (*)
  *     |-> de.monticore.statements.MCReturnStatements (*)
+ *         |-> de.monticore.statements.MCStatementsBasis (*)
+ *         |-> de.monticore.expressions.ExpressionsBasis (*)
  *     |-> de.monticore.statements.MCSynchronizedStatements
  *         |-> de.monticore.statements.MCCommonStatements (*)
+ *     |-> de.monticore.statements.MCArrayStatements (*)
+ *         |-> de.monticore.statements.MCVarDeclarationStatements (*)
  * |-> de.monticore.types.MCArrayTypes
- *     |-> de.monticore.types.MCBasicTypes
- *         |-> de.monticore.MCBasics (*)
- * |-> de.monticore.types.MCFullGenericTypes
- *     |-> de.monticore.types.MCSimpleGenericTypes
- *         |-> de.monticore.types.MCCollectionTypes
- *             |-> de.monticore.types.MCBasicTypes (*)
- * |-> de.monticore.types.TypeParameters
- *     |-> de.monticore.symbols.BasicSymbols
- *         |-> de.monticore.MCBasics (*)
- *     |-> de.monticore.types.MCBasicTypes
- *         |-> de.monticore.MCBasics (*)
+ *     |-> de.monticore.types.MCBasicTypes (*)
+ * |-> de.monticore.types.MCFullGenericTypes (*)
+ * |-> de.monticore.types.TypeParameters (*)
  *
  * (*) Repeated Dependencies are omitted.
  */
 grammar JavaDSL extends
     de.monticore.java.TextBlock,
+    de.monticore.literals.MCJavaLiterals,
     de.monticore.JavaLight,
 	de.monticore.expressions.BitExpressions,
 	de.monticore.expressions.LambdaExpressions, // TODO: move to JavaLight?
-	de.monticore.literals.MCJavaLiterals,
 	de.monticore.statements.MCFullJavaStatements,
 	de.monticore.types.MCArrayTypes,
 	de.monticore.types.MCFullGenericTypes,

javaDSL/src/test/java/de/monticore/java/AbstractTest.java

@@ -1,5 +1,7 @@
 package de.monticore.java;
 
+import de.monticore.cd4code.CD4CodeMill;
+import de.monticore.java.javadsl.JavaDSLMill;
 import de.se_rwth.commons.logging.LogStub;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -19,6 +21,10 @@ public static void setup() {
   @BeforeEach
   public void reset() {
     LogStub.init();
+    JavaDSLMill.init();
+    JavaDSLMill.globalScope().clear();
+    CD4CodeMill.init();
+    CD4CodeMill.globalScope().clear();
   }
 
 }

javaDSL/src/test/java/de/monticore/java/JavaDSLAssertions.java

@@ -1,5 +1,6 @@
 package de.monticore.java;
 
+import de.monticore.java.javadsl.JavaDSLMill;
 import de.monticore.java.javadsl._ast.ASTCompilationUnit;
 import de.monticore.java.javadsl._parser.JavaDSLParser;
 import de.se_rwth.commons.logging.Log;
@@ -12,7 +13,7 @@
 public final class JavaDSLAssertions {
 
   public static void assertParsingFailure(String pathToModel) {
-    JavaDSLParser parser = new JavaDSLParser();
+    JavaDSLParser parser = JavaDSLMill.parser();
 
     Optional<ASTCompilationUnit> optCompilationUnit;
 
@@ -28,7 +29,7 @@ public static void assertParsingFailure(String pathToModel) {
   }
 
   public static ASTCompilationUnit assertParsingSuccess(String pathToModel) {
-    JavaDSLParser parser = new JavaDSLParser();
+    JavaDSLParser parser = JavaDSLMill.parser();
 
     Optional<ASTCompilationUnit> optCompilationUnit;
     Throwable cause = null;