From 5315d3c5b24bcce47268ef8962c07aeb934b014b Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Sat, 9 Oct 2021 11:05:38 +0100
Subject: [PATCH] Run tests against Java 17 (#515)

* Run tests against Java 17

* Fix tests on J17
---
 .github/workflows/test-push.yml                        | 10 ++++------
 .../net/fabricmc/loom/test/LoomTestConstants.groovy    |  6 ++++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-push.yml b/.github/workflows/test-push.yml
index 1c82de5..f1c3b4e 100644
--- a/.github/workflows/test-push.yml
+++ b/.github/workflows/test-push.yml
@@ -5,12 +5,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gradle: [7.0.1]
-        java: [jdk16]
-        jvm: [hotspot]
+        version: [7.0.0-jdk16, 7.2-jdk17]
     runs-on: ubuntu-20.04
     container:
-      image: gradle:${{ matrix.gradle }}-${{ matrix.java }}
+      image: gradle:${{ matrix.version }}
       options: --user root
     steps:
       - uses: actions/checkout@v2
@@ -43,12 +41,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [jdk16]
+        version: [7.0.0-jdk16, 7.2-jdk17]
         test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }}
 
     runs-on: ubuntu-20.04
     container:
-      image: gradle:7.0.0-${{ matrix.java }}
+      image: gradle:${{ matrix.version }}
       options: --user root
 
     steps:
diff --git a/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy b/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy
index bb1a2ce..8b25e0c 100644
--- a/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy
@@ -24,9 +24,11 @@
 
 package net.fabricmc.loom.test
 
+import org.gradle.util.GradleVersion
+
 class LoomTestConstants {
-    public final static String DEFAULT_GRADLE = "7.0.1"
-    public final static String PRE_RELEASE_GRADLE = "7.4-20210929223033+0000"
+    public final static String DEFAULT_GRADLE = GradleVersion.current().getVersion()
+    public final static String PRE_RELEASE_GRADLE = "7.4-20211007220130+0000"
 
     public final static String[] STANDARD_TEST_VERSIONS = [DEFAULT_GRADLE, PRE_RELEASE_GRADLE]
 }