From 5720a16263f5ec3504380ecede8124cf303dbacd Mon Sep 17 00:00:00 2001 From: ghe Date: Wed, 2 Sep 2020 11:15:56 +0100 Subject: [PATCH 1/2] feat: use snyk-gradle-plugin@3.6.2 that sends back project targetFile --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 48732d32c97..1858a259fbd 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "snyk-cpp-plugin": "1.4.1", "snyk-docker-plugin": "3.18.1", "snyk-go-plugin": "1.16.0", - "snyk-gradle-plugin": "3.5.1", + "snyk-gradle-plugin": "3.6.2", "snyk-module": "3.1.0", "snyk-mvn-plugin": "2.19.1", "snyk-nodejs-lockfile-parser": "1.27.0", From fade21a6e691f6466c395b239a1c7a09742abca6 Mon Sep 17 00:00:00 2001 From: ghe Date: Wed, 2 Sep 2020 11:28:43 +0100 Subject: [PATCH 2/2] fix: remove new line to prevent bad spinner clearing --- src/lib/plugins/get-deps-from-plugin.ts | 2 +- test/acceptance/cli-test/cli-test.all-projects.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/plugins/get-deps-from-plugin.ts b/src/lib/plugins/get-deps-from-plugin.ts index 79e91696e06..c3bdbd98353 100644 --- a/src/lib/plugins/get-deps-from-plugin.ts +++ b/src/lib/plugins/get-deps-from-plugin.ts @@ -149,7 +149,7 @@ export function warnSomeGradleManifestsNotScanned( ); if (diff.length > 0) { - return `✗ ${diff.length}/${detectedGradleFiles.length} detected Gradle manifests did not return dependencies.\nThey may have errored or were not included as part of a multi-project build. You may need to scan them individually with --file=path/to/file. Run with \`-d\` for more info.`; + return `✗ ${diff.length}/${detectedGradleFiles.length} detected Gradle manifests did not return dependencies. They may have errored or were not included as part of a multi-project build. You may need to scan them individually with --file=path/to/file. Run with \`-d\` for more info.`; } return null; } diff --git a/test/acceptance/cli-test/cli-test.all-projects.spec.ts b/test/acceptance/cli-test/cli-test.all-projects.spec.ts index 2e9a07a69f0..ebad8ffd80d 100644 --- a/test/acceptance/cli-test/cli-test.all-projects.spec.ts +++ b/test/acceptance/cli-test/cli-test.all-projects.spec.ts @@ -92,7 +92,7 @@ export const AllProjectsTests: AcceptanceTests = { ); t.same( stdoutMessages, - '✗ 1/3 detected Gradle manifests did not return dependencies.\n' + + '✗ 1/3 detected Gradle manifests did not return dependencies. ' + 'They may have errored or were not included as part of a multi-project build. You may need to scan them individually with --file=path/to/file. Run with `-d` for more info.', ); stubbedConsole.restore();