Merge branch 'TPMLC' into 'dev'

add JL dep See merge request monticore/monticore!1037
MontiCore · Oct 1, 2024 · 026b7d9 · 026b7d9
2 parents f738310 + ab28acd
commit 026b7d9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/monticore-grammar/build.gradle b/monticore-grammar/build.gradle
@@ -220,10 +220,8 @@ def grammarDependencies = ext {
   ODRules = ["TFBasisExts", "MCCommonLiterals", "MCJavaLiterals", "UMLStereotype"]
   MCVarDeclarationStatements = ["MCStatementsBasis", "MCBasicTypes", "ExpressionsBasis", "OOSymbols"]
 
-  // five dependencies
-  JavaLight = ["AssignmentExpressions", "JavaClassExpressions", "MCCommonStatements", "MCArrayStatements", "MCReturnStatements"]
-
   // six dependencies
+  JavaLight = ["AssignmentExpressions", "JavaClassExpressions", "MCCommonStatements", "MCArrayStatements", "MCReturnStatements", "TypeParameters"]
   MCFullJavaStatements = ["MCAssertStatements", "MCExceptionStatements", "MCLowLevelStatements", "MCReturnStatements", "MCSynchronizedStatements", "MCArrayStatements"]
 
   // nine dependencies
@@ -384,6 +382,7 @@ checkArtifactsJavaLight.dependsOn(checkArtifactsJavaClassExpressions)
 checkArtifactsJavaLight.dependsOn(checkArtifactsMCCommonStatements)
 checkArtifactsJavaLight.dependsOn(checkArtifactsMCArrayStatements)
 checkArtifactsJavaLight.dependsOn(checkArtifactsMCReturnStatements)
+checkArtifactsJavaLight.dependsOn(checkArtifactsTypeParameters)
 checkArtifactsJavaLight.dependsOn(checkArtifactsUglyExpressions)
 
 checkArtifactsMCCommon.dependsOn(checkArtifactsCardinality)
@@ -518,6 +517,7 @@ showArtifactsJavaLight.dependsOn(showArtifactsJavaClassExpressions)
 showArtifactsJavaLight.dependsOn(showArtifactsMCCommonStatements)
 showArtifactsJavaLight.dependsOn(showArtifactsMCArrayStatements)
 showArtifactsJavaLight.dependsOn(showArtifactsMCReturnStatements)
+showArtifactsJavaLight.dependsOn(showArtifactsTypeParameters)
 showArtifactsJavaLight.dependsOn(showArtifactsUglyExpressions)
 
 showArtifactsMCCommon.dependsOn(showArtifactsCardinality)