Set EMF runtime version in genmodel and generator fragment to 2.36

Signed-off-by: Sebastian Zarnekow <[email protected]>
eclipse-xtext · Dec 15, 2024 · 2fdfd70 · 2fdfd70
1 parent 6e45389
commit 2fdfd70
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 20 deletions.
diff --git a/...er.standalone.tests/src/org/eclipse/xtext/builder/tests/GenerateBuilderTestLanguages.mwe2 b/...er.standalone.tests/src/org/eclipse/xtext/builder/tests/GenerateBuilderTestLanguages.mwe2
@@ -32,8 +32,8 @@ Workflow {
 			grammarUri = "classpath:/org/eclipse/xtext/builder/tests/BuilderTestLanguage.xtext"
 
 			fragment = ecore.EMFGeneratorFragment2 {
-				emfRuntimeVersion = "2.29"
-				jdkLevel = "JDK110"
+				emfRuntimeVersion = "2.36"
+				jdkLevel = "JDK170"
 			}
 			fragment = grammarAccess.GrammarAccessFragment2 {}
 			fragment = resourceFactory.ResourceFactoryFragment2 {}

diff --git a/...types.tests/src/org/eclipse/xtext/common/types/xtext/ui/CommonTestLanguagesFragments.mwe2 b/...types.tests/src/org/eclipse/xtext/common/types/xtext/ui/CommonTestLanguagesFragments.mwe2
@@ -12,7 +12,7 @@ import org.eclipse.xtext.xtext.generator.*
 
 CompositeGeneratorFragment2 {
 	fragment = ecore.EMFGeneratorFragment2 {
-		emfRuntimeVersion = "2.29"
+		emfRuntimeVersion = "2.36"
 	}
 	fragment = grammarAccess.GrammarAccessFragment2 {}
 	fragment = resourceFactory.ResourceFactoryFragment2 {}

diff --git a/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2 b/org.eclipse.xtext.extras.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2
@@ -20,7 +20,7 @@ var backtrackLexer = false
 var debugGrammar = false
 var generateDebugData = false
 var generateStub = false
-var emfRuntimeVersion = "2.29"
+var emfRuntimeVersion = "2.36"
 
 CompositeGeneratorFragment2 {
 	fragment = parser.antlr.XtextAntlrGeneratorFragment2 auto-inject {

diff --git a/...tlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2 b/...tlanguages/src/org/eclipse/xtext/testlanguages/fragments/SimpleTestLanguageFragments.mwe2
@@ -24,7 +24,7 @@ XtextGeneratorLanguage {
 
 	// generates Java API for the generated EPackages 
 	fragment = ecore.EMFGeneratorFragment2 auto-inject {
-		emfRuntimeVersion = "2.29"
+		emfRuntimeVersion = "2.36"
 	}
 
 	// a custom ResourceFactory for use with EMF 

diff --git a/....testlanguages/src/org/eclipse/xtext/testlanguages/nestedRefs/NestedRefsTestLanguage.mwe2 b/....testlanguages/src/org/eclipse/xtext/testlanguages/nestedRefs/NestedRefsTestLanguage.mwe2
@@ -14,7 +14,7 @@ XtextGeneratorLanguage {
 
 	// generates Java API for the generated EPackages
 	fragment = ecore.EMFGeneratorFragment2 auto-inject {
-		emfRuntimeVersion = "2.29"
+		emfRuntimeVersion = "2.36"
 	}
 
 	// serializer 2.0

diff --git a/...ipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2 b/...ipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2
@@ -14,7 +14,7 @@ XtextGeneratorLanguage {
 
 	// generates Java API for the generated EPackages
 	fragment = ecore.EMFGeneratorFragment2 auto-inject {
-		emfRuntimeVersion = "2.29"
+		emfRuntimeVersion = "2.36"
 	}
 
 	// serializer 2.0

diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragments.mwe2
@@ -20,7 +20,7 @@ var backtrackLexer = false
 var debugGrammar = false
 var generateDebugData = false
 var generateStub = false
-var emfRuntimeVersion = "2.29"
+var emfRuntimeVersion = "2.36"
 
 CompositeGeneratorFragment2 {
 	fragment = parser.antlr.XtextAntlrGeneratorFragment2 auto-inject {

diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsQualifiedNames.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/TestLanguagesFragmentsQualifiedNames.mwe2
@@ -14,7 +14,7 @@ var genModel = ""
 var classSplitting = true
 var skipGenerate = false
 var backtrack = false
-var emfRuntimeVersion = "2.29"
+var emfRuntimeVersion = "2.36"
 
 CompositeGeneratorFragment2 {
 	fragment = parser.antlr.XtextAntlrGeneratorFragment2 auto-inject {

diff --git a/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragments.mwe2 b/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragments.mwe2
@@ -17,7 +17,7 @@ var classSplitting = true
 var skipGenerate = false
 var backtrack = false
 var memoize = false
-var emfRuntimeVersion = "2.29"
+var emfRuntimeVersion = "2.36"
 
 CompositeGeneratorFragment2 {
 

diff --git a/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragmentsBuilder.mwe2 b/org.eclipse.xtext.ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragmentsBuilder.mwe2
@@ -15,7 +15,7 @@ var classSplitting = true
 var skipGenerate = false
 var backtrack = false
 var memoize = false
-var emfRuntimeVersion = "2.29"
+var emfRuntimeVersion = "2.36"
 
 CompositeGeneratorFragment2 {
 	fragment = @org.eclipse.xtext.ui.tests.TestLanguagesFragments auto-inject {}

diff --git a/....ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragmentsWithConversionTimeout.mwe2 b/....ui.tests/src/org/eclipse/xtext/ui/tests/TestLanguagesFragmentsWithConversionTimeout.mwe2
@@ -17,7 +17,7 @@ var classSplitting = true
 var skipGenerate = false
 var backtrack = false
 var memoize = false
-var emfRuntimeVersion = "2.29"
+var emfRuntimeVersion = "2.36"
 
 CompositeGeneratorFragment2 {
 	fragment = ecore.EMFGeneratorFragment2 auto-inject {}

diff --git a/...t.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.xtend b/...t.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.xtend
@@ -172,9 +172,9 @@ class EMFGeneratorFragment2 extends AbstractXtextGeneratorFragment {
 	@Accessors(PUBLIC_SETTER)
 	boolean suppressLoadInitialization = false
 
-	/* Default to 2.29 if available, otherwise #get will return null */
-	GenRuntimeVersion emfRuntimeVersion = GenRuntimeVersion.get(GenRuntimeVersion.EMF229_VALUE)
-	GenJDKLevel jdkLevel = GenJDKLevel.JDK110_LITERAL
+	/* Default to 2.36 if available, otherwise #get will return null */
+	GenRuntimeVersion emfRuntimeVersion = GenRuntimeVersion.get(GenRuntimeVersion.EMF236_VALUE)
+	GenJDKLevel jdkLevel = GenJDKLevel.JDK170_LITERAL
 	String rootExtendsClass = 'org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container'
 
 	/**
@@ -198,7 +198,7 @@ class EMFGeneratorFragment2 extends AbstractXtextGeneratorFragment {
 	 *   <li>"JDK110"</li>
 	 *   <li>"JDK170"</li>
 	 * </ul>
-	 * The default level is "JDK110".
+	 * The default level is "JDK170".
 	 */
 	def void setJdkLevel(String jdkLevel) {
 		this.jdkLevel = GenJDKLevel.getByName(jdkLevel)

diff --git a/...xt.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.java b/...xt.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.java
@@ -192,11 +192,11 @@ public class EMFGeneratorFragment2 extends AbstractXtextGeneratorFragment {
   private boolean suppressLoadInitialization = false;
 
   /**
-   * Default to 2.29 if available, otherwise #get will return null
+   * Default to 2.36 if available, otherwise #get will return null
    */
-  private GenRuntimeVersion emfRuntimeVersion = GenRuntimeVersion.get(GenRuntimeVersion.EMF229_VALUE);
+  private GenRuntimeVersion emfRuntimeVersion = GenRuntimeVersion.get(GenRuntimeVersion.EMF236_VALUE);
 
-  private GenJDKLevel jdkLevel = GenJDKLevel.JDK110_LITERAL;
+  private GenJDKLevel jdkLevel = GenJDKLevel.JDK170_LITERAL;
 
   private String rootExtendsClass = "org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container";
 
@@ -222,7 +222,7 @@ public void setEmfRuntimeVersion(final String emfRuntimeVersion) {
    *   <li>"JDK110"</li>
    *   <li>"JDK170"</li>
    * </ul>
-   * The default level is "JDK110".
+   * The default level is "JDK170".
    */
   public void setJdkLevel(final String jdkLevel) {
     this.jdkLevel = GenJDKLevel.getByName(jdkLevel);