Merge pull request #246 from payara/copilot/support-custom-gradle-build-directory

Support custom Gradle build directory (`buildDir`)

Author: jGauravGupta

src/main/fish/payara/project/Gradle.ts

@@ -235,7 +235,14 @@ export class Gradle implements Build {
     }
 
     public getBuildDir(): string {
-        let buildDir = path.join(this.workspaceFolder.uri.fsPath, 'build', 'libs');
+        let buildDirValue = 'build';
+        if (this.buildReader instanceof GradleBuildReader) {
+            let customDir = this.buildReader.getBuildDirectory();
+            if (customDir.length > 0) {
+                buildDirValue = customDir;
+            }
+        }
+        let buildDir = path.resolve(this.workspaceFolder.uri.fsPath, buildDirValue, 'libs');
         if (!fs.existsSync(buildDir)) {
             throw Error("no build dir found: " + buildDir);
         }

src/main/fish/payara/project/GradleBuildReader.ts

@@ -28,6 +28,7 @@ export class GradleBuildReader implements BuildReader {
     private artifactId: string = '';
     private version: string = '';
     private finalName: string = '';
+    private buildDirectory: string = '';
 
     public constructor(public workspaceFolder: WorkspaceFolder) {
         this.parseBuild();
@@ -45,6 +46,12 @@ export class GradleBuildReader implements BuildReader {
             let build: any = await g2js.parseFile(buildPath);
             reader.groupId = build.group;
             reader.version = build.version;
+            reader.buildDirectory = reader.parseBuildDirectory(buildPath);
+        }
+
+        let buildKtsPath = path.join(this.workspaceFolder.uri.fsPath, 'build.gradle.kts');
+        if (reader.buildDirectory.length < 1 && fs.existsSync(buildKtsPath)) {
+            reader.buildDirectory = reader.parseBuildDirectory(buildKtsPath);
         }
 
         if (fs.existsSync(settingsPath)) {
@@ -57,6 +64,23 @@ export class GradleBuildReader implements BuildReader {
         }
     }
 
+    private parseBuildDirectory(gradleFilePath: string): string {
+        try {
+            const content = fs.readFileSync(gradleFilePath, 'utf8');
+            const fileMatch = content.match(/buildDir\s*=\s*file\(\s*["']([^"']+)["']\s*\)/);
+            if (fileMatch) {
+                return fileMatch[1];
+            }
+            const stringMatch = content.match(/buildDir\s*=\s*["']([^"']+)["']/);
+            if (stringMatch) {
+                return stringMatch[1];
+            }
+        } catch (e) {
+            // ignore read errors and fall back to default
+        }
+        return '';
+    }
+
     public getGroupId(): string {
         return this.groupId;
     }
@@ -73,4 +97,8 @@ export class GradleBuildReader implements BuildReader {
         return this.finalName;
     }
 
+    public getBuildDirectory(): string {
+        return this.buildDirectory;
+    }
+
 }