Check for min java version when updating (partial)

Author: ia3andy

devtools/cli/src/main/java/io/quarkus/cli/CreateApp.java

@@ -12,7 +12,7 @@
 import io.quarkus.cli.create.TargetGAVGroup;
 import io.quarkus.cli.create.TargetLanguageGroup;
 import io.quarkus.devtools.commands.CreateProject.CreateProjectKey;
-import io.quarkus.devtools.commands.SourceType;
+import io.quarkus.devtools.project.SourceType;
 import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
 import io.quarkus.devtools.commands.handlers.CreateJBangProjectCommandHandler;
 import io.quarkus.devtools.commands.handlers.CreateProjectCommandHandler;

devtools/cli/src/main/java/io/quarkus/cli/CreateCli.java

@@ -12,7 +12,7 @@
 import io.quarkus.cli.create.TargetGAVGroup;
 import io.quarkus.cli.create.TargetLanguageGroup;
 import io.quarkus.devtools.commands.CreateProject.CreateProjectKey;
-import io.quarkus.devtools.commands.SourceType;
+import io.quarkus.devtools.project.SourceType;
 import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
 import io.quarkus.devtools.commands.handlers.CreateJBangProjectCommandHandler;
 import io.quarkus.devtools.commands.handlers.CreateProjectCommandHandler;

devtools/cli/src/main/java/io/quarkus/cli/create/BaseCreateCommand.java

@@ -1,6 +1,6 @@
 package io.quarkus.cli.create;
 
-import static io.quarkus.devtools.commands.CreateProjectHelper.computeJavaVersion;
+import static io.quarkus.devtools.project.JavaVersion.computeJavaVersion;
 
 import java.nio.file.Path;
 import java.util.Collection;
@@ -17,7 +17,7 @@
 import io.quarkus.cli.registry.ToggleRegistryClientMixin;
 import io.quarkus.devtools.commands.CreateProject.CreateProjectKey;
 import io.quarkus.devtools.commands.CreateProjectHelper;
-import io.quarkus.devtools.commands.SourceType;
+import io.quarkus.devtools.project.SourceType;
 import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
 import io.quarkus.devtools.project.BuildTool;
 import io.quarkus.devtools.project.QuarkusProject;

devtools/cli/src/main/java/io/quarkus/cli/create/TargetLanguageGroup.java

@@ -5,9 +5,9 @@
 import java.util.stream.Collectors;
 
 import io.quarkus.cli.common.OutputOptionMixin;
-import io.quarkus.devtools.commands.CreateProjectHelper;
-import io.quarkus.devtools.commands.SourceType;
+import io.quarkus.devtools.project.SourceType;
 import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.JavaVersion;
 import picocli.CommandLine;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.ParameterException;
@@ -17,13 +17,13 @@ public class TargetLanguageGroup {
 
     static class VersionCandidates extends ArrayList<String> {
         VersionCandidates() {
-            super(CreateProjectHelper.JAVA_VERSIONS_LTS.stream().map(String::valueOf).collect(Collectors.toList()));
+            super(JavaVersion.JAVA_VERSIONS_LTS.stream().map(String::valueOf).collect(Collectors.toList()));
         }
     }
 
     @CommandLine.Option(names = {
-            "--java" }, description = "Target Java version.\n  Valid values: ${COMPLETION-CANDIDATES}", completionCandidates = VersionCandidates.class, defaultValue = CreateProjectHelper.DETECT_JAVA_RUNTIME_VERSION)
-    String javaVersion = CreateProjectHelper.DETECT_JAVA_RUNTIME_VERSION;
+            "--java" }, description = "Target Java version.\n  Valid values: ${COMPLETION-CANDIDATES}", completionCandidates = VersionCandidates.class, defaultValue = JavaVersion.DETECT_JAVA_RUNTIME_VERSION)
+    String javaVersion = JavaVersion.DETECT_JAVA_RUNTIME_VERSION;
 
     @CommandLine.Option(names = { "--kotlin" }, description = "Use Kotlin")
     boolean kotlin = false;

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusPlatformTask.java

@@ -15,9 +15,12 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.tasks.TaskCollection;
+import org.gradle.api.tasks.compile.JavaCompile;
 
 import io.quarkus.bootstrap.BootstrapConstants;
 import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.devtools.project.JavaVersion;
 import io.quarkus.devtools.project.QuarkusProject;
 import io.quarkus.devtools.project.QuarkusProjectHelper;
 import io.quarkus.devtools.project.buildfile.BuildFile;
