fix: rework sorting order of GrailsVersion to ensure the highest version comes first

Author: jdaugherty

grails-wrapper/src/main/java/grails/init/GrailsVersion.java

@@ -107,30 +107,30 @@ public int compareTo(GrailsVersion o) {
             return 0;
         }
 
-        if (releaseType != o.releaseType) {
-            return o.releaseType.ordinal() - releaseType.ordinal();
-        }
-
-        int majorCompare = Integer.compare(this.major, o.major);
+        int majorCompare = Integer.compare(o.major, this.major);
         if (majorCompare != 0) {
             return majorCompare;
         }
 
-        int minorCompare = Integer.compare(this.minor, o.minor);
+        int minorCompare = Integer.compare(o.minor, this.minor);
         if (minorCompare != 0) {
             return minorCompare;
         }
 
-        int patchCompare = Integer.compare(this.patch, o.patch);
+        int patchCompare = Integer.compare(o.patch, this.patch);
         if (patchCompare != 0) {
             return patchCompare;
         }
 
+        if (releaseType != o.releaseType) {
+            return releaseType.ordinal() - o.releaseType.ordinal();
+        }
+
         if (candidate == null) {
             return 0;
         }
 
-        return Integer.compare(this.candidate, o.candidate);
+        return Integer.compare(o.candidate, this.candidate);
     }
 
     @Override

grails-wrapper/src/test/groovy/grails/init/GrailsVersionSpec.groovy

@@ -49,27 +49,66 @@ class GrailsVersionSpec extends Specification {
 
     def "comparison checks"() {
         expect:
-        new GrailsVersion('7.0.0') < new GrailsVersion('7.0.1')
-        new GrailsVersion('7.0.1') > new GrailsVersion('7.0.0')
-        new GrailsVersion('7.0.0') < new GrailsVersion('7.1.0')
-        new GrailsVersion('8.0.0') > new GrailsVersion('7.0.0')
-        new GrailsVersion('7.0.0') > new GrailsVersion('7.0.0-SNAPSHOT')
-        new GrailsVersion('7.0.0') > new GrailsVersion('7.0.0-RC1')
-        new GrailsVersion('7.0.0') > new GrailsVersion('7.0.0-M1')
-        new GrailsVersion('7.0.0-RC1') > new GrailsVersion('7.0.0-M1')
-        new GrailsVersion('7.0.0-RC2') > new GrailsVersion('7.0.0-RC1')
-        new GrailsVersion('7.0.0-RC1') > new GrailsVersion('7.0.0-SNAPSHOT')
-        new GrailsVersion('7.0.0-M2') > new GrailsVersion('7.0.0-M1')
-        new GrailsVersion('7.0.0-M1') > new GrailsVersion('7.0.0-SNAPSHOT')
+        new GrailsVersion('7.0.0') > new GrailsVersion('7.0.1')
+        new GrailsVersion('7.0.1') < new GrailsVersion('7.0.0')
+        new GrailsVersion('7.0.0') > new GrailsVersion('7.1.0')
+        new GrailsVersion('8.0.0') < new GrailsVersion('7.0.0')
+        new GrailsVersion('7.0.0') < new GrailsVersion('7.0.0-SNAPSHOT')
+        new GrailsVersion('7.0.0') < new GrailsVersion('7.0.0-RC1')
+        new GrailsVersion('7.0.0') < new GrailsVersion('7.0.0-M1')
+        new GrailsVersion('7.0.0-RC1') < new GrailsVersion('7.0.0-M1')
+        new GrailsVersion('7.0.0-RC2') < new GrailsVersion('7.0.0-RC1')
+        new GrailsVersion('7.0.0-RC1') < new GrailsVersion('7.0.0-SNAPSHOT')
+        new GrailsVersion('7.0.0-M2') < new GrailsVersion('7.0.0-M1')
+        new GrailsVersion('7.0.0-M1') < new GrailsVersion('7.0.0-SNAPSHOT')
     }
 
     def "sorted"() {
         expect:
-        [new GrailsVersion('7.0.0'), new GrailsVersion('7.0.0-RC1'), new GrailsVersion('7.0.0-M1'), new GrailsVersion('7.0.0-SNAPSHOT')].sort() == [
-            new GrailsVersion('7.0.0-SNAPSHOT'),
-            new GrailsVersion('7.0.0-M1'),
-            new GrailsVersion('7.0.0-RC1'),
-            new GrailsVersion('7.0.0')
+        [
+                new GrailsVersion('8.0.0'),
+                new GrailsVersion('8.0.0-RC1'),
+                new GrailsVersion('8.0.0-M1'),
+                new GrailsVersion('8.0.0-SNAPSHOT'),
+                new GrailsVersion('7.1.1'),
+                new GrailsVersion('7.1.1-RC1'),
+                new GrailsVersion('7.1.1-M1'),
+                new GrailsVersion('7.1.1-SNAPSHOT'),
+                new GrailsVersion('7.1.0'),
+                new GrailsVersion('7.1.0-RC1'),
+                new GrailsVersion('7.1.0-M1'),
+                new GrailsVersion('7.1.0-SNAPSHOT'),
+                new GrailsVersion('7.0.1'),
+                new GrailsVersion('7.0.1-RC1'),
+                new GrailsVersion('7.0.1-M1'),
+                new GrailsVersion('7.0.1-SNAPSHOT'),
+                new GrailsVersion('7.0.0'),
+                new GrailsVersion('7.0.0-RC1'),
+                new GrailsVersion('7.0.0-M1'),
+                new GrailsVersion('7.0.0-SNAPSHOT'),
         ]
+        ==
+        [
+                new GrailsVersion('7.0.0'),
+                new GrailsVersion('7.0.0-RC1'),
+                new GrailsVersion('7.0.0-M1'),
+                new GrailsVersion('7.0.0-SNAPSHOT'),
+                new GrailsVersion('7.1.1'),
+                new GrailsVersion('7.1.1-RC1'),
+                new GrailsVersion('7.1.1-M1'),
+                new GrailsVersion('7.1.1-SNAPSHOT'),
+                new GrailsVersion('8.0.0'),
+                new GrailsVersion('8.0.0-RC1'),
+                new GrailsVersion('7.1.0'),
+                new GrailsVersion('7.1.0-RC1'),
+                new GrailsVersion('7.1.0-M1'),
+                new GrailsVersion('7.1.0-SNAPSHOT'),
+                new GrailsVersion('8.0.0-M1'),
+                new GrailsVersion('8.0.0-SNAPSHOT'),
+                new GrailsVersion('7.0.1'),
+                new GrailsVersion('7.0.1-RC1'),
+                new GrailsVersion('7.0.1-M1'),
+                new GrailsVersion('7.0.1-SNAPSHOT'),
+        ].sort()
     }
 }