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

feat(gradle): always add depType to extracted dependencies (#16725)

parent 45d0dbf8
No related branches found
No related tags found
No related merge requests found
...@@ -8,6 +8,7 @@ Array [ ...@@ -8,6 +8,7 @@ Array [
Object { Object {
"currentValue": "1.2.3", "currentValue": "1.2.3",
"depName": "foo:bar", "depName": "foo:bar",
"depType": "dependencies",
"fileReplacePosition": 4, "fileReplacePosition": 4,
"groupName": "baz", "groupName": "baz",
"managerData": Object { "managerData": Object {
......
...@@ -802,4 +802,33 @@ describe('modules/manager/gradle/extract', () => { ...@@ -802,4 +802,33 @@ describe('modules/manager/gradle/extract', () => {
{ packageFile: 'build.gradle' }, { packageFile: 'build.gradle' },
]); ]);
}); });
it('ensures depType is assigned', async () => {
const fsMock = {
'build.gradle':
"id 'org.sonarqube' version '3.1.1'\n\"io.jsonwebtoken:jjwt-api:0.11.2\"",
'buildSrc/build.gradle': '"com.google.protobuf:protobuf-java:3.18.2"',
};
mockFs(fsMock);
const res = await extractAllPackageFiles(
{} as ExtractConfig,
Object.keys(fsMock)
);
expect(res).toMatchObject([
{
packageFile: 'build.gradle',
deps: [
{ depName: 'org.sonarqube', depType: 'plugin' },
{ depName: 'io.jsonwebtoken:jjwt-api', depType: 'dependencies' },
],
},
{
packageFile: 'buildSrc/build.gradle',
deps: [{ depType: 'devDependencies' }],
},
]);
});
}); });
...@@ -113,6 +113,12 @@ export async function extractAllPackageFiles( ...@@ -113,6 +113,12 @@ export async function extractAllPackageFiles(
...new Set([...registryUrls, ...(dep.registryUrls ?? [])]), ...new Set([...registryUrls, ...(dep.registryUrls ?? [])]),
]; ];
if (!dep.depType) {
dep.depType = key.startsWith('buildSrc')
? 'devDependencies'
: 'dependencies';
}
const depAlreadyInPkgFile = pkgFile.deps.some( const depAlreadyInPkgFile = pkgFile.deps.some(
(item) => (item) =>
item.depName === dep.depName && item.depName === dep.depName &&
......
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