From fb56b1fe85e0d17c93a35eb60ec1de3cbe349f09 Mon Sep 17 00:00:00 2001
From: Johannes Feichtner <Churro@users.noreply.github.com>
Date: Wed, 9 Nov 2022 01:51:02 +0100
Subject: [PATCH] fix(manager/gradle): prefix version catalog aliases with
"libs." (#18830)
---
lib/modules/manager/gradle/parser.spec.ts | 2 +-
lib/modules/manager/gradle/parser.ts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/modules/manager/gradle/parser.spec.ts b/lib/modules/manager/gradle/parser.spec.ts
index 756d12fca4..fe8e1eca53 100644
--- a/lib/modules/manager/gradle/parser.spec.ts
+++ b/lib/modules/manager/gradle/parser.spec.ts
@@ -184,7 +184,7 @@ describe('modules/manager/gradle/parser', () => {
${''} | ${'library("foo", "bar", "baz", "qux"]).version("1.2.3")'} | ${null}
${''} | ${'library("foo.bar", "foo", "bar").version("1.2.3", "4.5.6")'} | ${null}
${'group = "foo"; artifact="bar"'} | ${'library("foo.bar", group, artifact).version("1.2.3")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }}
- ${'library("foo-bar_baz-qux", "foo", "bar")'} | ${'"${foo.bar.baz.qux}:1.2.3"'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }}
+ ${'library("foo-bar_baz-qux", "foo", "bar")'} | ${'"${libs.foo.bar.baz.qux}:1.2.3"'} | ${{ 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 5790dbae67..4f064761f1 100644
--- a/lib/modules/manager/gradle/parser.ts
+++ b/lib/modules/manager/gradle/parser.ts
@@ -377,7 +377,7 @@ function processLibraryDep(input: SyntaxHandlerInput): SyntaxHandlerOutput {
const { tokenMap } = input;
const varNameToken = tokenMap.varName;
- const key = varNameToken.value.replace(regEx(/[-_]/g), '.');
+ const key = `libs.${varNameToken.value.replace(regEx(/[-_]/g), '.')}`;
const fileReplacePosition = varNameToken.offset;
const packageFile = input.packageFile;
--
GitLab