Merge pull request #37051 from gsmet/use-java-version-gradle

Use dynamically resolved Java version when creating Gradle projects
quarkusio · Nov 14, 2023 · c570268 · c570268
2 parents 6dc3b1b + 20d40b1
commit c570268
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 28 deletions.
diff --git a/...n/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/base/build-layout.include.qute b/...n/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/base/build-layout.include.qute
@@ -50,13 +50,8 @@ version = "{project.version}"
 
 {#insert java}
 java {
- {#if java.version == "17"}
- sourceCompatibility = JavaVersion.VERSION_17
- targetCompatibility = JavaVersion.VERSION_17
- {#else}
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
- {/if}
+ sourceCompatibility = JavaVersion.VERSION_{java.version}
+ targetCompatibility = JavaVersion.VERSION_{java.version}
 }
 {/}
 

diff --git a/.../resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/scala/build.tpl.qute.gradle.kts b/.../resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/scala/build.tpl.qute.gradle.kts
@@ -9,11 +9,6 @@ plugins {
 
 tasks.withType<ScalaCompile> {
  scalaCompileOptions.encoding = "UTF-8"
- {#if java.version == "11"}
- sourceCompatibility = JavaVersion.VERSION_11.toString()
- targetCompatibility = JavaVersion.VERSION_11.toString()
- {#else}
- sourceCompatibility = JavaVersion.VERSION_1_8.toString()
- targetCompatibility = JavaVersion.VERSION_1_8.toString()
- {/if}
+ sourceCompatibility = JavaVersion.VERSION_{java.version}.toString()
+ targetCompatibility = JavaVersion.VERSION_{java.version}.toString()
 }
diff --git a/...rts/src/main/resources/codestarts/quarkus/buildtool/gradle/base/build-layout.include.qute b/...rts/src/main/resources/codestarts/quarkus/buildtool/gradle/base/build-layout.include.qute
@@ -46,13 +46,8 @@ version '{project.version}'
 
 {#insert java}
 java {
- {#if java.version == "17"}
- sourceCompatibility = JavaVersion.VERSION_17
- targetCompatibility = JavaVersion.VERSION_17
- {#else}
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
- {/if}
+ sourceCompatibility = JavaVersion.VERSION_{java.version}
+ targetCompatibility = JavaVersion.VERSION_{java.version}
 }
 {/}
 

diff --git a/...starts/src/main/resources/codestarts/quarkus/buildtool/gradle/scala/build.tpl.qute.gradle b/...starts/src/main/resources/codestarts/quarkus/buildtool/gradle/scala/build.tpl.qute.gradle
@@ -9,11 +9,6 @@ plugins {
 
 compileScala {
  scalaCompileOptions.encoding = 'UTF-8'
- {#if java.version == "11"}
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
- {#else}
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
- {/if}
+ sourceCompatibility = JavaVersion.VERSION_{java.version}
+ targetCompatibility = JavaVersion.VERSION_{java.version}
 }
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java
@@ -494,6 +494,24 @@ public void testProjectGenerationFromScratchWithJava17() throws MavenInvocationE
  .contains("maven.compiler.release>17<");
  }
 
+ @Test
+ public void testProjectGenerationFromScratchWithJava21() throws MavenInvocationException, IOException {
+ testDir = initEmptyProject("projects/project-generation-with-java21");
+ assertThat(testDir).isDirectory();
+ invoker = initInvoker(testDir);
+
+ Properties properties = new Properties();
+ properties.put("javaVersion", "21");
+
+ InvocationResult result = setup(properties);
+ assertThat(result.getExitCode()).isZero();
+
+ testDir = new File(testDir, "code-with-quarkus");
+ assertThat(new File(testDir, "pom.xml")).isFile();
+ assertThat(FileUtils.readFileToString(new File(testDir, "pom.xml"), "UTF-8"))
+ .contains("maven.compiler.release>21<");
+ }
+
  @Test
  public void testProjectGenerationFromScratchWithGradleJava11() throws MavenInvocationException, IOException {
  testDir = initEmptyProject("projects/project-generation-with-gradle-java11");
@@ -532,6 +550,25 @@ public void testProjectGenerationFromScratchWithGradleJava17() throws MavenInvoc
  .contains("sourceCompatibility = JavaVersion.VERSION_17");
  }
 
+ @Test
+ public void testProjectGenerationFromScratchWithGradleJava21() throws MavenInvocationException, IOException {
+ testDir = initEmptyProject("projects/project-generation-with-gradle-java21");
+ assertThat(testDir).isDirectory();
+ invoker = initInvoker(testDir);
+
+ Properties properties = new Properties();
+ properties.put("javaVersion", "21");
+ properties.put("buildTool", "gradle");
+
+ InvocationResult result = setup(properties);
+ assertThat(result.getExitCode()).isZero();
+
+ testDir = new File(testDir, "code-with-quarkus");
+ assertThat(new File(testDir, "build.gradle")).isFile();
+ assertThat(FileUtils.readFileToString(new File(testDir, "build.gradle"), "UTF-8"))
+ .contains("sourceCompatibility = JavaVersion.VERSION_21");
+ }
+
  /**
  * Reproducer for https://github.com/quarkusio/quarkus/issues/671
  */