From d5dad70de51157b55455c12d4b826db18fe9051e Mon Sep 17 00:00:00 2001 From: Mitchell Skaggs Date: Sun, 16 Jun 2019 13:31:58 -0500 Subject: [PATCH] Update Gradle wrapper and make tests use older Gradle version to test compatibility --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../groovy/net/fabricmc/loom/EmptyBuildFunctionalTest.groovy | 1 + .../groovy/net/fabricmc/loom/MixinBuildFunctionalTest.groovy | 3 ++- .../groovy/net/fabricmc/loom/SimpleBuildFunctionalTest.groovy | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c4486d4..ee69dd6 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.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/test/groovy/net/fabricmc/loom/EmptyBuildFunctionalTest.groovy b/src/test/groovy/net/fabricmc/loom/EmptyBuildFunctionalTest.groovy index 954565d..55a01a5 100644 --- a/src/test/groovy/net/fabricmc/loom/EmptyBuildFunctionalTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/EmptyBuildFunctionalTest.groovy @@ -37,6 +37,7 @@ class EmptyBuildFunctionalTest extends Specification { .withProjectDir(testProjectDir.root) .withArguments('build') .withPluginClasspath() + .withGradleVersion("5.1.1") .build() then: diff --git a/src/test/groovy/net/fabricmc/loom/MixinBuildFunctionalTest.groovy b/src/test/groovy/net/fabricmc/loom/MixinBuildFunctionalTest.groovy index 488dd2b..4ac2e90 100644 --- a/src/test/groovy/net/fabricmc/loom/MixinBuildFunctionalTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/MixinBuildFunctionalTest.groovy @@ -59,9 +59,10 @@ class MixinBuildFunctionalTest extends Specification { when: def result = GradleRunner.create() - .withPluginClasspath() .withProjectDir(testProjectDir.root) .withArguments('build') + .withPluginClasspath() + .withGradleVersion("5.1.1") .build() then: diff --git a/src/test/groovy/net/fabricmc/loom/SimpleBuildFunctionalTest.groovy b/src/test/groovy/net/fabricmc/loom/SimpleBuildFunctionalTest.groovy index f914260..9ff669e 100644 --- a/src/test/groovy/net/fabricmc/loom/SimpleBuildFunctionalTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/SimpleBuildFunctionalTest.groovy @@ -47,6 +47,7 @@ class SimpleBuildFunctionalTest extends Specification { .withProjectDir(testProjectDir.root) .withArguments('build') .withPluginClasspath() + .withGradleVersion("5.1.1") .build() then: