diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-05-05 02:21:49 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-05-05 02:21:49 +0800 |
| commit | aba834b0402479029aec7f710a92b20176d5b7c5 (patch) | |
| tree | 02e11a561c2ea02725851d40c6413d9d5b02ff21 /src/test/groovy/net | |
| parent | f0ec1b61ddfe6ee0bd7b5850fdfaac077bfe42f0 (diff) | |
| parent | 7ce072c47af8c5b336c36d0f22f6b44b24363f7c (diff) | |
| download | architectury-loom-aba834b0402479029aec7f710a92b20176d5b7c5.tar.gz architectury-loom-aba834b0402479029aec7f710a92b20176d5b7c5.tar.bz2 architectury-loom-aba834b0402479029aec7f710a92b20176d5b7c5.zip | |
Merge remote-tracking branch 'FabricMC/future/dev' into dev/future
# Conflicts:
# .github/workflows/test-push.yml
# src/main/java/net/fabricmc/loom/LoomGradleExtension.java
# src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
# src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
Diffstat (limited to 'src/test/groovy/net')
| -rw-r--r-- | src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy index ca14d073..4e60f381 100644 --- a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy @@ -28,8 +28,8 @@ import org.gradle.testkit.runner.BuildResult import org.gradle.testkit.runner.GradleRunner trait ProjectTestTrait { - final static String DEFAULT_GRADLE = "7.0-rc-2" - final static String PRE_RELEASE_GRADLE = "7.0" + final static String DEFAULT_GRADLE = "7.0" + final static String PRE_RELEASE_GRADLE = "7.1-20210504162620+0000" static File gradleHome = File.createTempDir() File testProjectDir = File.createTempDir() |