Adapt to new bsp4j API

Author: DavidGregory084

plugin/build.gradle.kts

@@ -2,7 +2,6 @@ plugins {
     `java-gradle-plugin`
     `jacoco-report-aggregation`
     alias(libs.plugins.gradleJavaConventions)
-    // TODO: remove this once https://github.com/gradle/gradle/issues/17559 is fixed
     alias(libs.plugins.gradleBuildInfo)
 }
 

server/src/main/java/com/opencastsoftware/gradle/bsp/server/GradleBspServer.java

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText:  © 2023 Opencast Software Europe Ltd <https://opencastsoftware.com>
+ * SPDX-FileCopyrightText:  © 2023-2024 Opencast Software Europe Ltd <https://opencastsoftware.com>
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.opencastsoftware.gradle.bsp.server;
@@ -489,7 +489,7 @@ String[] getCleanTasksFrom(List<URI> targetUris) {
     @Override
     public CompletableFuture<CleanCacheResult> buildTargetCleanCache(CleanCacheParams params) {
         return ifInitializedAsync(cancelToken -> {
-            var cleanResult = new CleanCacheResult(null, Boolean.TRUE);
+            var cleanResult = new CleanCacheResult(Boolean.TRUE);
 
             var targetUris = getTargetUris(params);
             var targetCleanTasks = getCleanTasksFrom(targetUris);
@@ -509,7 +509,6 @@ public CompletableFuture<CleanCacheResult> buildTargetCleanCache(CleanCacheParam
         });
     }
 
-    @Override
     public void onConnectWithClient(BuildClient client) {
         this.client = client;
     }

server/src/main/java/com/opencastsoftware/gradle/bsp/server/util/Conversions.java

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText:  © 2023 Opencast Software Europe Ltd <https://opencastsoftware.com>
+ * SPDX-FileCopyrightText:  © 2023-2024 Opencast Software Europe Ltd <https://opencastsoftware.com>
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.opencastsoftware.gradle.bsp.server.util;
@@ -19,12 +19,12 @@ public static BuildTargetIdentifier toBspBuildTargetId(BspBuildTargetId targetId
     }
 
     public static BuildTargetCapabilities toBspBuildTargetCapabilities(BspBuildTargetCapabilities capabilities) {
-        return new BuildTargetCapabilities(
-                capabilities.canCompile(),
-                capabilities.canTest(),
-                capabilities.canRun(),
-                capabilities.canDebug()
-        );
+        var bspCapabilities = new BuildTargetCapabilities();
+        bspCapabilities.setCanCompile(capabilities.canCompile());
+        bspCapabilities.setCanTest(capabilities.canTest());
+        bspCapabilities.setCanRun(capabilities.canRun());
+        bspCapabilities.setCanDebug(capabilities.canDebug());
+        return bspCapabilities;
     }
 
     public static BuildTarget toBspBuildTarget(BspBuildTarget buildTarget) {
@@ -67,9 +67,12 @@ public static BuildTarget toBspBuildTarget(BspBuildTarget buildTarget) {
 
     public static JvmBuildTarget toBspJvmBuildTarget(Serializable data) {
         try {
+            var bspJvmBuildTarget = new JvmBuildTarget();
             var javaHomeMethod = data.getClass().getDeclaredMethod("javaHome");
             var javaVersionMethod = data.getClass().getDeclaredMethod("javaVersion");
-            return new JvmBuildTarget(javaHomeMethod.invoke(data).toString(), (String) javaVersionMethod.invoke(data));
+            bspJvmBuildTarget.setJavaHome(javaHomeMethod.invoke(data).toString());
+            bspJvmBuildTarget.setJavaVersion((String) javaVersionMethod.invoke(data));
+            return bspJvmBuildTarget;
         } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
             return null;
         }