refactor: use selectToolBinary for Gradle discovery and remove mocks

Replace resolveBinary with selectToolBinary (via Base_java) in
discoverGradleSubprojects, matching the Maven discovery pattern and
gaining normalizePath via traverseForWrapper.

Remove esmock invokeCommand mocks from happy-path Gradle workspace
tests — they now invoke a real gradle binary. Keep esmock only for
the error path (gradle not available).

Fix settings.gradle.kts fixture to use valid Kotlin DSL syntax.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: Strum355

src/providers/java_gradle.js

@@ -8,7 +8,7 @@ import TOML from 'fast-toml'
 
 import { readLicenseFile } from '../license/license_utils.js'
 import Sbom from '../sbom.js'
-import { invokeCommand, resolveBinary } from '../tools.js'
+import { invokeCommand } from '../tools.js'
 import { filterManifestPathsByDiscoveryIgnore, resolveWorkspaceDiscoveryIgnore } from '../workspace.js'
 
 import Base_java, { ecosystem_gradle } from "./base_java.js";
@@ -503,16 +503,21 @@ export async function discoverGradleSubprojects(workspaceRoot, opts = {}) {
 		return []
 	}
 
-	const localWrapper = 'gradlew' + (process.platform === 'win32' ? '.bat' : '')
-	const gradleBin = resolveBinary('gradle', localWrapper, root, opts)
 	const manifestPaths = []
 
 	const rootBuildKts = path.join(root, 'build.gradle.kts')
 	const rootBuild = path.join(root, 'build.gradle')
