Skip to content

Commit

Permalink
feat(gradle-lite): Recognize more registryUrls patterns (#9825)
Browse files Browse the repository at this point in the history
  • Loading branch information
zharinov committed May 4, 2021
1 parent a758e24 commit a01323c
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 0 deletions.
19 changes: 19 additions & 0 deletions lib/manager/gradle-lite/parser.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,25 @@ describe(getName(), () => {
JCENTER_REPO,
GOOGLE_REPO,
]);

({ urls } = parseGradle(
'maven("https://repository.mycompany.com/m2/repository")'
));
expect(urls).toStrictEqual([
'https://repository.mycompany.com/m2/repository',
]);

({ urls } = parseGradle(
'maven { url = uri("https://maven.springframework.org/release") }'
));
expect(urls).toStrictEqual(['https://maven.springframework.org/release']);

({ urls } = parseGradle(
"maven { url 'https://repository.mycompany.com/m2/repository' }"
));
expect(urls).toStrictEqual([
'https://repository.mycompany.com/m2/repository',
]);
});
it('parses long form deps', () => {
let deps;
Expand Down
57 changes: 57 additions & 0 deletions lib/manager/gradle-lite/parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,63 @@ const matcherConfigs: SyntaxMatchConfig[] = [
],
handler: processPredefinedRegistryUrl,
},
{
// maven("https://repository.mycompany.com/m2/repository")
matchers: [
{
matchType: TokenType.Word,
matchValue: 'maven',
},
{ matchType: TokenType.LeftParen },
{ matchType: TokenType.String, tokenMapKey: 'registryUrl' },
{ matchType: TokenType.RightParen },
endOfInstruction,
],
handler: processCustomRegistryUrl,
},
{
// maven { url = uri("https://maven.springframework.org/release") }
matchers: [
{
matchType: TokenType.Word,
matchValue: 'maven',
},
{ matchType: TokenType.LeftBrace },
{
matchType: TokenType.Word,
matchValue: 'url',
},
{ matchType: TokenType.Assignment },
{
matchType: TokenType.Word,
matchValue: 'uri',
},
{ matchType: TokenType.LeftParen },
{ matchType: TokenType.String, tokenMapKey: 'registryUrl' },
{ matchType: TokenType.RightParen },
{ matchType: TokenType.RightBrace },
endOfInstruction,
],
handler: processCustomRegistryUrl,
},
{
// maven { url "https://maven.springframework.org/release" }
matchers: [
{
matchType: TokenType.Word,
matchValue: 'maven',
},
{ matchType: TokenType.LeftBrace },
{
matchType: TokenType.Word,
matchValue: 'url',
},
{ matchType: TokenType.String, tokenMapKey: 'registryUrl' },
{ matchType: TokenType.RightBrace },
endOfInstruction,
],
handler: processCustomRegistryUrl,
},
{
// url 'https://repo.spring.io/snapshot/'
matchers: [
Expand Down

0 comments on commit a01323c

Please sign in to comment.