Skip to content
Snippets Groups Projects
Commit a28f688b authored by Olexiy Myronenko's avatar Olexiy Myronenko Committed by Rhys Arkins
Browse files

fix(gradle): allow use of variables with platform keyword and… (#4378)

parent 75dcf30e
No related branches found
No related tags found
No related merge requests found
...@@ -208,7 +208,7 @@ function moduleMapVariableVersionFormatMatch( ...@@ -208,7 +208,7 @@ function moduleMapVariableVersionFormatMatch(
return new RegExp( return new RegExp(
`group\\s*:\\s*["']${dependency.group}["']\\s*,\\s*` + `group\\s*:\\s*["']${dependency.group}["']\\s*,\\s*` +
`name\\s*:\\s*["']${dependency.name}["']\\s*,\\s*` + `name\\s*:\\s*["']${dependency.name}["']\\s*,\\s*` +
`version\\s*:\\s*([^\\s"']+?)\\s` `version\\s*:\\s*([^\\s"')]+)\\s*`
); );
} }
......
...@@ -206,6 +206,26 @@ describe('lib/manager/gradle/updateGradleVersion', () => { ...@@ -206,6 +206,26 @@ describe('lib/manager/gradle/updateGradleVersion', () => {
expect(updatedGradleFile).toEqual('mysqlVersion=7.0.0'); expect(updatedGradleFile).toEqual('mysqlVersion=7.0.0');
}); });
it('should replace a external property variable assigned to a specific dependency parenthesis syntax', () => {
const gradleFile =
"implementation platform(group: 'mysql', name: 'mysql-connector-java', version: mysqlVersion)"; // eslint-disable-line no-template-curly-in-string
const mysqlDependency = {
group: 'mysql',
depGroup: 'mysql',
name: 'mysql-connector-java',
version: '6.0.5',
};
collectVersionVariables([mysqlDependency], gradleFile);
const propertyFile = 'mysqlVersion=6.0.5';
const updatedGradleFile = updateGradleVersion(
propertyFile,
mysqlDependency,
'7.0.0'
);
expect(updatedGradleFile).toEqual('mysqlVersion=7.0.0');
});
it('should replace a external variable assigned to a map dependency', () => { it('should replace a external variable assigned to a map dependency', () => {
const gradleFile = `compile group : 'mysql' , const gradleFile = `compile group : 'mysql' ,
name : 'mysql-connector-java', name : 'mysql-connector-java',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment