Removed all Xtend dependencies

build.gradle

@@ -56,8 +56,7 @@ subprojects {
 
     // Delete generated sources on `gradle clean`
     clean.doFirst {
-        project.logger.info("Deleting ${projectDir}/xtend-gen, src-gen")
-        delete "$projectDir}/xtend-gen/"
+        project.logger.info("Deleting ${projectDir}/src-gen")
         delete "${projectDir}/src-gen/"
     }
 }

gradle.properties

@@ -22,7 +22,6 @@ xtextVersion=2.26.0
 
 [manifestPropertyNames]
 org.eclipse.xtext=xtextVersion
-org.eclipse.xtend=xtextVersion
 org.eclipse.lsp4j=lsp4jVersion
 org.opentest4j=openTest4jVersion
 org.eclipse.core.runtime=runtimeVersion

gradle/source-layout.gradle

@@ -6,7 +6,7 @@ if (name.endsWith(".tests")) {
 			resources.srcDirs = []
 		}
 		test {
-			java.srcDirs = ['src', 'src-gen', 'xtend-gen']
+			java.srcDirs = ['src', 'src-gen']
 			kotlin.srcDirs = ['src', 'src-gen']
 			resources.srcDirs = ['src', 'src-gen']
 			xtendOutputDir = 'xtend-gen'
@@ -15,8 +15,8 @@ if (name.endsWith(".tests")) {
 } else {
 	sourceSets {
 		main {
-			java.srcDirs = ['src', 'src-gen', 'xtend-gen']
-			kotlin.srcDirs = ['src', 'src-gen', 'xtend-gen']
+			java.srcDirs = ['src', 'src-gen']
+			kotlin.srcDirs = ['src', 'src-gen']
 			resources.srcDirs = ['src', 'src-gen']
 			xtendOutputDir = 'xtend-gen'
 		}

oomph/LinguaFranca.setup

@@ -103,18 +103,6 @@
           key="/instance/org.eclipse.ui.ide/unassociatedEditorStrategy"
           value="org.eclipse.epp.internal.mpc.ui.askMarketPlace"/>
     </setupTask>
-    <setupTask
-        xsi:type="setup:CompoundTask"
-        name="org.eclipse.xtend.core.Xtend">
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.xtend.core.Xtend/org.eclipse.xtend.ide.default.eclipse_profile"
-          value="_Lingua Franca"/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.xtend.core.Xtend/XtendFormatterProfile"
-          value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?>&#xA;&lt;profiles version=&quot;1&quot;>&#xA;    &lt;profile kind=&quot;XtendFormatterProfile&quot; name=&quot;Lingua Franca&quot; version=&quot;1&quot;>&#xA;        &lt;setting id=&quot;keep.one.line.methods&quot; value=&quot;true&quot;/>&#xA;        &lt;setting id=&quot;line.width.max&quot; value=&quot;80&quot;/>&#xA;        &lt;setting id=&quot;line.separator&quot; value=&quot;&amp;#10;&quot;/>&#xA;        &lt;setting id=&quot;braces.in.new.line&quot; value=&quot;false&quot;/>&#xA;        &lt;setting id=&quot;newline.after.constructor.annotations&quot; value=&quot;true&quot;/>&#xA;        &lt;setting id=&quot;blank.lines.between.classes&quot; value=&quot;1&quot;/>&#xA;        &lt;setting id=&quot;blank.lines.after.packagedecl&quot; value=&quot;1&quot;/>&#xA;        &lt;setting id=&quot;blank.lines.after.last.member&quot; value=&quot;0&quot;/>&#xA;        &lt;setting id=&quot;blank.line.around.expressions&quot; value=&quot;0&quot;/>&#xA;        &lt;setting id=&quot;indentation.length&quot; value=&quot;-1&quot;/>&#xA;        &lt;setting id=&quot;newline.after.field.annotations&quot; value=&quot;true&quot;/>&#xA;        &lt;setting id=&quot;newline.after.parameter.annotations&quot; value=&quot;true&quot;/>&#xA;        &lt;setting id=&quot;blank.lines.between.imports&quot; value=&quot;0&quot;/>&#xA;        &lt;setting id=&quot;indentation&quot; value=&quot;&amp;#9;&quot;/>&#xA;        &lt;setting id=&quot;tab.width&quot; value=&quot;4&quot;/>&#xA;        &lt;setting id=&quot;whitespace.between.keyword.and.parenthesis&quot; value=&quot;true&quot;/>&#xA;        &lt;setting id=&quot;blank.lines.before.first.member&quot; value=&quot;0&quot;/>&#xA;        &lt;setting id=&quot;preserve.new.lines&quot; value=&quot;true&quot;/>&#xA;        &lt;setting id=&quot;blank.lines.between.fields&quot; value=&quot;0&quot;/>&#xA;        &lt;setting id=&quot;blank.lines.between.fields.and.methods&quot; value=&quot;1&quot;/>&#xA;        &lt;setting id=&quot;blank.lines.after.imports&quot; value=&quot;1&quot;/>&#xA;        &lt;setting id=&quot;newline.after.method.annotations&quot; value=&quot;true&quot;/>&#xA;        &lt;setting id=&quot;blank.lines.between.methods&quot; value=&quot;1&quot;/>&#xA;        &lt;setting id=&quot;blank.lines.between.enum.literals&quot; value=&quot;0&quot;/>&#xA;        &lt;setting id=&quot;newline.after.class.annotations&quot; value=&quot;true&quot;/>&#xA;        &lt;setting id=&quot;preserve.blank.lines&quot; value=&quot;1&quot;/>&#xA;    &lt;/profile>&#xA;&lt;/profiles>&#xA;"/>
-    </setupTask>
   </setupTask>
   <setupTask
       xsi:type="setup:CompoundTask"

org.lflang.diagram/META-INF/MANIFEST.MF

@@ -12,8 +12,6 @@ Require-Bundle: de.cau.cs.kieler.klighd;bundle-version="2.0.0",
  com.google.guava,
  org.eclipse.xtext,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.xtend.lib,
- org.eclipse.xtend.lib.macro,
  org.eclipse.elk.core;bundle-version="0.7.0",
  org.eclipse.elk.alg.layered;bundle-version="0.7.0",
  org.eclipse.core.resources;bundle-version="3.13.900",

org.lflang.diagram/pom.xml

@@ -28,10 +28,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.eclipse.xtend</groupId>
-				<artifactId>xtend-maven-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.jetbrains.kotlin</groupId>
 				<artifactId>kotlin-maven-plugin</artifactId>

org.lflang.diagram/src/org/lflang/diagram/synthesis/styles/ReactorFigureComponents.java

@@ -27,11 +27,9 @@
 import de.cau.cs.kieler.klighd.krendering.KContainerRendering;
 import de.cau.cs.kieler.klighd.krendering.KRendering;
 import java.util.List;
-import org.eclipse.xtend.lib.annotations.Data;
 import org.eclipse.xtext.xbase.lib.Pure;
 import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
 
-@Data
 public class ReactorFigureComponents {
     private final KContainerRendering outer;
 

org.lflang.ide/pom.xml

@@ -27,10 +27,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.eclipse.xtend</groupId>
-                <artifactId>xtend-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>

org.lflang.product/pom.xml

@@ -28,10 +28,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.eclipse.xtend</groupId>
-				<artifactId>xtend-maven-plugin</artifactId>
-			</plugin>
 		</plugins>
 	</build>
 </project>

org.lflang.tests/build.gradle

@@ -34,11 +34,10 @@ jacocoTestReport {
                         'org/lflang/parser/antlr/**'
                     ]
     def mainCls = fileTree(dir: "$project.buildDir/../../org.lflang/build/classes/java/main", excludes: fileFilter)
-    def mainSrc =  "$project.buildDir/../../org.lflang/xtend-gen"
     def javaSrc = "$project.buildDir/../../org.lflang/src"
 
     classDirectories.from = files(mainCls)
-    sourceDirectories.from = files([mainSrc, javaSrc])
+    sourceDirectories.from = files([javaSrc])
 }
 
 test {

org.lflang.tests/pom.xml

@@ -34,11 +34,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.eclipse.xtend</groupId>
-                <artifactId>xtend-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>

org.lflang.ui.tests/pom.xml

@@ -26,11 +26,6 @@
 	  </execution>
 	</executions>
       </plugin>
-
-      <plugin>
-	<groupId>org.eclipse.xtend</groupId>
-	<artifactId>xtend-maven-plugin</artifactId>
-      </plugin>
         <plugin>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-maven-plugin</artifactId>

org.lflang.ui/META-INF/MANIFEST.MF

@@ -17,7 +17,6 @@ Require-Bundle: org.lflang,
  org.eclipse.compare,
  org.eclipse.xtext.builder,
  org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",
- org.eclipse.xtend.lib;bundle-version="2.26.0";resolution:=optional,
  org.eclipse.ui.intro,
  org.eclipse.ui.intro.universal,
  org.eclipse.ui.console;bundle-version="3.10.100",

org.lflang.ui/pom.xml

@@ -26,10 +26,6 @@
 	    <phase>clean</phase>
 	  </execution>
 	</executions>
-      </plugin>
-      <plugin>
-	<groupId>org.eclipse.xtend</groupId>
-	<artifactId>xtend-maven-plugin</artifactId>
       </plugin>
         <plugin>
             <groupId>org.jetbrains.kotlin</groupId>

org.lflang/.classpath

@@ -8,6 +8,5 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="src" path="xtend-gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

org.lflang/META-INF/MANIFEST.MF

@@ -13,10 +13,8 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",
  org.eclipse.xtext.util,
  org.eclipse.emf.common,
- org.eclipse.xtend.lib;bundle-version="2.26.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  com.google.guava,
- org.eclipse.xtend.lib.macro,
  org.apache.commons.cli;bundle-version="1.4",
  org.jetbrains.kotlin.bundled-compiler;resolution:=optional,
  org.eclipse.lsp4j;bundle-version="0.12.0",

org.lflang/build.properties

@@ -1,6 +1,5 @@
 source.. = src/,\
-           src-gen/,\
-           xtend-gen/
+           src-gen/
 bin.includes = model/generated/,\
                .,\
                META-INF/,\

org.lflang/pom.xml

@@ -87,10 +87,6 @@
                     </dependency>
                 </dependencies>
             </plugin>
-            <plugin>
-                <groupId>org.eclipse.xtend</groupId>
-                <artifactId>xtend-maven-plugin</artifactId>
-            </plugin>
             <!-- Cleanup files duplicated by Xtext. -->
             <!-- Currently we don't need to delete any generated files because
                  we use the Java/Xtend implementations. However, if we commit

org.lflang/src/org/lflang/federated/launcher/FedLauncher.java

@@ -33,7 +33,6 @@
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
-import org.eclipse.xtend2.lib.StringConcatenation;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;

pom.xml

@@ -101,26 +101,6 @@
                 <!-- xtend-maven-plugin is in pluginManagement instead of in plugins
                      so that it doesn't run before the exec-maven-plugin's *.mwe2 gen; this way
                      we can list it after. -->
-                <plugin>
-                    <groupId>org.eclipse.xtend</groupId>
-                    <artifactId>xtend-maven-plugin</artifactId>
-                    <version>${xtextVersion}</version>
-                    <executions>
-                        <execution>
-                            <id>generate-xtend</id>
-                            <phase>generate-sources</phase>
-                            <goals>
-                                <goal>compile</goal>
-                                <goal>xtend-install-debug-info</goal>
-                                <goal>testCompile</goal>
-                                <goal>xtend-test-install-debug-info</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                    <configuration>
-                        <outputDirectory>xtend-gen</outputDirectory>
-                    </configuration>
-                </plugin>
 
                 <plugin>
                     <groupId>org.jetbrains.kotlin</groupId>