diff --git a/build.gradle b/build.gradle
index 6a98ba7165..fe3b8fca21 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,13 +48,11 @@ subprojects {
         implementation group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlinVersion
     }
 
-
-    apply plugin: 'org.xtext.xtend'
     apply from: "${rootDir}/gradle/source-layout.gradle"
     apply plugin: 'eclipse'
 
     // generate xtend sources before kotlin compilation
-    compileKotlin.dependsOn("generateXtext")
+    compileKotlin.dependsOn(":org.lflang:generateXtextLanguage")
 
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
diff --git a/gradle/source-layout.gradle b/gradle/source-layout.gradle
index 9bbe4b3944..4c7d5f74c4 100644
--- a/gradle/source-layout.gradle
+++ b/gradle/source-layout.gradle
@@ -9,7 +9,6 @@ if (name.endsWith(".tests")) {
 			java.srcDirs = ['src', 'src-gen']
 			kotlin.srcDirs = ['src', 'src-gen']
 			resources.srcDirs = ['src', 'src-gen']
-			xtendOutputDir = 'xtend-gen'
 		}
 	}
 } else {
@@ -17,7 +16,6 @@ if (name.endsWith(".tests")) {
 		main {
 			java.srcDirs = ['src', 'src-gen']
 			kotlin.srcDirs = ['src', 'src-gen']
-			xtendOutputDir = 'xtend-gen'
 			resources {
 				srcDirs = ['src', 'src-gen']
 				exclude 'src/lib/rs/reactor-rust' // rust runtime does not need to be packed here.
@@ -31,7 +29,7 @@ if (name.endsWith(".tests")) {
 }
 
 sourceSets.all {
-	resources.exclude '**/*.g', '**/*.mwe2', '**/*.xtend', '**/*._trace'
+	resources.exclude '**/*.g', '**/*.mwe2', '**/*._trace'
 }
 
 jar {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c284eb8a80..61227331ef 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
-distributionSha256Sum=6147605a23b4eff6c334927a86ff3508cb5d6722cd624c97ded4c2e8640f1f87
+distributionUrl=https://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/org.lflang.tests/build.gradle b/org.lflang.tests/build.gradle
index 020a3a8395..97f664c1a8 100644
--- a/org.lflang.tests/build.gradle
+++ b/org.lflang.tests/build.gradle
@@ -21,17 +21,16 @@ apply plugin: 'jacoco'
 
 jacoco {
     toolVersion = jacocoVersion
-    reportsDir = file("$buildDir/reports/jacoco") //default directory where jacoco generates test reports
+    reportsDirectory = file("$buildDir/reports/jacoco") //default directory where jacoco generates test reports
 }
 
 
 jacocoTestReport {
     reports {
-        xml.enabled true
-        csv.enabled true
+        xml.required = true
+        csv.required = false
         html.destination file("${buildDir}/reports/html/jacoco")
         xml.destination file("${buildDir}/reports/xml/jacoco")
-        csv.destination file("${buildDir}/reports/csv/jacoco")
     }
     def fileFilter = [  'org/lflang/services/**', 
                         'org/lflang/linguaFranca/impl/**', 
diff --git a/org.lflang/build.gradle b/org.lflang/build.gradle
index 9c6b9bf5d9..00410d16f5 100644
--- a/org.lflang/build.gradle
+++ b/org.lflang/build.gradle
@@ -81,7 +81,6 @@ task generateXtextLanguage(type: JavaExec) {
     }*/
 }
 processResources.dependsOn(generateXtextLanguage)
-generateXtext.dependsOn(generateXtextLanguage)
 clean.dependsOn(cleanGenerateXtextLanguage)
 eclipse.classpath.plusConfigurations += [configurations.mwe2]
 
@@ -239,7 +238,7 @@ task generateLanguageDiagramServer {
     }
 
     shadowJar {
-        classifier = 'lds'
+        archiveClassifier = 'lds'
         
         // Handling of service loader registrations via META-INF/services/*
         mergeServiceFiles()