Update gradle to 6.0 and validate gradle wrapper

See: https://github.com/gradle/wrapper-validation-action

Author: jameshilliard

.github/workflows/gradle-wrapper-validation.yml

@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1

.travis.yml

@@ -9,6 +9,9 @@ env:
   - TEST_CATEGORY=fullCompileTests
   - TEST_CATEGORY=runProjectTests
   - TEST_CATEGORY=proxyTest
+before_script:
+  - echo $JAVA_OPTS
+  - export JAVA_OPTS=-Xmx4G
 script: "./gradlew --stacktrace check -PTEST_CATEGORY=$TEST_CATEGORY"
 branches:
   only:

build.gradle

@@ -62,7 +62,7 @@ sourceSets {
         resources {
             srcDir file('src/functionalTest/resources')
         }
-        compileClasspath += sourceSets.main.output + configurations.testRuntime
+        compileClasspath += sourceSets.main.output + configurations.testRuntimeClasspath
         runtimeClasspath += output + compileClasspath
     }
 }
@@ -129,7 +129,7 @@ idea {
  * Compiles the tests
  */
 compileFunctionalTestGroovy {
-    classpath += configurations.proxyTest
+    classpath += configurations.proxyTest + configurations.testRuntimeClasspath
 }
 
 /**
@@ -154,6 +154,7 @@ processResources {
             ])
         }
     }
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
 
 
@@ -404,7 +405,7 @@ pluginBundle {
  *
  **********************************************************************************************************************/
 wrapper {
-    gradleVersion = '5.6'
+    gradleVersion = '6.0'
     distributionUrl = distributionUrl.replace('bin', 'all') // Download sources
 }
 

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -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" "$@"

gradlew

@@ -22,7 +22,7 @@ class GradleVersionTest extends IntegrationTest {
 
     @Parameterized.Parameters(name = "Gradle {0}")
     static Collection<String> getGradleVersions() {
-        [ '5.6']
+        [ '6.0']
     }
 
     @Override

src/functionalTest/groovy/com/devsoap/plugin/tests/GradleVersionTest.groovy

@@ -28,7 +28,7 @@ class KotlinTest extends KotlinIntegrationTest {
 
     @Parameterized.Parameters(name = "Kotlin {0}")
     static Collection<String> getKotlinVersions() {
-        [ '1.3.11']
+        [ '1.3.70']
     }
 
     @Test void 'Create project'() {

src/functionalTest/groovy/com/devsoap/plugin/tests/KotlinTest.groovy

@@ -212,7 +212,7 @@ class GradleVaadinPlugin implements Plugin<Project> {
 
         Gradle gradle = project.gradle
         VersionNumber version = VersionNumber.parse(gradle.gradleVersion)
-        VersionNumber requiredVersion = new VersionNumber(5, 6, 0, null)
+        VersionNumber requiredVersion = new VersionNumber(6, 0, 0, null)
         if ( version.baseVersion < requiredVersion ) {
             throw new UnsupportedVersionException("Your gradle version ($version) is too old. " +
                     "Plugin requires Gradle $requiredVersion+")

src/main/groovy/com/devsoap/plugin/GradleVaadinPlugin.groovy

@@ -20,6 +20,7 @@ import com.devsoap.plugin.Util
 import org.gradle.api.file.FileCollection
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
+import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.bundling.Jar
 
 /**
@@ -32,6 +33,7 @@ class BuildClassPathJar extends Jar {
 
     public static final String NAME = 'vaadinClassPathJar'
 
+    @Input
     private final Property<Boolean> useClassPathJar = project.objects.property(Boolean)
 
     BuildClassPathJar() {
@@ -51,7 +53,7 @@ class BuildClassPathJar extends Jar {
                 project.configurations[GradleVaadinPlugin.CONFIGURATION_RUN_SERVER] +
                 project.configurations[GradleVaadinPlugin.CONFIGURATION_THEME]
                 )
-                .filter { it.file && it.canonicalFile.name.endsWith('.jar')}
+                .filter { it.file && it.canonicalFile.name.endsWith('.jar') }
         manifest {
             it.attributes('Class-Path':files.collect { File file -> file.toURI().toString() }.join(' '))
         }