File tree 4 files changed +17
-11
lines changed
4 files changed +17
-11
lines changed Original file line number Diff line number Diff line change 37
37
- name : Download Java formatter
38
38
if : inputs.type != 'minimal'
39
39
shell : bash
40
- 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
40
+ 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
41
41
42
42
# JavaScript for monorepo and tooling
43
43
- name : Install Node
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ RUN apk -U add openjdk11 jq bash perl build-base python3
8
8
ENV JAVA_HOME=/usr/lib/jvm/default-jvm
9
9
10
10
# Java formatter
11
- 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
11
+ 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
12
12
13
13
# PHP dependencies
14
14
RUN apk add -U composer php8 php8-tokenizer php8-dom php8-xml php8-xmlwriter
Original file line number Diff line number Diff line change 35
35
" openapitools.json"
36
36
],
37
37
"matchStrings" : [
38
- " \\ s\" version\" : \" (?<currentValue>.*? )\" ,?\\ s"
38
+ " \\ s\" version\" : \" (?<currentValue>.*)\" ,?\\ s"
39
39
],
40
40
"depNameTemplate" : " org.openapitools:openapi-generator-cli" ,
41
41
"datasourceTemplate" : " maven"
46
46
" package.mustache"
47
47
],
48
48
"matchStrings" : [
49
- " \\ s\" (?<depName>.*? )\" : \" (?<currentValue>.*? )\" ,?\\ s"
49
+ " \\ s\" (?<depName>.*)\" : \" (?<currentValue>.*)\" ,?\\ s"
50
50
],
51
51
"datasourceTemplate" : " npm"
52
+ },
53
+ {
54
+ "description" : " Update the java formatter" ,
55
+ "fileMatch" : [
56
+ " Dockerfile" ,
57
+ " .github/actions/setup/action.yml"
58
+ ],
59
+ "matchStrings" : [
60
+ " https://github.com/google/google-java-format/releases/download/v(?<currentValue>.*)/google-java-format-(?<currentValue>.*)-all-deps.jar"
61
+ ],
62
+ "depNameTemplate" : " google/google-java-format" ,
63
+ "datasourceTemplate" : " github-releases"
52
64
}
53
65
],
54
66
"ignorePaths" : [
Original file line number Diff line number Diff line change @@ -16,13 +16,7 @@ export async function formatter(
16
16
cmd = `yarn eslint --ext=ts,json ${ folder } --fix --no-error-on-unmatched-pattern` ;
17
17
break ;
18
18
case 'java' :
19
- cmd = `find ${ folder } -type f -name "*.java" | xargs java --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
20
- --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
21
- --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
22
- --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
23
- --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
24
- -jar /tmp/java-formatter.jar -r \
25
- && yarn prettier --write ${ folder } ` ;
19
+ cmd = `find ${ folder } -type f -name "*.java" | xargs java -jar /tmp/java-formatter.jar -r && yarn prettier --write ${ folder } ` ;
26
20
break ;
27
21
case 'php' :
28
22
await runComposerUpdate ( verbose ) ;
You can’t perform that action at this time.
0 commit comments