revert

Author: millotp

.github/actions/setup/action.yml

@@ -37,7 +37,7 @@ runs:
     - name: Download Java formatter
       if: inputs.type != 'minimal'
       shell: bash
-      run: curl --retry 3 -L "https://github.com/google/google-java-format/releases/download/v1.15.0/google-java-format-1.15.0-all-deps.jar" > /tmp/java-formatter.jar
+      run: curl --retry 3 -L "https://github.com/google/google-java-format/releases/download/v1.13.0/google-java-format-1.13.0-all-deps.jar" > /tmp/java-formatter.jar
 
     # JavaScript for monorepo and tooling
     - name: Install Node

Dockerfile

@@ -8,7 +8,7 @@ RUN apk -U add openjdk11 jq bash perl build-base python3
 ENV JAVA_HOME=/usr/lib/jvm/default-jvm
 
 # Java formatter
-ADD https://github.com/google/google-java-format/releases/download/v1.15.0/google-java-format-1.15.0-all-deps.jar /tmp/java-formatter.jar
+ADD https://github.com/google/google-java-format/releases/download/v1.13.0/google-java-format-1.13.0-all-deps.jar /tmp/java-formatter.jar
 
 # PHP dependencies
 RUN apk add -U composer php8 php8-tokenizer php8-dom php8-xml php8-xmlwriter

renovate.json

@@ -61,6 +61,23 @@
       ],
       "depNameTemplate": "google/google-java-format",
       "datasourceTemplate": "github-releases"
+    },
+    {
+      "description": "Update java packages in mustache files",
+      "fileMatch": "build.mustache",
+      "matchStrings": [
+        "testImplementation '(?<depName>.*):(?<currentValue>\\d.*?)'"
+      ],
+      "datasourceTemplate": "maven"
+    },
+    {
+      "description": "Update yarn version (won't work because we need to download the script but gives an alert at least)",
+      "fileMatch": ".yarnrc.yml",
+      "matchStrings": [
+        "yarnPath: .yarn/releases/yarn-(?<currentValue>.*?).cjs"
+      ],
+      "depNameTemplate": "yarnpkg/berry",
+      "datasourceTemplate": "github-releases"
     }
   ],
   "ignorePaths": [

scripts/formatter.ts

@@ -16,7 +16,13 @@ export async function formatter(
       cmd = `yarn eslint --ext=ts,json ${folder} --fix --no-error-on-unmatched-pattern`;
       break;
     case 'java':
-      cmd = `find ${folder} -type f -name "*.java" | xargs java -jar /tmp/java-formatter.jar -r && yarn prettier --write ${folder}`;
+      cmd = `find ${folder} -type f -name "*.java" | xargs java --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+        --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+        --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+        --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+        --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
+        -jar /tmp/java-formatter.jar -r \
+        && yarn prettier --write ${folder}`;
       break;
     case 'php':
       await runComposerUpdate(verbose);