Skip to content
Snippets Groups Projects
Unverified Commit c02014a1 authored by Johannes Feichtner's avatar Johannes Feichtner Committed by GitHub
Browse files

fix(manager/gradle): normalize aliases in versionCatalog (#18473)

parent 8ee28a44
No related branches found
No related tags found
No related merge requests found
...@@ -97,7 +97,7 @@ describe('modules/manager/gradle/parser', () => { ...@@ -97,7 +97,7 @@ describe('modules/manager/gradle/parser', () => {
${'baz = "1.2.3"'} | ${'group: "foo", name: "bar", version: 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', groupName: 'baz' }}
${'baz = "1.2.3"'} | ${'library("foo.bar", "foo", "bar").versionRef("baz")'} | ${{ depName: 'foo:bar', currentValue: '1.2.3', groupName: 'baz' }} ${'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").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' }} ${'library("foo-bar_baz-qux", "foo", "bar")'} | ${'"${foo.bar.baz.qux}:1.2.3"'} | ${{ depName: 'foo:bar', currentValue: '1.2.3' }}
`('$def | $str', async ({ def, str, output }) => { `('$def | $str', async ({ def, str, output }) => {
const input = [def, str].join('\n'); const input = [def, str].join('\n');
const { deps } = await parseGradle(input); const { deps } = await parseGradle(input);
......
...@@ -376,7 +376,7 @@ function processLibraryDep(input: SyntaxHandlerInput): SyntaxHandlerOutput { ...@@ -376,7 +376,7 @@ function processLibraryDep(input: SyntaxHandlerInput): SyntaxHandlerOutput {
const { tokenMap } = input; const { tokenMap } = input;
const varNameToken = tokenMap.varName; const varNameToken = tokenMap.varName;
const key = varNameToken.value; const key = varNameToken.value.replace(regEx(/[-_]/g), '.');
const fileReplacePosition = varNameToken.offset; const fileReplacePosition = varNameToken.offset;
const packageFile = input.packageFile; const packageFile = input.packageFile;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment