diff --git a/XtendFormatterEclipse.xml b/XtendFormatterEclipse.xml deleted file mode 100644 index 5fdf68aaa3..0000000000 --- a/XtendFormatterEclipse.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build.gradle b/build.gradle index f11be29183..ae2f3e300b 100644 --- a/build.gradle +++ b/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/" } } diff --git a/gradle.properties b/gradle.properties index 70820d2ef8..0ebb300be2 100644 --- a/gradle.properties +++ b/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 diff --git a/gradle/source-layout.gradle b/gradle/source-layout.gradle index 286e96340e..3c7f4dd59c 100644 --- a/gradle/source-layout.gradle +++ b/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' } diff --git a/oomph/LinguaFranca.setup b/oomph/LinguaFranca.setup index 0dc74ae755..4b91d4c20c 100644 --- a/oomph/LinguaFranca.setup +++ b/oomph/LinguaFranca.setup @@ -103,18 +103,6 @@ key="/instance/org.eclipse.ui.ide/unassociatedEditorStrategy" value="org.eclipse.epp.internal.mpc.ui.askMarketPlace"/> - - - - eclipse-plugin Lingua Franca Diagrams - @@ -28,10 +27,6 @@ - - org.eclipse.xtend - xtend-maven-plugin - org.jetbrains.kotlin kotlin-maven-plugin diff --git a/org.lflang.diagram/src/org/lflang/diagram/synthesis/styles/ReactorFigureComponents.java b/org.lflang.diagram/src/org/lflang/diagram/synthesis/styles/ReactorFigureComponents.java index 33e3ca7ce0..a7ca735f29 100644 --- a/org.lflang.diagram/src/org/lflang/diagram/synthesis/styles/ReactorFigureComponents.java +++ b/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; diff --git a/org.lflang.ide/build.properties b/org.lflang.ide/build.properties index d438b563d0..1b7ea7ae5d 100644 --- a/org.lflang.ide/build.properties +++ b/org.lflang.ide/build.properties @@ -1,6 +1,5 @@ source.. = src/,\ - src-gen/,\ - xtend-gen/ + src-gen/ bin.includes = .,\ META-INF/,\ about.html diff --git a/org.lflang.ide/pom.xml b/org.lflang.ide/pom.xml index d404a1ee40..a05a0b5457 100644 --- a/org.lflang.ide/pom.xml +++ b/org.lflang.ide/pom.xml @@ -27,10 +27,6 @@ - - org.eclipse.xtend - xtend-maven-plugin - org.jetbrains.kotlin kotlin-maven-plugin diff --git a/org.lflang.product/pom.xml b/org.lflang.product/pom.xml index a9149b95a3..dbfda640a4 100644 --- a/org.lflang.product/pom.xml +++ b/org.lflang.product/pom.xml @@ -28,10 +28,6 @@ - - org.eclipse.xtend - xtend-maven-plugin - diff --git a/org.lflang.tests/build.gradle b/org.lflang.tests/build.gradle index df44eaa000..3f223ec5f5 100644 --- a/org.lflang.tests/build.gradle +++ b/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 { diff --git a/org.lflang.tests/pom.xml b/org.lflang.tests/pom.xml index 1aade6d310..3dde0113df 100644 --- a/org.lflang.tests/pom.xml +++ b/org.lflang.tests/pom.xml @@ -34,11 +34,6 @@ - - - org.eclipse.xtend - xtend-maven-plugin - org.jetbrains.kotlin kotlin-maven-plugin diff --git a/org.lflang.ui.tests/pom.xml b/org.lflang.ui.tests/pom.xml index f1caa38fac..5cf041f0ed 100644 --- a/org.lflang.ui.tests/pom.xml +++ b/org.lflang.ui.tests/pom.xml @@ -26,11 +26,6 @@ - - - org.eclipse.xtend - xtend-maven-plugin - org.jetbrains.kotlin kotlin-maven-plugin diff --git a/org.lflang.ui/META-INF/MANIFEST.MF b/org.lflang.ui/META-INF/MANIFEST.MF index bfe7ef6446..eced434e1c 100644 --- a/org.lflang.ui/META-INF/MANIFEST.MF +++ b/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", diff --git a/org.lflang.ui/pom.xml b/org.lflang.ui/pom.xml index 9ebcd21b5b..2b84eb8e54 100644 --- a/org.lflang.ui/pom.xml +++ b/org.lflang.ui/pom.xml @@ -26,10 +26,6 @@ clean - - - org.eclipse.xtend - xtend-maven-plugin org.jetbrains.kotlin diff --git a/org.lflang/.classpath b/org.lflang/.classpath index 08341d2d6a..dfa5bf5642 100644 --- a/org.lflang/.classpath +++ b/org.lflang/.classpath @@ -8,6 +8,5 @@ - diff --git a/org.lflang/META-INF/MANIFEST.MF b/org.lflang/META-INF/MANIFEST.MF index 4cde5ee9a6..1ae1e26090 100644 --- a/org.lflang/META-INF/MANIFEST.MF +++ b/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", diff --git a/org.lflang/build.properties b/org.lflang/build.properties index d279afa080..bf99418f2e 100644 --- a/org.lflang/build.properties +++ b/org.lflang/build.properties @@ -1,6 +1,5 @@ source.. = src/,\ - src-gen/,\ - xtend-gen/ + src-gen/ bin.includes = model/generated/,\ .,\ META-INF/,\ diff --git a/org.lflang/pom.xml b/org.lflang/pom.xml index 345932802c..f3cf71dca9 100644 --- a/org.lflang/pom.xml +++ b/org.lflang/pom.xml @@ -87,10 +87,6 @@ - - org.eclipse.xtend - xtend-maven-plugin - - - org.eclipse.xtend - xtend-maven-plugin - ${xtextVersion} - - - generate-xtend - generate-sources - - compile - xtend-install-debug-info - testCompile - xtend-test-install-debug-info - - - - - xtend-gen - - org.jetbrains.kotlin