Upgrade dependencies + Output codenarc version error (#330)

* Upgrade node-java-caller * Upgrade java-caller dependency to 3.2.0 (Now handles Mac M1) * Use MegaLinter beta * Build * Output issue when error colleting CodeNarc version * Output issue when error collecting CodeNarc version * build --------- Co-authored-by: Nicolas Vuillamy <nicolas.vuillamy@cloudity.com>
nvuillam · Nov 26, 2023 · 35d9d1e · 35d9d1e
1 parent a8ad083
commit 35d9d1e
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 47 deletions.
diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml
@@ -44,7 +44,7 @@ jobs:
       # Mega-Linter
       - name: Mega-Linter
         id: ml
-        uses: oxsecurity/megalinter/flavors/javascript@v7
+        uses: oxsecurity/megalinter/flavors/javascript@beta
         env:
           # All available variables are described in documentation
           # https://oxsecurity.github.io/megalinter/#configuration

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## UNRELEASED
 
+## [12.2.0] 2023-11-26
+
+- Upgrade java-caller dependency to 3.2.0 (Now handles Mac M1)
+- Output issue when error collecting CodeNarc version
+
 ## [12.1.2] 2023-11-23
 
 - Revert update that output json when not requested

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 ## UNRELEASED
 
+## [12.2.0] 2023-11-26
+
+- Upgrade java-caller dependency to 3.2.0 (Now handles Mac M1)
+- Output issue when error collecting CodeNarc version
+
+## [12.1.2] 2023-11-23
+
+- Revert update that output json when not requested
+
 ## [12.1.1] 2023-11-19
 
 - Upgrade node-java-caller to v3.1.1

diff --git a/lib/groovy-lint.js b/lib/groovy-lint.js
@@ -198,7 +198,7 @@ class NpmGroovyLint {
             const v = getNpmGroovyLintVersion();
 
             const codeNarcVersionLinter = await new NpmGroovyLint([process.execPath, "", "--codenarcargs", "-version"], {}).run();
-            const codeNarcVersionLines = [(await getSourceLines(codeNarcVersionLinter.codeNarcStdOut))[0]];
+            const codeNarcVersionLines = [(await getSourceLines(codeNarcVersionLinter.codeNarcStdOut || "Error collecting CodeNarc version"))[0]];
 
             const versions = [];
             versions.push(`npm-groovy-lint version ${v}`);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "glob": "^7.1.6",
     "import-fresh": "^3.2.1",
     "ip": "^1.1.5",
-    "java-caller": "^3.1.1",
+    "java-caller": "^3.2.0",
     "js-yaml": "^4.1.0",
     "node-sarif-builder": "^2.0.3",
     "optionator": "^0.8.3",