From 773eb7ce7ee06721a2449b60f4c3dd8c39f16cc8 Mon Sep 17 00:00:00 2001
From: Sergei Zharinov <zharinov@users.noreply.github.com>
Date: Mon, 15 Nov 2021 16:45:28 +0300
Subject: [PATCH] fix(gradle): Group long-form dependencies by varname (#12659)
---
lib/manager/gradle/shallow/parser.spec.ts | 2 +-
lib/manager/gradle/shallow/parser.ts | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/manager/gradle/shallow/parser.spec.ts b/lib/manager/gradle/shallow/parser.spec.ts
index 04c0f1bcf3..e828da7402 100644
--- a/lib/manager/gradle/shallow/parser.spec.ts
+++ b/lib/manager/gradle/shallow/parser.spec.ts
@@ -52,7 +52,7 @@ describe('manager/gradle/shallow/parser', () => {
${'foo.bar = "1.2.3"'} | ${'"foo:bar:$foo.bar"'} | ${{ depName: 'foo:bar', currentValue: '1.2.3', groupName: 'foo.bar' }}
${''} | ${'foo.bar = "foo:bar:1.2.3"'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }}
${'baz = "1.2.3"'} | ${'foobar = "foo:bar:$baz"'} | ${{ depName: 'foo:bar', currentValue: '1.2.3', groupName: 'baz' }}
- ${'baz = "1.2.3"'} | ${'group: "foo", name: "bar", version: baz'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }}
+ ${'baz = "1.2.3"'} | ${'group: "foo", name: "bar", version: baz'} | ${{ depName: 'foo:bar', currentValue: '1.2.3', groupName: 'baz' }}
`('$def | $str', ({ def, str, output }) => {
const input = [def, str].join('\n');
const { deps } = parseGradle(input);
diff --git a/lib/manager/gradle/shallow/parser.ts b/lib/manager/gradle/shallow/parser.ts
index 33c49dec9f..c906e834b8 100644
--- a/lib/manager/gradle/shallow/parser.ts
+++ b/lib/manager/gradle/shallow/parser.ts
@@ -263,6 +263,7 @@ function processLongFormDep({
const versionToken: Token = tokenMap.version;
if (versionToken.type === TokenType.Word) {
const variable = variables[versionToken.value];
+ dep.groupName = variable.key;
dep.managerData = {
fileReplacePosition: variable.fileReplacePosition,
packageFile: variable.packageFile,
--
GitLab