From d022f20551e7a4fbb409dfb10c4f35778ba87183 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Tue, 7 Sep 2021 14:33:47 +0200
Subject: [PATCH 1/2] Set Kotlin JVM target to 11 for Maven

---
 .../quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml
index 034755124e4b7..e4b6c73d62bc7 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml
@@ -40,7 +40,7 @@
                 </executions>
                 <configuration>
                     <javaParameters>true</javaParameters>
-                    <jvmTarget>1.8</jvmTarget>
+                    <jvmTarget>11</jvmTarget>
                     <!-- Soon to be replaced by plugin that will pre-configure all necessary annotations -->
                     <compilerPlugins>
                         <plugin>all-open</plugin>
@@ -64,4 +64,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

From 2c227722bb898e239f0cc818f66cb50674c3ff34 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Tue, 7 Sep 2021 14:34:05 +0200
Subject: [PATCH 2/2] Do not set Kotlin JVM target to 1.8 for JDK 11+

---
 .../quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle
index 687990707f197..2a7e4b6591428 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle
@@ -15,18 +15,10 @@ allOpen {
 }
 
 compileKotlin {
-    {#if java.version == "11"}
     kotlinOptions.jvmTarget = JavaVersion.VERSION_11
-    {#else}
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8
-    {/if}
     kotlinOptions.javaParameters = true
 }
 
 compileTestKotlin {
-    {#if java.version == "11"}
     kotlinOptions.jvmTarget = JavaVersion.VERSION_11
-    {#else}
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8
-    {/if}
 }