Skip to content

Commit

Permalink
Fix missing prompts when there is conflict between pom.xml and .gradl…
Browse files Browse the repository at this point in the history
…e.kts (#3401)

Signed-off-by: Sheng Chen <[email protected]>
  • Loading branch information
jdneo authored Nov 27, 2023
1 parent 86bf3ae commit 505fbe7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export async function hasBuildToolConflicts(): Promise<boolean> {
// ignore the folders that already has .project file (already imported before)
const gradleDirectories = getDirectoriesByBuildFile(projectConfigurationFsPaths, eclipseDirectories, ".gradle");
const gradleDirectoriesKts = getDirectoriesByBuildFile(projectConfigurationFsPaths, eclipseDirectories, ".gradle.kts");
gradleDirectories.concat(gradleDirectoriesKts);
gradleDirectories.push(...gradleDirectoriesKts);
const mavenDirectories = getDirectoriesByBuildFile(projectConfigurationFsPaths, eclipseDirectories, "pom.xml");
return gradleDirectories.some((gradleDir) => {
return mavenDirectories.includes(gradleDir);
Expand Down

0 comments on commit 505fbe7

Please sign in to comment.