@@ -118,7 +121,6 @@ protected String quarkusCoreVersion() {
     }
 
     protected QuarkusProject getQuarkusProject(boolean limitExtensionsToImportedPlatforms) {
-
         final GradleMessageWriter log = messageWriter();
         final ExtensionCatalog catalog = extensionsCatalog(limitExtensionsToImportedPlatforms, log);
 
@@ -136,7 +138,17 @@ protected QuarkusProject getQuarkusProject(boolean limitExtensionsToImportedPlat
             throw new GradleException(
                     "Mixed DSL is not supported. Both build and settings file need to use either Kotlin or Groovy DSL");
         }
-        return QuarkusProjectHelper.getProject(getProject().getProjectDir().toPath(), catalog, buildFile, log);
+        final JavaVersion javaVersion = resolveProjectJavaVersion();
+        return QuarkusProjectHelper.getProject(getProject().getProjectDir().toPath(), catalog, buildFile, javaVersion, log);
+    }
+
+    private JavaVersion resolveProjectJavaVersion() {
+        TaskCollection<JavaCompile> compileTasks = getProject().getTasks().withType(JavaCompile.class);
+        if (compileTasks.isEmpty()) {
+            return JavaVersion.NA;
+        }
+        final JavaCompile task = compileTasks.iterator().next();
+        return new JavaVersion(task.getTargetCompatibility());
     }
 
     protected GradleMessageWriter messageWriter() {

devtools/maven/src/main/java/io/quarkus/maven/CreateJBangMojo.java

@@ -26,6 +26,7 @@
 import io.quarkus.devtools.commands.data.QuarkusCommandException;
 import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.JavaVersion;
 import io.quarkus.devtools.project.QuarkusProject;
 import io.quarkus.devtools.project.QuarkusProjectHelper;
 import io.quarkus.maven.utilities.MojoUtils;
@@ -117,7 +118,7 @@ public void execute() throws MojoExecutionException {
                 .artifactResolver(mvn)
                 .build();
         final CreateJBangProject createJBangProject = new CreateJBangProject(QuarkusProject.of(projectDirPath, catalog,
-                codestartsResourceLoader, log, BuildTool.MAVEN))
+                codestartsResourceLoader, log, BuildTool.MAVEN, new JavaVersion(javaVersion)))
                 .extensions(extensions)
                 .javaVersion(javaVersion)
                 .setValue(NO_JBANG_WRAPPER, noJBangWrapper);

devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java

@@ -37,6 +37,7 @@
 import io.quarkus.devtools.commands.CreateProjectHelper;
 import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.JavaVersion;
 import io.quarkus.devtools.project.QuarkusProject;
 import io.quarkus.devtools.project.QuarkusProjectHelper;
 import io.quarkus.maven.components.MavenVersionEnforcer;
@@ -297,7 +298,7 @@ public void execute() throws MojoExecutionException {
                     .artifactResolver(mvn)
                     .build();
             QuarkusProject newProject = QuarkusProject.of(projectDirPath, catalog,
-                    codestartsResourceLoader, log, buildToolEnum);
+                    codestartsResourceLoader, log, buildToolEnum, new JavaVersion(javaVersion, javaVersion));
             final CreateProject createProject = new CreateProject(newProject)
                     .groupId(projectGroupId)
                     .artifactId(projectArtifactId)

devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectMojoBase.java

@@ -29,6 +29,7 @@
 import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
 import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.JavaVersion;
 import io.quarkus.devtools.project.QuarkusProject;
 import io.quarkus.devtools.project.QuarkusProjectHelper;
 import io.quarkus.devtools.project.buildfile.MavenProjectBuildFile;
@@ -106,7 +107,7 @@ public void execute() throws MojoExecutionException {
             final List<ResourceLoader> codestartsResourceLoader = getCodestartResourceLoaders(resolveExtensionCatalog());
             quarkusProject = QuarkusProject.of(baseDir(), resolveExtensionCatalog(),
                     codestartsResourceLoader,
-                    log, buildTool);
+                    log, buildTool, JavaVersion.NA);
         }
 
         doExecute(quarkusProject, getMessageWriter());

independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartProjectInputBuilder.java

@@ -9,8 +9,8 @@
 import io.quarkus.devtools.codestarts.CodestartProjectInputBuilder;
 import io.quarkus.devtools.codestarts.DataKey;
 import io.quarkus.devtools.codestarts.utils.NestedMaps;
-import io.quarkus.devtools.commands.CreateProjectHelper;
 import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.devtools.project.JavaVersion;
 import io.quarkus.devtools.project.extensions.Extensions;
 import io.quarkus.maven.dependency.ArtifactCoords;
 import io.quarkus.maven.dependency.ArtifactKey;
@@ -86,7 +86,7 @@ public boolean noJBangWrapper() {
     public QuarkusJBangCodestartProjectInput build() {
         if (!this.containsData("java")) {
             this.addData(NestedMaps
-                    .unflatten(Map.of("java.version", String.valueOf(CreateProjectHelper.determineBestJavaLtsVersion()))));
+                    .unflatten(Map.of("java.version", String.valueOf(JavaVersion.determineBestJavaLtsVersion()))));
         }
         return new QuarkusJBangCodestartProjectInput(this);
     }

independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateJBangProject.java

@@ -1,6 +1,6 @@
 package io.quarkus.devtools.commands;
 
-import static io.quarkus.devtools.commands.CreateProjectHelper.computeJavaVersion;
+import static io.quarkus.devtools.project.JavaVersion.computeJavaVersion;
 import static java.util.Objects.requireNonNull;
 
 import java.util.HashMap;
@@ -14,6 +14,7 @@
 import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
 import io.quarkus.devtools.commands.handlers.CreateJBangProjectCommandHandler;
 import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.SourceType;
 
 public class CreateJBangProject {
     public interface CreateJBangProjectKey {