diff --git a/build.gradle b/build.gradle index 74528235..cd7c131c 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'maven-publish' id 'idea' id 'codenarc' - id 'com.gradle.plugin-publish' version '0.10.0' + id 'com.gradle.plugin-publish' version '0.10.1' id 'checkstyle' } @@ -395,4 +395,16 @@ pluginBundle { groupId = 'com.devsoap.plugin' artifactId = 'gradle-vaadin-plugin' } -} \ No newline at end of file +} + + +/*********************************************************************************************************************** + * + * Misc. + * + **********************************************************************************************************************/ +wrapper { + gradleVersion = '5.6' + distributionUrl = distributionUrl.replace('bin', 'all') // Download sources +} + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7c4388a9..8d58bda4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/functionalTest/groovy/com/devsoap/plugin/tests/GradleVersionTest.groovy b/src/functionalTest/groovy/com/devsoap/plugin/tests/GradleVersionTest.groovy index 5fe0e7dd..b5842079 100644 --- a/src/functionalTest/groovy/com/devsoap/plugin/tests/GradleVersionTest.groovy +++ b/src/functionalTest/groovy/com/devsoap/plugin/tests/GradleVersionTest.groovy @@ -22,7 +22,7 @@ class GradleVersionTest extends IntegrationTest { @Parameterized.Parameters(name = "Gradle {0}") static Collection getGradleVersions() { - [ '5.6.2'] + [ '5.6.0'] } @Override diff --git a/src/main/groovy/com/devsoap/plugin/GradleVaadinPlugin.groovy b/src/main/groovy/com/devsoap/plugin/GradleVaadinPlugin.groovy index c37b11f3..286777ae 100644 --- a/src/main/groovy/com/devsoap/plugin/GradleVaadinPlugin.groovy +++ b/src/main/groovy/com/devsoap/plugin/GradleVaadinPlugin.groovy @@ -212,7 +212,7 @@ class GradleVaadinPlugin implements Plugin { Gradle gradle = project.gradle VersionNumber version = VersionNumber.parse(gradle.gradleVersion) - VersionNumber requiredVersion = new VersionNumber(5, 6, 2, null) + VersionNumber requiredVersion = new VersionNumber(5, 6, 0, null) if ( version.baseVersion < requiredVersion ) { throw new UnsupportedVersionException("Your gradle version ($version) is too old. " + "Plugin requires Gradle $requiredVersion+")