-	if (fs.existsSync(rootBuildKts)) {
-		manifestPaths.push(rootBuildKts)
-	} else if (fs.existsSync(rootBuild)) {
-		manifestPaths.push(rootBuild)
+	const rootManifest = fs.existsSync(rootBuildKts) ? rootBuildKts : fs.existsSync(rootBuild) ? rootBuild : null
+	if (rootManifest) {
+		manifestPaths.push(rootManifest)
+	}
+
+	let gradleBin
+	try {
+		gradleBin = new Java_gradle().selectToolBinary(rootManifest || rootBuild, opts)
+	} catch {
+		const ignorePatterns = [...resolveWorkspaceDiscoveryIgnore(opts), ...DEFAULT_GRADLE_DISCOVERY_IGNORE]
+		return filterManifestPathsByDiscoveryIgnore(manifestPaths, root, ignorePatterns)
 	}
 
 	const initScriptPath = path.join(os.tmpdir(), `da-list-projects-${crypto.randomUUID()}.gradle`)

test/providers/tst_manifests/gradle/gradle_mixed_variants/settings.gradle.kts

@@ -1 +1 @@
-include ':app', ':lib'
+include(":app", ":lib")

test/providers/workspace.test.js

@@ -200,18 +200,6 @@ suite('discoverGradleSubprojects', () => {
 
 	test('discovers multi-project build', async () => {
 		const root = path.resolve('test/providers/tst_manifests/gradle/gradle_multi_project')
-		const initScriptOutput = [
-			`::DA_PROJECT:::${path.resolve(root)}`,
-			`::DA_PROJECT:::app::${path.resolve(root, 'app')}`,
-			`::DA_PROJECT:::lib::${path.resolve(root, 'lib')}`,
-		].join('\n')
-
-		const { discoverGradleSubprojects } = await esmock('../../src/providers/java_gradle.js', {
-			'../../src/tools.js': {
-				resolveBinary: () => 'gradle',
-				invokeCommand: () => Buffer.from(initScriptOutput),
-			},
-		})
 		const result = await discoverGradleSubprojects(root)
 		expect(result).to.be.an('array')
 		expect(result).to.have.lengthOf(3)
@@ -222,18 +210,6 @@ suite('discoverGradleSubprojects', () => {
 
 	test('discovers nested subprojects', async () => {
 		const root = path.resolve('test/providers/tst_manifests/gradle/gradle_nested_subprojects')
-		const initScriptOutput = [
-			`::DA_PROJECT:::${path.resolve(root)}`,
-			`::DA_PROJECT:::libs:core::${path.resolve(root, 'libs/core')}`,
-			`::DA_PROJECT:::libs:util::${path.resolve(root, 'libs/util')}`,
-		].join('\n')
-
-		const { discoverGradleSubprojects } = await esmock('../../src/providers/java_gradle.js', {
-			'../../src/tools.js': {
-				resolveBinary: () => 'gradle',
-				invokeCommand: () => Buffer.from(initScriptOutput),
-			},
-		})
 		const result = await discoverGradleSubprojects(root)
 		expect(result).to.be.an('array')
 		expect(result).to.have.lengthOf(3)
@@ -244,18 +220,6 @@ suite('discoverGradleSubprojects', () => {
 
 	test('handles mixed Groovy and Kotlin build files', async () => {
 		const root = path.resolve('test/providers/tst_manifests/gradle/gradle_mixed_variants')
-		const initScriptOutput = [
-			`::DA_PROJECT:::${path.resolve(root)}`,
-			`::DA_PROJECT:::app::${path.resolve(root, 'app')}`,
-			`::DA_PROJECT:::lib::${path.resolve(root, 'lib')}`,
-		].join('\n')
-
-		const { discoverGradleSubprojects } = await esmock('../../src/providers/java_gradle.js', {
-			'../../src/tools.js': {
-				resolveBinary: () => 'gradle',
-				invokeCommand: () => Buffer.from(initScriptOutput),
-			},
-		})
 		const result = await discoverGradleSubprojects(root)
 		expect(result).to.be.an('array')
 		expect(result).to.have.lengthOf(3)
@@ -266,48 +230,29 @@ suite('discoverGradleSubprojects', () => {
 
 	test('returns root only when no subprojects', async () => {
 		const root = path.resolve('test/providers/tst_manifests/gradle/gradle_no_subprojects')
-		const initScriptOutput = `::DA_PROJECT:::${path.resolve(root)}\n`
-
-		const { discoverGradleSubprojects } = await esmock('../../src/providers/java_gradle.js', {
-			'../../src/tools.js': {
-				resolveBinary: () => 'gradle',
-				invokeCommand: () => Buffer.from(initScriptOutput),
-			},
-		})
 		const result = await discoverGradleSubprojects(root)
 		expect(result).to.be.an('array')
 		expect(result).to.have.lengthOf(1)
 		expect(result[0]).to.equal(path.join(root, 'build.gradle'))
 	})
 
-	test('returns root build file when gradle command fails', async () => {
+	test('returns root build file when gradle is not available', async () => {
 		const root = path.resolve('test/providers/tst_manifests/gradle/gradle_multi_project')
-		const { discoverGradleSubprojects } = await esmock('../../src/providers/java_gradle.js', {
+		const { discoverGradleSubprojects: discoverMocked } = await esmock('../../src/providers/java_gradle.js', {
 			'../../src/tools.js': {
-				resolveBinary: () => 'gradle',
-				invokeCommand: () => { throw new Error('gradle not found') },
+				getCustomPath: () => '/nonexistent/gradle',
+				getWrapperPreference: () => false,
+				invokeCommand: () => { throw Object.assign(new Error('gradle not found'), { code: 'ENOENT' }) },
 			},
 		})
-		const result = await discoverGradleSubprojects(root)
+		const result = await discoverMocked(root)
 		expect(result).to.be.an('array')
 		expect(result).to.have.lengthOf(1)
 		expect(result[0]).to.equal(path.join(root, 'build.gradle'))
 	})
 
 	test('excludes paths matching workspaceDiscoveryIgnore', async () => {
 		const root = path.resolve('test/providers/tst_manifests/gradle/gradle_multi_project')
-		const initScriptOutput = [
-			`::DA_PROJECT:::${path.resolve(root)}`,
-			`::DA_PROJECT:::app::${path.resolve(root, 'app')}`,
-			`::DA_PROJECT:::lib::${path.resolve(root, 'lib')}`,
-		].join('\n')
-
-		const { discoverGradleSubprojects } = await esmock('../../src/providers/java_gradle.js', {
-			'../../src/tools.js': {
-				resolveBinary: () => 'gradle',
-				invokeCommand: () => Buffer.from(initScriptOutput),
-			},
-		})
 		const result = await discoverGradleSubprojects(root, {
 			workspaceDiscoveryIgnore: ['**/lib/**'],
 		})