Merge pull request #43 from badsyntax/multi-project-builds

Multi project builds

Author: badsyntax

.vscode/launch.json

@@ -109,6 +109,20 @@
       ],
       "outFiles": ["${workspaceFolder}/out/test/**/*.js"],
       "preLaunchTask": "npm: watch"
+    },
+    {
+      "name": "Test: Multi-Project",
+      "type": "extensionHost",
+      "request": "launch",
+      "runtimeExecutable": "${execPath}",
+      "args": [
+        "--disable-extensions",
+        "--extensionDevelopmentPath=${workspaceFolder}",
+        "--extensionTestsPath=${workspaceFolder}/out/test/multi-project/",
+        "${workspaceFolder}/test-fixtures/multi-project"
+      ],
+      "outFiles": ["${workspaceFolder}/out/test/**/*.js"],
+      "preLaunchTask": "npm: watch"
     }
   ]
 }

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 2.1.6
+
+- Add support for multi-project builds (subprojects)
+
+## 2.1.5
+
+- Improve error handling
+
 ## 2.1.4
 
 - Fix refresh tasks error handling

README.md

@@ -12,8 +12,9 @@ Run gradle tasks in VS Code.
 
 - Run gradle tasks as [VS Code tasks](https://code.visualstudio.com/docs/editor/tasks)
 - List & run gradle tasks in the Explorer
-- Multi-root workspaces supported
-- Default Groovy/Kotlin and custom build files supported
+- Multi-root workspace folders supported
+- Default Groovy/Kotlin & custom build files supported
+- Multi-project builds supported
 
 > **Note:** Local gradle wrapper executables must exist at the root of the workspace folders (either `./gradlew` or `.\gradlew.bat`, depending on your environment).
 
@@ -25,6 +26,7 @@ This extension contributes the following settings:
 - `gradle.tasksArgs`: Custom gradle tasks arguments
 - `gradle.enableTasksExplorer`: Enable an explorer view for gradle tasks
 - `gradle.customBuildFile`: Custom gradle build filename
+- `gradle.explorerNestedSubProjects`: Show nested subprojects in the explorer
 
 ## Slow Task Provider Warning
 

package.json

@@ -136,6 +136,12 @@
           "default": "",
           "scope": "resource",
           "description": "Filename of the gradle build file"
+        },
+        "gradle.explorerNestedSubProjects": {
+          "type": "boolean",
+          "default": true,
+          "scope": "resource",
+          "description": "Show nested sub-projects in the explorer"
         }
       }
     },
@@ -159,6 +165,10 @@
           "buildFile": {
             "type": "string",
             "description": "The build file that provides the task"
+          },
+          "subProjectBuildFile": {
+            "type": "string",
+            "description": "The subproject build file that provides the task"
           }
         }
       }

src/config.ts

@@ -1,10 +1,10 @@
-import { workspace, WorkspaceFolder } from 'vscode';
+import { workspace, WorkspaceFolder, Uri } from 'vscode';
 
 type AutoDetect = 'on' | 'off';
 
-export function getCustomBuildFile(folder: WorkspaceFolder): string {
+export function getCustomBuildFile(uri: Uri): string {
   return workspace
-    .getConfiguration('gradle', folder.uri)
+    .getConfiguration('gradle', uri)
     .get<string>('customBuildFile', '');
 }
 
@@ -27,3 +27,9 @@ export function getIsTasksExplorerEnabled(): boolean {
     .getConfiguration('gradle')
     .get<boolean>('enableTasksExplorer', true);
 }
+
+export function getHasExplorerNestedSubProjects(): boolean {
+  return workspace
+    .getConfiguration('gradle')
+    .get<boolean>('explorerNestedSubProjects', true);
+}

src/extension.ts

@@ -35,7 +35,7 @@ function registerTaskProvider(
     const defaultKotlinBuildFile = 'build.gradle.kts';
     const buildFiles = new Set<string>();
     for (const folder of workspace.workspaceFolders) {
-      const customBuildFile = getCustomBuildFile(folder);
+      const customBuildFile = getCustomBuildFile(folder.uri);
       if (customBuildFile) {
         buildFiles.add(customBuildFile);
       } else {