Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(gradle): fix missing tasks #22400

Merged
merged 1 commit into from
Mar 19, 2024
Merged

fix(gradle): fix missing tasks #22400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 6 additions & 7 deletions packages/gradle/src/plugin/nodes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ export const createNodes: CreateNodes<GradlePluginOptions> = [

try {
const {
tasksMap,
gradleProjectToTasksTypeMap,
gradleFileToOutputDirsMap,
gradleFileToGradleProjectMap,
Expand All @@ -96,16 +95,16 @@ export const createNodes: CreateNodes<GradlePluginOptions> = [
return;
}

const availableTaskNames = tasksMap.get(gradleFilePath) as string[];
const tasksTypeMap = gradleProjectToTasksTypeMap.get(
gradleProject
) as Map<string, string>;
const tasks: GradleTask[] = availableTaskNames.map((taskName) => {
return {
type: tasksTypeMap.get(taskName) ?? 'Unknown',
let tasks: GradleTask[] = [];
for (let [taskName, taskType] of tasksTypeMap.entries()) {
tasks.push({
type: taskType,
name: taskName,
};
});
});
}

const outputDirs = gradleFileToOutputDirsMap.get(gradleFilePath) as Map<
string,
Expand Down
15 changes: 1 addition & 14 deletions packages/gradle/src/utils/get-gradle-report.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { readFileSync } from 'node:fs';
import { dirname, join, relative } from 'node:path';
import { join, relative } from 'node:path';

import { workspaceRoot } from '@nx/devkit';
import { hashWithWorkspaceContext } from 'nx/src/utils/workspace-context';

import { execGradle } from './exec-gradle';

Expand All @@ -11,7 +10,6 @@ interface GradleReport {
buildFileToDepsMap: Map<string, string>;
gradleFileToOutputDirsMap: Map<string, Map<string, string>>;
gradleProjectToTasksTypeMap: Map<string, Map<string, string>>;
tasksMap: Map<string, string[]>;
gradleProjectToProjectName: Map<string, string>;
}

Expand Down Expand Up @@ -54,10 +52,6 @@ function processProjectReports(projectReportLines: string[]): GradleReport {
*/
const gradleProjectToGradleFileMap = new Map<string, string>();
const dependenciesMap = new Map<string, string>();
/**
* Map of Gradle Build File to available tasks
*/
const tasksMap = new Map<string, string[]>();
/**
* Map of Gradle Build File to tasks type map
*/
Expand Down Expand Up @@ -95,7 +89,6 @@ function processProjectReports(projectReportLines: string[]): GradleReport {
let projectName: string,
absBuildFilePath: string,
absBuildDirPath: string;
const tasks: string[] = [];
const outputDirMap = new Map<string, string>();
for (const line of propertyReportLines) {
if (line.startsWith('name: ')) {
Expand All @@ -107,10 +100,6 @@ function processProjectReports(projectReportLines: string[]): GradleReport {
if (line.startsWith('buildDir: ')) {
absBuildDirPath = line.substring('buildDir: '.length);
}
if (line.includes(': task ')) {
const taskSegments = line.split(': task ');
tasks.push(taskSegments[0]);
}
if (line.includes('Dir: ')) {
const [dirName, dirPath] = line.split(': ');
const taskName = dirName.replace('Dir', '');
Expand Down Expand Up @@ -141,7 +130,6 @@ function processProjectReports(projectReportLines: string[]): GradleReport {
gradleFileToGradleProjectMap.set(buildFile, gradleProject);
gradleProjectToGradleFileMap.set(gradleProject, buildFile);
gradleProjectToProjectName.set(gradleProject, projectName);
tasksMap.set(buildFile, tasks);
}
if (line.endsWith('taskReport')) {
const gradleProject = line.substring(
Expand Down Expand Up @@ -179,7 +167,6 @@ function processProjectReports(projectReportLines: string[]): GradleReport {
buildFileToDepsMap,
gradleFileToOutputDirsMap,
gradleProjectToTasksTypeMap,
tasksMap,
gradleProjectToProjectName,
};
}