2 files changed, 8 insertions, 2 deletions

diff --git a/gradle/java-common.gradle b/gradle/java-common.gradle
index a070c378..daacecd3 100644
--- a/gradle/java-common.gradle
+++ b/gradle/java-common.gradle
@@ -5,8 +5,8 @@ repositories {
         }
 }
 
-sourceCompatibility = '11'
-targetCompatibility = '11'
+sourceCompatibility = '17'
+targetCompatibility = '17'
 
 tasks.named('jar') {
         manifest {
diff --git a/gradle/xtend.gradle b/gradle/xtend.gradle
index 900a95f2..8875465b 100644
--- a/gradle/xtend.gradle
+++ b/gradle/xtend.gradle
@@ -9,6 +9,12 @@ sourceSets {
         }
 }
 
+xtend.generator {
+        // As of Xtext 2.26.0.M2, the Xbase compiler doesn't know how to handle Java 12 and up
+        // and the build fails with a NullPointerException if such Java version is specified.
+        javaSourceLevel = '11'
+}
+
 tasks.named('clean') {
         delete 'src/main/xtend-gen'
         delete 'src/test/xtend-gen'