diff --git a/build.gradle b/build.gradle index 49a4027..acc2bc6 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ ext { } wrapper { - gradleVersion = '5.4.1' + gradleVersion = '6.0.1' } sourceCompatibility = 1.8 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 91ca28c..cc4fdc2 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9c4d86b..1311a84 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Jun 15 01:03:29 CEST 2019 +#Sun Dec 01 16:07:11 CET 2019 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index cccdd3d..2fe81a7 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -109,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` @@ -138,19 +154,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -159,14 +175,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d..24467a1 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/src/main/groovy/com/github/alisiikh/scalastyle/ScalastyleCheckTask.groovy b/src/main/groovy/com/github/alisiikh/scalastyle/ScalastyleCheckTask.groovy index ea793f5..a351ec7 100644 --- a/src/main/groovy/com/github/alisiikh/scalastyle/ScalastyleCheckTask.groovy +++ b/src/main/groovy/com/github/alisiikh/scalastyle/ScalastyleCheckTask.groovy @@ -29,22 +29,21 @@ class ScalastyleCheckTask extends SourceTask { @PathSensitive(PathSensitivity.ABSOLUTE) @InputFile - Property config = project.objects.property(File) + final Property config = project.objects.property(File) - @PathSensitive(PathSensitivity.ABSOLUTE) @OutputFile - Property output = project.objects.property(File) + final Property output = project.objects.property(File) @Input - Property inputEncoding = project.objects.property(String) + final Property inputEncoding = project.objects.property(String) @Input - Property outputEncoding = project.objects.property(String) + final Property outputEncoding = project.objects.property(String) @Input - Property failOnWarning = project.objects.property(Boolean) + final Property failOnWarning = project.objects.property(Boolean) @Input - Property verbose = project.objects.property(Boolean) + final Property verbose = project.objects.property(Boolean) @Input - Property quiet = project.objects.property(Boolean) + final Property quiet = project.objects.property(Boolean) @TaskAction def run() { diff --git a/src/main/groovy/com/github/alisiikh/scalastyle/ScalastylePlugin.groovy b/src/main/groovy/com/github/alisiikh/scalastyle/ScalastylePlugin.groovy index c77d93a..f12d96a 100644 --- a/src/main/groovy/com/github/alisiikh/scalastyle/ScalastylePlugin.groovy +++ b/src/main/groovy/com/github/alisiikh/scalastyle/ScalastylePlugin.groovy @@ -69,14 +69,15 @@ class ScalastylePlugin implements Plugin { onlyIf { !shouldSkipTask.get() } source = sourceSet.scala.srcDirs - output = sourceSetConfig.output - config = resolveScalastyleConfig(sourceSetConfig, sourceSet.name) - failOnWarning = sourceSetConfig.failOnWarning.isPresent() ? - sourceSetConfig.failOnWarning : extension.failOnWarning - verbose = extension.verbose - quiet = extension.quiet - outputEncoding = extension.outputEncoding - inputEncoding = extension.inputEncoding + + output.set(sourceSetConfig.output) + config.set(resolveScalastyleConfig(sourceSetConfig, sourceSet.name)) + failOnWarning.set(sourceSetConfig.failOnWarning.isPresent() ? + sourceSetConfig.failOnWarning : extension.failOnWarning) + verbose.set(extension.verbose) + quiet.set(extension.quiet) + outputEncoding.set(extension.outputEncoding) + inputEncoding.set(extension.inputEncoding) } }