Merge d87ca55394 into 5896cecc08

dist/cleanup/index.js

@@ -88355,17 +88355,16 @@ exports.isCacheFeatureAvailable = isCacheFeatureAvailable;
 function getVersionFromFileContent(content, distributionName, versionFile) {
     var _a, _b, _c, _d, _e;
     let javaVersionRegExp;
-    function getFileName(versionFile) {
-        return path_1.default.basename(versionFile);
-    }
-    const versionFileName = getFileName(versionFile);
-    if (versionFileName == '.tool-versions') {
+    if (versionFile == '.tool-versions') {
         javaVersionRegExp =
             /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
     }
-    else {
+    else if (versionFile == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
     }
+    else {
+        throw new Error('Invalid version file');
+    }
     const fileContent = ((_b = (_a = content.match(javaVersionRegExp)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.version)
         ? (_d = (_c = content.match(javaVersionRegExp)) === null || _c === void 0 ? void 0 : _c.groups) === null || _d === void 0 ? void 0 : _d.version
         : '';

dist/setup/index.js

@@ -125729,17 +125729,16 @@ exports.isCacheFeatureAvailable = isCacheFeatureAvailable;
 function getVersionFromFileContent(content, distributionName, versionFile) {
     var _a, _b, _c, _d, _e;
     let javaVersionRegExp;
-    function getFileName(versionFile) {
-        return path_1.default.basename(versionFile);
-    }
-    const versionFileName = getFileName(versionFile);
-    if (versionFileName == '.tool-versions') {
+    if (versionFile == '.tool-versions') {
         javaVersionRegExp =
             /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
     }
-    else {
+    else if (versionFile == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
     }
+    else {
+        throw new Error('Invalid version file');
+    }
     const fileContent = ((_b = (_a = content.match(javaVersionRegExp)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.version)
         ? (_d = (_c = content.match(javaVersionRegExp)) === null || _c === void 0 ? void 0 : _c.groups) === null || _d === void 0 ? void 0 : _d.version
         : '';

src/util.ts

@@ -119,17 +119,13 @@ export function getVersionFromFileContent(
   versionFile: string
 ): string | null {
   let javaVersionRegExp: RegExp;
-
-  function getFileName(versionFile: string) {
-    return path.basename(versionFile);
-  }
-
-  const versionFileName = getFileName(versionFile);
-  if (versionFileName == '.tool-versions') {
+  if (versionFile == '.tool-versions') {
     javaVersionRegExp =
       /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
-  } else {
+  } else if (versionFile == '.java-version') {
     javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
+  } else {
+    throw new Error('Invalid version file');
   }
 
   const fileContent = content.match(javaVersionRegExp)?.groups?.version