From f9f685ea6187ae7b4bd1395fde68fbe6cd223af2 Mon Sep 17 00:00:00 2001 From: Johannes Feichtner Date: Thu, 13 Oct 2022 23:49:07 +0200 Subject: [PATCH] fix(manager/gradle): preserve next token for parsing in case dependency interpolation fails --- lib/modules/manager/gradle/parser.spec.ts | 1 + lib/modules/manager/gradle/parser.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/modules/manager/gradle/parser.spec.ts b/lib/modules/manager/gradle/parser.spec.ts index d6b4feec6deeea..2ffaaaba591e9f 100644 --- a/lib/modules/manager/gradle/parser.spec.ts +++ b/lib/modules/manager/gradle/parser.spec.ts @@ -98,6 +98,7 @@ describe('modules/manager/gradle/parser', () => { ${'baz = "1.2.3"'} | ${'library("foo.bar", "foo", "bar").versionRef("baz")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3', groupName: 'baz' }} ${''} | ${'library("foo.bar", "foo", "bar").version("1.2.3")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }} ${'library("foo.bar", "foo", "bar")'} | ${'"${foo.bar}:1.2.3"'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }} + ${'foo = "${bar}"; baz = "1.2.3"'} | ${'"foo:bar:${baz}"'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }} `('$def | $str', async ({ def, str, output }) => { const input = [def, str].join('\n'); const { deps } = await parseGradle(input); diff --git a/lib/modules/manager/gradle/parser.ts b/lib/modules/manager/gradle/parser.ts index 48e620a89e21ea..b1936a417eb902 100644 --- a/lib/modules/manager/gradle/parser.ts +++ b/lib/modules/manager/gradle/parser.ts @@ -200,7 +200,7 @@ function processDepInterpolation({ return { deps: [dep] }; } } - return null; + return {}; } function processPlugin({