@codacy/tools-scalastyle-1 0.3.5 → 0.4.1

package/dist/index.js

@@ -1061,24 +1061,6 @@ async function resolveJarPath(ctx) {
     return null;
   }
 }
-async function resolveJavaBinary(ctx) {
-  const jreDir = import_path.default.join(ctx.globalDir, "runtimes", "java-17");
-  const javaBin = import_path.default.join(jreDir, "bin", "java");
-  try {
-    await import_promises.default.access(javaBin);
-    return javaBin;
-  } catch {
-  }
-  if (process.env.JAVA_HOME) {
-    const javaHome = import_path.default.join(process.env.JAVA_HOME, "bin", "java");
-    try {
-      await import_promises.default.access(javaHome);
-      return javaHome;
-    } catch {
-    }
-  }
-  return "java";
-}
 function generateScalastyleConfig(patterns) {
   const checks = [];
   for (const pattern of patterns) {
@@ -1127,6 +1109,7 @@ var REQUIRES_USER_PARAMS = /* @__PURE__ */ new Set([
 var CONFIG_FILE_CANDIDATES = ["scalastyle_config.xml", "scalastyle-config.xml"];
 var adapter = {
   ...descriptor,
+  patternsMetadata: patterns_default,
   compatibleVersions: ">=1.0.0",
   website: "http://www.scalastyle.org/",
   prerequisites: [
@@ -1146,27 +1129,19 @@ var adapter = {
    */
   async checkAvailability(ctx) {
     ctx.logger.debug("Checking availability", { toolId: TOOL_ID });
-    const javaInfo = await (0, import_tooling.findJava)(JAVA_VERSION_RANGE, ctx.logger).catch(() => null);
-    const dependencies = javaInfo ? [{ name: "Java", available: true, version: javaInfo.version, installation: "global" }] : [{ name: "Java", available: false, reason: `Java (${JAVA_VERSION_RANGE}) not found` }];
+    const { java: javaInfo, dependency: javaDep } = await (0, import_tooling.checkJavaRuntime)(
+      ctx.globalDir,
+      JAVA_VERSION_RANGE,
+      ctx.logger
+    );
+    const dependencies = [javaDep];
     if (!javaInfo) {
-      const jreDir = import_path.default.join(ctx.globalDir, "runtimes", "java-17");
-      const javaBin = import_path.default.join(jreDir, "bin", "java");
-      try {
-        await import_promises.default.access(javaBin);
-        dependencies[0] = {
-          name: "Java",
-          available: true,
-          version: "17",
-          installation: "codacy"
-        };
-      } catch {
-        return {
-          available: false,
-          reason: "Java runtime not found (required for Scalastyle)",
-          installHint: "Install JDK 8+, or run with --install-dependencies for auto-download",
-          dependencies
-        };
-      }
+      return {
+        available: false,
+        reason: "Java runtime not found (required for Scalastyle)",
+        installHint: "Install JDK 8+, or run with --install-dependencies for auto-download",
+        dependencies
+      };
     }
     const jarPath = await resolveJarPath(ctx);
     if (jarPath) {
@@ -1279,7 +1254,8 @@ var adapter = {
       return (0, import_tooling.buildResult)(TOOL_ID, startedAt, /* @__PURE__ */ new Date(), issues, errors, 0);
     }
     const useLocal = codacyConfig.useLocalConfigurationFile && codacyConfig.localConfigurationFile;
-    const javaBin = await resolveJavaBinary(ctx);
+    const resolved = await (0, import_tooling.resolveJava)(ctx.globalDir, JAVA_VERSION_RANGE, ctx.logger);
+    const javaBin = resolved?.path ?? "java";
     const jarPath = await resolveJarPath(ctx);
     if (!jarPath) {
       errors.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codacy/tools-scalastyle-1",
-  "version": "0.3.5",
+  "version": "0.4.1",
   "description": "Scalastyle adapter — CLI-mode Scala style checker",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,7 +9,7 @@
   ],
   "dependencies": {
     "fast-xml-parser": "^4.5.0",
-    "@codacy/tooling": "0.6.2"
+    "@codacy/tooling": "0.8.0"
   },
   "license": "MIT",
   "author": "Codacy <support@codacy.com> (https://www.codacy.com)",