diff --git a/lib/modules/manager/gradle/extract.ts b/lib/modules/manager/gradle/extract.ts index 7fd945f5ad32431a8c8d7d4d00158e47728efed5..8e7bf0d24e4fab14a94bcf9e97a37ba090e27c72 100644 --- a/lib/modules/manager/gradle/extract.ts +++ b/lib/modules/manager/gradle/extract.ts @@ -118,5 +118,6 @@ export async function extractAllPackageFiles( } }); - return Object.values(packageFilesByName); + const result = Object.values(packageFilesByName); + return result; } diff --git a/lib/modules/manager/gradle/parser.spec.ts b/lib/modules/manager/gradle/parser.spec.ts index e0f70eee1a4f52d1b8da73e8130b44b52c7fb7da..ebea44eb7c42bf7052bae2347395595a9a2d6d7f 100644 --- a/lib/modules/manager/gradle/parser.spec.ts +++ b/lib/modules/manager/gradle/parser.spec.ts @@ -85,19 +85,20 @@ describe('modules/manager/gradle/parser', () => { describe('registryUrls', () => { test.each` - input | url - ${'url ""'} | ${null} - ${'url "#!@"'} | ${null} - ${'url "https://example.com"'} | ${'https://example.com'} - ${'url("https://example.com")'} | ${'https://example.com'} - ${'mavenCentral()'} | ${MAVEN_REPO} - ${'jcenter()'} | ${JCENTER_REPO} - ${'google()'} | ${GOOGLE_REPO} - ${'google { content { includeGroup "foo" } }'} | ${GOOGLE_REPO} - ${'gradlePluginPortal()'} | ${GRADLE_PLUGIN_PORTAL_REPO} - ${'maven("https://foo.bar/baz/qux")'} | ${'https://foo.bar/baz/qux'} - ${'maven { url = uri("https://foo.bar/baz") }'} | ${'https://foo.bar/baz'} - ${"maven { url 'https://foo.bar/baz' }"} | ${'https://foo.bar/baz'} + input | url + ${'url ""'} | ${null} + ${'url "#!@"'} | ${null} + ${'url "https://example.com"'} | ${'https://example.com'} + ${'url("https://example.com")'} | ${'https://example.com'} + ${'mavenCentral()'} | ${MAVEN_REPO} + ${'jcenter()'} | ${JCENTER_REPO} + ${'google()'} | ${GOOGLE_REPO} + ${'google { content { includeGroup "foo" } }'} | ${GOOGLE_REPO} + ${'gradlePluginPortal()'} | ${GRADLE_PLUGIN_PORTAL_REPO} + ${'maven("https://foo.bar/baz/qux")'} | ${'https://foo.bar/baz/qux'} + ${'maven { url = uri("https://foo.bar/baz")'} | ${'https://foo.bar/baz'} + ${"maven { url 'https://foo.bar/baz'"} | ${'https://foo.bar/baz'} + ${"maven { url = 'https://foo.bar/baz'"} | ${'https://foo.bar/baz'} `('$input', ({ input, url }) => { const expected = [url].filter(Boolean); const { urls } = parseGradle(input); diff --git a/lib/modules/manager/gradle/parser.ts b/lib/modules/manager/gradle/parser.ts index 08b7139c53a0833b6b90c08c3066a753ec8c406a..83cc5960340513e1566cc49f2c5fdbdfdc0c5da4 100644 --- a/lib/modules/manager/gradle/parser.ts +++ b/lib/modules/manager/gradle/parser.ts @@ -494,7 +494,25 @@ const matcherConfigs: SyntaxMatchConfig[] = [ handler: processCustomRegistryUrl, }, { - // maven { url = uri("https://maven.springframework.org/release") } + // maven { url = "https://maven.springframework.org/release" + matchers: [ + { + matchType: TokenType.Word, + matchValue: 'maven', + }, + { matchType: TokenType.LeftBrace }, + { + matchType: TokenType.Word, + matchValue: 'url', + }, + { matchType: TokenType.Assignment }, + { matchType: TokenType.String, tokenMapKey: 'registryUrl' }, + endOfInstruction, + ], + handler: processCustomRegistryUrl, + }, + { + // maven { url = uri("https://maven.springframework.org/release") matchers: [ { matchType: TokenType.Word, @@ -513,13 +531,12 @@ const matcherConfigs: SyntaxMatchConfig[] = [ { matchType: TokenType.LeftParen }, { matchType: TokenType.String, tokenMapKey: 'registryUrl' }, { matchType: TokenType.RightParen }, - { matchType: TokenType.RightBrace }, endOfInstruction, ], handler: processCustomRegistryUrl, }, { - // maven { url "https://maven.springframework.org/release" } + // maven { url "https://maven.springframework.org/release" matchers: [ { matchType: TokenType.Word, @@ -531,7 +548,6 @@ const matcherConfigs: SyntaxMatchConfig[] = [ matchValue: 'url', }, { matchType: TokenType.String, tokenMapKey: 'registryUrl' }, - { matchType: TokenType.RightBrace }, endOfInstruction, ], handler: processCustomRegistryUrl,