fix - Add java 22 to compatibility matrix (#1505)

microsoft · Jun 21, 2024 · 72e228c · 72e228c
1 parent 1185a1f
commit 72e228c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
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
@@ -660,7 +660,9 @@ private List<IClasspathEntry> getDependencyJars(DependencyModulesResult dependen
      */
     private String getHighestCompatibleJavaVersion(String gradleVersion) {
       GradleVersion version = GradleVersion.version(gradleVersion);
-      if (version.compareTo(GradleVersion.version("8.5")) >= 0) {
+      if (version.compareTo(GradleVersion.version("8.8")) >= 0) {
+        return JavaCore.VERSION_22;
+      } else if (version.compareTo(GradleVersion.version("8.5")) >= 0) {
         return JavaCore.VERSION_21;
       } else if (version.compareTo(GradleVersion.version("8.3")) >= 0) {
         return JavaCore.VERSION_20;

diff --git a/...le.bs.importer/src/com/microsoft/gradle/bs/importer/GradleBuildServerProjectImporter.java b/...le.bs.importer/src/com/microsoft/gradle/bs/importer/GradleBuildServerProjectImporter.java
@@ -321,6 +321,9 @@ private void updateProjectDescription(IProject project, IProgressMonitor monitor
         // because that API will ignore the variable descriptions.
         if (project instanceof Project internalProject) {
             ProjectDescription description = internalProject.internalGetDescription();
+            if (description == null) {
+                return;
+            }
             VariableDescription variableDescription = new VariableDescription(SCHEMA_VERSION_KEY, SCHEMA_VERSION);
             boolean changed = description.setVariableDescription(SCHEMA_VERSION_KEY, variableDescription);
             if (changed) {