feat(manager/gradle): rewrite and extend parser

lib/modules/manager/gradle/extract.spec.ts

@@ -8,10 +8,16 @@ jest.mock('../../../util/fs');
 
 function mockFs(files: Record<string, string>): void {
   // TODO: fix types, jest is using wrong overload (#7154)
-  fs.readLocalFile.mockImplementation((fileName: string): Promise<any> => {
-    const content = files?.[fileName];
-    return Promise.resolve(content ?? '');
-  });
+  fs.getFileContentMap.mockImplementation(
+    (fileNames: string[]): Promise<any> => {
+      const fileContentMap: Record<string, string | null> = {};
+      for (const fileName of fileNames) {
+        fileContentMap[fileName] = files?.[fileName];
+      }
+
+      return Promise.resolve(fileContentMap);
+    }
+  );
 
   fs.getSiblingFileName.mockImplementation(
     (existingFileNameWithPath: string, otherFileName: string) => {
@@ -45,7 +51,9 @@ describe('modules/manager/gradle/extract', () => {
     const filename = 'build.gradle';
     const err = new Error('unknown');
 
-    jest.spyOn(parser, 'parseGradle').mockRejectedValueOnce(err);
+    jest.spyOn(parser, 'parseGradle').mockImplementationOnce(() => {
+      throw err;
+    });
     await extractAllPackageFiles({} as ExtractConfig, [filename]);
 
     expect(logger.logger.warn).toHaveBeenCalledWith(
@@ -641,7 +649,7 @@ describe('modules/manager/gradle/extract', () => {
     const res = await extractAllPackageFiles({} as ExtractConfig, [
       'gradleX/libs1.gradle',
       'gradle/libs2.gradle',
-      // 'gradle/libs3.gradle', is intentionally not listed here
+      'gradle/libs3.gradle',
       'gradleX/gradleX/libs4.gradle',
       'build.gradle',
       'gradle.properties',
@@ -663,6 +671,16 @@ describe('modules/manager/gradle/extract', () => {
           },
         ],
       },
+      {
+        packageFile: 'gradle/libs3.gradle',
+        deps: [
+          {
+            depName: 'com.google.guava:guava',
+            currentValue: '30.1-jre',
+            managerData: { packageFile: 'gradle/libs3.gradle' },
+          },
+        ],
+      },
       {
         packageFile: 'gradleX/libs1.gradle',
         deps: [
@@ -688,16 +706,6 @@ describe('modules/manager/gradle/extract', () => {
           },
         ],
       },
-      {
-        packageFile: 'gradle/libs3.gradle',
-        deps: [
-          {
-            depName: 'com.google.guava:guava',
-            currentValue: '30.1-jre',
-            managerData: { packageFile: 'gradle/libs3.gradle' },
-          },
-        ],
-      },
     ]);
   });
 

lib/modules/manager/gradle/extract.ts

@@ -1,6 +1,6 @@
 import upath from 'upath';
 import { logger } from '../../../logger';
-import { readLocalFile } from '../../../util/fs';
+import { getFileContentMap } from '../../../util/fs';
 import { MavenDatasource } from '../../datasource/maven';
 import type { ExtractConfig, PackageDependency, PackageFile } from '../types';
 import { parseCatalog } from './extract/catalog';
@@ -44,6 +44,8 @@ export async function extractAllPackageFiles(
   const packageFilesByName: Record<string, PackageFile> = {};
   const registryUrls: string[] = [];
   const reorderedFiles = reorderFiles(packageFiles);
+  const fileContents = await getFileContentMap(packageFiles, true);
+
   for (const packageFile of reorderedFiles) {
     packageFilesByName[packageFile] = {
       packageFile,
@@ -53,7 +55,7 @@ export async function extractAllPackageFiles(
 
     try {
       // TODO #7154
-      const content = (await readLocalFile(packageFile, 'utf8'))!;
+      const content = fileContents[packageFile]!;
       const dir = upath.dirname(toAbsolutePath(packageFile));
 
       const updateVars = (newVars: PackageVariables): void => {
@@ -74,7 +76,7 @@ export async function extractAllPackageFiles(
           deps,
           urls,
           vars: gradleVars,
-        } = await parseGradle(content, vars, packageFile);
+        } = parseGradle(content, vars, packageFile, fileContents);
         urls.forEach((url) => {
           if (!registryUrls.includes(url)) {
             registryUrls.push(url);
@@ -101,6 +103,7 @@ export async function extractAllPackageFiles(
     // istanbul ignore else
     if (key) {
       let pkgFile = packageFilesByName[key];
+      // istanbul ignore if: won't happen if "apply from" processes only initially known files
       if (!pkgFile) {
         pkgFile = {
           packageFile: key,