Skip to content

Commit 6a786a2

Browse files
committed
Fix GradleVersion forced-upgrade for minimum required JRE.
1 parent e386e93 commit 6a786a2

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.gradle.testkit.runner.BuildTask;
3030
import org.gradle.testkit.runner.GradleRunner;
3131
import org.gradle.testkit.runner.TaskOutcome;
32+
import org.gradle.util.GradleVersion;
3233
import org.junit.jupiter.api.BeforeEach;
3334

3435
import com.diffplug.common.base.Errors;
@@ -50,27 +51,35 @@ public enum GradleVersionSupport {
5051
final String version;
5152

5253
GradleVersionSupport(String version) {
54+
String minVersionForRunningJRE;
5355
switch (Jvm.version()) {
5456
case 20:
5557
case 19:
56-
case 18:
5758
// TODO: https://docs.gradle.org/current/userguide/compatibility.html
59+
case 18:
60+
minVersionForRunningJRE = "7.5";
61+
break;
5862
case 17:
59-
this.version = "7.3";
63+
minVersionForRunningJRE = "7.3";
6064
break;
6165
case 16:
62-
this.version = "7.0";
66+
minVersionForRunningJRE = "7.0";
6367
break;
6468
case 15:
65-
this.version = "6.7";
69+
minVersionForRunningJRE = "6.7";
6670
break;
6771
case 14:
68-
this.version = "6.3";
72+
minVersionForRunningJRE = "6.3";
6973
break;
7074
default:
71-
this.version = version;
75+
minVersionForRunningJRE = null;
7276
break;
7377
}
78+
if (minVersionForRunningJRE != null && GradleVersion.version(minVersionForRunningJRE).compareTo(GradleVersion.version(version)) > 0) {
79+
this.version = minVersionForRunningJRE;
80+
} else {
81+
this.version = version;
82+
}
7483
}
7584
}
7685

0 commit comments

Comments
 (0)