@@ -21,20 +21,6 @@ PLUME_SCRIPTS="$SCRIPT_DIR/.plume-scripts"
2121
2222status=0
2323
24- # # Code style and formatting
25- JAVA_VER=$( java -version 2>&1 | head -1 | cut -d' "' -f2 | sed ' /^1\./s///' | cut -d' .' -f1 | sed ' s/-ea//' | sed ' s/-beta//' )
26- if [ " ${JAVA_VER} " != " 8" ] && [ " ${JAVA_VER} " != " 11" ]; then
27- ./gradlew spotlessCheck --console=plain --warning-mode=all
28- fi
29- if grep -n -r --exclude-dir=build --exclude-dir=examples --exclude-dir=jtreg --exclude-dir=tests --exclude=" *.astub" --exclude=" *.tex" ' ^\(import static \|import .*\*;$\)' ; then
30- echo " Don't use static import or wildcard import"
31- exit 1
32- fi
33- make style-check --jobs=" $( getconf _NPROCESSORS_ONLN) "
34-
35- # # HTML legality
36- ./gradlew htmlValidate --console=plain --warning-mode=all
37-
3824# # Javadoc documentation
3925# Try twice in case of network lossage.
4026(./gradlew javadoc --console=plain --warning-mode=all || (sleep 60 && ./gradlew javadoc --console=plain --warning-mode=all)) || status=1
@@ -70,3 +56,17 @@ git diff --exit-code docs/manual/contributors.tex \
7056
7157# Check gradle tasks are configured properly
7258./gradlew tasks
59+
60+ # # Code style and formatting
61+ JAVA_VER=$( java -version 2>&1 | head -1 | cut -d' "' -f2 | sed ' /^1\./s///' | cut -d' .' -f1 | sed ' s/-ea//' | sed ' s/-beta//' )
62+ if [ " ${JAVA_VER} " != " 8" ] && [ " ${JAVA_VER} " != " 11" ]; then
63+ ./gradlew spotlessCheck --console=plain --warning-mode=all
64+ fi
65+ if grep -n -r --exclude-dir=build --exclude-dir=examples --exclude-dir=jtreg --exclude-dir=tests --exclude=" *.astub" --exclude=" *.tex" ' ^\(import static \|import .*\*;$\)' ; then
66+ echo " Don't use static import or wildcard import"
67+ exit 1
68+ fi
69+ make style-check --jobs=" $( getconf _NPROCESSORS_ONLN) "
70+
71+ # # HTML legality
72+ ./gradlew htmlValidate --console=plain --warning-mode=all
0 commit comments