Add Gradle Version Tests (FG4) (#753)

Author: AterAnimAvis

src/common/java/net/minecraftforge/gradle/common/util/Utils.java

@@ -39,6 +39,7 @@
 import org.gradle.api.Task;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.TaskProvider;
+import org.gradle.util.GradleVersion;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -90,6 +91,7 @@
 
 public class Utils {
     private static final boolean ENABLE_TEST_CERTS = Boolean.parseBoolean(System.getProperty("net.minecraftforge.gradle.test_certs", "true"));
+    private static final boolean ENABLE_TEST_GRADLE = Boolean.parseBoolean(System.getProperty("net.minecraftforge.gradle.test_gradle", "true"));
     private static final boolean ENABLE_TEST_JAVA  = Boolean.parseBoolean(System.getProperty("net.minecraftforge.gradle.test_java", "true"));
 
     public static final Gson GSON = new GsonBuilder()
@@ -512,23 +514,46 @@ public static final String capitalize(@Nonnull final String toCapitalize) {
         return toCapitalize.length() > 1 ? toCapitalize.substring(0, 1).toUpperCase() + toCapitalize.substring(1) : toCapitalize;
     }
 
-    public static void checkJavaRange( @Nullable JavaVersionParser.JavaVersion minVersionInclusive, @Nullable JavaVersionParser.JavaVersion maxVersionExclusive) {
-        JavaVersionParser.JavaVersion currentJavaVersion = JavaVersionParser.getCurrentJavaVersion();
-        if (minVersionInclusive != null && currentJavaVersion.compareTo(minVersionInclusive) < 0)
-            throw new RuntimeException(String.format("Found java version %s. Minimum required is %s.", currentJavaVersion, minVersionInclusive));
-        if (maxVersionExclusive != null && currentJavaVersion.compareTo(maxVersionExclusive) >= 0)
-            throw new RuntimeException(String.format("Found java version %s. Versions %s and newer are not supported yet.", currentJavaVersion, maxVersionExclusive));
+    public static void checkJavaRange(@Nullable JavaVersionParser.JavaVersion minVersionInclusive, @Nullable JavaVersionParser.JavaVersion maxVersionExclusive) {
+        checkRange("java", JavaVersionParser.getCurrentJavaVersion(), minVersionInclusive, maxVersionExclusive, "");
     }
 
+    public static void checkGradleRange(@Nullable GradleVersion minVersionInclusive, @Nullable GradleVersion maxVersionExclusive) {
+        checkRange("Gradle", GradleVersion.current(), minVersionInclusive, maxVersionExclusive, "\nNote: Upgrade your gradle version first before trying to switch to FG4.");
+    }
+
+    private static <T> void checkRange(String name, Comparable<T> current, @Nullable T minVersionInclusive, @Nullable T maxVersionExclusive, String additional) {
+        if (minVersionInclusive != null && current.compareTo(minVersionInclusive) < 0)
+            throw new RuntimeException(String.format("Found %s version %s. Minimum required is %s.%s", name, current, minVersionInclusive, additional));
+
+        if (maxVersionExclusive != null && current.compareTo(maxVersionExclusive) >= 0)
+            throw new RuntimeException(String.format("Found %s version %s. Versions %s and newer are not supported yet.", name, current, maxVersionExclusive));
+    }
+
+    /**
+     * @deprecated To be removed in FG 4.2, see {@link #checkEnvironment()}
+     */
+    @Deprecated
     public static void checkJavaVersion() {
+        checkEnvironment();
+    }
+
+    public static void checkEnvironment() {
         if (ENABLE_TEST_JAVA) {
             checkJavaRange(
-                // Mininum must be update 101 as it's the first one to include Let's Encrypt certificates.
+                // Minimum must be update 101 as it's the first one to include Let's Encrypt certificates.
                 JavaVersionParser.parseJavaVersion("1.8.0_101"),
                 null //TODO: Add JDK range check to MCPConfig?
             );
         }
 
+        if (ENABLE_TEST_GRADLE) {
+            checkGradleRange(
+                GradleVersion.version("6.8.1"),
+                null
+            );
+        }
+
         if (ENABLE_TEST_CERTS) {
             testServerConnection(FORGE_MAVEN);
             testServerConnection(MOJANG_MAVEN);

src/patcher/java/net/minecraftforge/gradle/patcher/PatcherPlugin.java

@@ -84,7 +84,7 @@ public class PatcherPlugin implements Plugin<Project> {
 
     @Override
     public void apply(@Nonnull Project project) {
-        Utils.checkJavaVersion();
+        Utils.checkEnvironment();
 
         final PatcherExtension extension = project.getExtensions().create(PatcherExtension.class, PatcherExtension.EXTENSION_NAME, PatcherExtension.class, project);
         if (project.getPluginManager().findPlugin("java") == null) {

src/userdev/java/net/minecraftforge/gradle/userdev/UserDevPlugin.java

@@ -60,7 +60,7 @@ public class UserDevPlugin implements Plugin<Project> {
 
     @Override
     public void apply(@Nonnull Project project) {
-        Utils.checkJavaVersion();
+        Utils.checkEnvironment();
 
         @SuppressWarnings("unused")
         final Logger logger = project.getLogger();