upgrade to Gradle 6.6 (#54)

* to be able to use `--configuration-cache` in tests
* because APIs changed again, see `forUseAtConfigurationTime()`

Signed-off-by: Andreas Schmid <[email protected]>

Author: aaschmid

README.md

@@ -53,7 +53,7 @@ Explanation: v2.0 removes deprecated rendering API (= `net.sourceforge.pmd.cpd.R
 | [v2.0][]       | 4.10.3 - 5.5 | >= 6.1.0    | >= 8   |
 | [v3.0][]       | 5.6 - 5.x    | >= 6.10.0   | >= 8   |
 | [v3.1][]       | >= 5.6       | >= 6.10.0   | >= 8   |
-| [v3.2][]       | >= 6.1       | >= 6.10.0   | >= 8   |
+| [v3.2][]       | >= 6.6       | >= 6.10.0   | >= 8   |
 
 ¹: Java version may additionally depend on [PMD][]s version which is might not be properly reflected here.
 
@@ -160,7 +160,7 @@ source = subprojects*.sourceSets*.main*.java*.srcDirs
 or
 ```groovy
 source = subprojects*.sourceSets*.main*.java*.srcDirs + subprojects*.sourceSets*.test*.java*.srcDirs
-``` 
+```
 or
 ```groovy
 cpdCheck {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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
 
@@ -175,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" "$@"

src/main/java/de/aaschmid/gradle/plugins/cpd/Cpd.java

@@ -169,7 +169,7 @@ private List<Report> createReportParameters(CpdReports reports) {
     String getEncodingOrFallback() {
         String encoding = getEncoding();
         if (encoding == null) {
-            encoding = providerFactory.systemProperty("file.encoding").get();
+            encoding = providerFactory.systemProperty("file.encoding").forUseAtConfigurationTime().get();
         }
         return encoding;
     }

src/test/java/de/aaschmid/gradle/plugins/cpd/test/PropertyUtils.java

@@ -4,20 +4,21 @@
 
 import org.gradle.api.internal.provider.DefaultListProperty;
 import org.gradle.api.internal.provider.DefaultProperty;
+import org.gradle.api.internal.provider.PropertyHost;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
 
 public class PropertyUtils {
 
     public static <T> Property<T> property(T t) {
         @SuppressWarnings("unchecked")
-        Property<T> property = new DefaultProperty<T>((Class<T>) t.getClass());
+        Property<T> property = new DefaultProperty<T>(PropertyHost.NO_OP, (Class<T>) t.getClass());
         property.set(t);
         return property;
     }
 
     public static <T> ListProperty<T> listProperty(Class<T> clazz, List<T> list) {
-        ListProperty<T> listProperty = new DefaultListProperty<>(clazz);
+        ListProperty<T> listProperty = new DefaultListProperty<>(PropertyHost.NO_OP, clazz);
         listProperty.set(list);
         return listProperty;
     }