Fix: build.gradle file

microsoft · Jul 22, 2024 · 722406a · 722406a
1 parent 7446361
commit 722406a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/extension/build.gradle b/extension/build.gradle
@@ -225,11 +225,10 @@ task buildBuildServer(type: CrossPlatformExec) {
   }
 }
 
-task copyBuildServerJars(type: Copy) {
+task copyBuildServerPluginJars(type: Copy) {
   dependsOn ':extension:buildBuildServer'
   from('./build-server-for-gradle/server/build/libs/') {
-    include '**/*.jar'
-    include '**/init.gradle'
+    include 'plugins/'
   }
   into 'server'
   mustRunAfter copyDocs
@@ -239,15 +238,15 @@ task copyBuildServerJars(type: Copy) {
 task copyBuildServerJarsToGradleServer(type: Copy) {
   dependsOn ':extension:buildBuildServer'
   from('./build-server-for-gradle/server/build/libs/') {
-    include '**/*.jar'
-    include '**/init.gradle'
+    include 'runtime/'
   }
+  from('./build-server-for-gradle/server/build/libs/server.jar')
   into '../gradle-server/build/libs/'
   mustRunAfter copyDocs
 }
 
 task buildJars() {
-  dependsOn copyJdtlsPluginJar, copyBuildServerJars, copyBuildServerJarsToGradleServer
+  dependsOn copyJdtlsPluginJar, copyBuildServerPluginJars, copyBuildServerJarsToGradleServer
 }
 
 build.finalizedBy buildProd, buildTest
diff --git a/extension/src/util/config.ts b/extension/src/util/config.ts
@@ -50,9 +50,9 @@ export async function findValidJavaHome(): Promise<string | undefined> {
 
     // Search valid JDKs from env.JAVA_HOME, env.PATH, SDKMAN, jEnv, jabba, common directories
     const javaRuntimes = await listJdks();
-    const validJdks = javaRuntimes.filter((r) => r.version!.major >= REQUIRED_JDK_VERSION);
-    if (validJdks.length > 0) {
-        return validJdks[0].homedir;
+    const validJdks = javaRuntimes.find((r) => r.version!.major >= REQUIRED_JDK_VERSION);
+    if (validJdks !== undefined) {
+        return validJdks.homedir;
     }
 
     // Search java.configuration.runtimes if still not found

diff --git a/gradle-server/build.gradle b/gradle-server/build.gradle
@@ -14,7 +14,6 @@ dependencies {
   implementation project(":gradle-plugin-api")
   implementation files('build/libs/server.jar')
   implementation fileTree(dir: 'build/libs/runtime', include: ['*.jar'], exclude: ['gradle-tooling-api-*.jar', 'slf4j-api-*.jar'])
-  implementation fileTree(dir: 'build/libs/plugins', include: ['*.jar'])
   implementation("org.gradle:gradle-tooling-api:${toolingAPIVersion}")
   implementation 'javax.annotation:javax.annotation-api:1.3.2'
   implementation "io.grpc:grpc-protobuf:${grpcVersion}"