fix - Correct the gradle java version to jdt parsing (#1590)

microsoft · Aug 26, 2024 · 4038148 · 4038148
1 parent 55e3b96
commit 4038148
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/...radle.bs.importer/src/com/microsoft/gradle/bs/importer/GradleBuildServerBuildSupport.java b/...radle.bs.importer/src/com/microsoft/gradle/bs/importer/GradleBuildServerBuildSupport.java
@@ -595,12 +595,23 @@ private JvmBuildTargetEx getJvmTarget(List<BuildTarget> buildTargets) throws Cor
     /**
      * Some legacy Gradle (e.g. v6) uses "1.9" and "1.10" to represent Java 9 and 10.
      * We do a conversion here to make it compatible with Eclipse.
+     *
+     * Meanwhile, Gradle allows to set java version to 7, 8, etc...
+     * We also need to convert them to Eclipse compatible version.
      */
     private String getEclipseCompatibleVersion(String javaVersion) {
-        if ("1.9".equals(javaVersion)) {
-            return "9";
+        if ("5".equals(javaVersion)) {
+            return JavaCore.VERSION_1_5;
+        } else if ("6".equals(javaVersion)) {
+            return JavaCore.VERSION_1_6;
+        } else if ("7".equals(javaVersion)) {
+            return JavaCore.VERSION_1_7;
+        } else if ("8".equals(javaVersion)) {
+            return JavaCore.VERSION_1_8;
+        } else if ("1.9".equals(javaVersion)) {
+            return JavaCore.VERSION_9;
         } else if ("1.10".equals(javaVersion)) {
-            return "10";
+            return JavaCore.VERSION_10;
         }
 
         return javaVersion;