From 15bd552ffabca3dbc74b1efb86f5def850917c74 Mon Sep 17 00:00:00 2001 From: mahabaleshwars Date: Thu, 7 Mar 2024 22:22:27 +0530 Subject: [PATCH] updated regex for early version support --- dist/cleanup/index.js | 2 +- dist/setup/index.js | 2 +- src/util.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index c674f28e..72544074 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -87891,7 +87891,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) { var _a, _b, _c, _d, _e; let javaVersionRegExp; if (versionFile == '.tool-versions') { - javaVersionRegExp = /^java\s+(?:\S+-)?v?(?[^\s]+(?:[-+]\S+)?)$/m; + javaVersionRegExp = /^java\s(.*\S)?\s*$/m; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; diff --git a/dist/setup/index.js b/dist/setup/index.js index 9a855509..2f140fcf 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -125265,7 +125265,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) { var _a, _b, _c, _d, _e; let javaVersionRegExp; if (versionFile == '.tool-versions') { - javaVersionRegExp = /^java\s+(?:\S+-)?v?(?[^\s]+(?:[-+]\S+)?)$/m; + javaVersionRegExp = /^java\s(.*\S)?\s*$/m; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; diff --git a/src/util.ts b/src/util.ts index f0fe20da..8f81ed71 100644 --- a/src/util.ts +++ b/src/util.ts @@ -120,7 +120,7 @@ export function getVersionFromFileContent( ): string | null { let javaVersionRegExp: RegExp; if (versionFile == '.tool-versions') { - javaVersionRegExp = /^java\s+(?:\S+-)?v?(?[^\s]+(?:[-+]\S+)?)$/m; + javaVersionRegExp = /^java\s(.*\S)?\s*$/m; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; } else {