From 5dd07de1885f15fbac6e622a9115d07c9e8d83e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 5 Feb 2022 15:16:17 +0100
Subject: [PATCH 1/3] Update kotlin version

---
 build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.gradle b/build.gradle
index f11be29183..f3451a2536 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,7 @@ plugins {
     id "com.github.johnrengelman.shadow" version "${shadowJarVersion}"
     id 'java'
     id 'jacoco'
+    id 'org.jetbrains.kotlin.jvm' version '1.5.31'
 }
 
 subprojects {
@@ -26,6 +27,7 @@ subprojects {
             jvmTarget = kotlinJvmTarget
         }
     }
+    kotlinVersion = '1.5.31' // sync with version in plugin block above
 
     dependencies {
         implementation platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}")

From 55bd5a659f4791a70d980fe3758a1feefb4c2620 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 7 Feb 2022 13:41:19 +0100
Subject: [PATCH 2/3] use kotlin version specified in gradle.properties

---
 build.gradle      | 2 +-
 gradle.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index f3451a2536..1d7626c58c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ plugins {
     id "com.github.johnrengelman.shadow" version "${shadowJarVersion}"
     id 'java'
     id 'jacoco'
-    id 'org.jetbrains.kotlin.jvm' version '1.5.31'
+    id 'org.jetbrains.kotlin.jvm' version "${kotlinVersion}"
 }
 
 subprojects {
diff --git a/gradle.properties b/gradle.properties
index 4754184f83..175e9efc6a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@ jupiterVersion=5.8.2
 jUnitPlatformVersion=1.8.2
 jUnitVersion=4.13.2
 kotlinJvmTarget=11
-kotlinVersion=1.4.30
+kotlinVersion=1.5.31
 lsp4jVersion=0.12.0
 mwe2LaunchVersion=2.12.1
 openTest4jVersion=1.2.0

From ff9d7ba0ea804e0896be52ba39daad76f6ea9fe6 Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 7 Feb 2022 13:42:51 +0100
Subject: [PATCH 3/3] remove stray version assignment

---
 build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1d7626c58c..4f728811c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,6 @@ subprojects {
             jvmTarget = kotlinJvmTarget
         }
     }
-    kotlinVersion = '1.5.31' // sync with version in plugin block above
 
     dependencies {
         implementation platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}")