Merge pull request #19964 from gsmet/kotlin-jvm-target

Fixes related to Kotlin JVM target
quarkusio · Sep 7, 2021 · a7f37cf · a7f37cf
2 parents 2602229 + 2c22772
commit a7f37cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/...tarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle b/...tarts/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}
 }
diff --git a/...-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml b/...-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>
+</project>