Skip to content

Commit eec0cb8

Browse files
authored
Merge pull request #119 from jsonschema2dataclass/groovy-7.0-test
Test on Gradle 7.x
2 parents 8e3faac + 36f7252 commit eec0cb8

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/test/groovy/com/github/js2d/TestUtils.groovy

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class TestUtils {
1515
* Supported gradle releases
1616
*/
1717
public static final List<String> GRADLE_RELEASES = [
18+
'7.0.2', '7.1', // 7.x
1819
'6.8.3', '6.8', '6.7.1', '6.6.1', '6.5.1', '6.4.1', '6.3', '6.2.2', '6.2.1', '6.1.1', '6.0.1', // 6.x
1920
]
2021

@@ -52,10 +53,13 @@ class TestUtils {
5253
}
5354

5455
def parts = gradleVersion.split(/\./)
56+
int major = parts[0].toInteger()
57+
int minor = parts[1].toInteger()
5558

5659
switch ((int) javaVersion) {
57-
case 14: return parts[1].toInteger() >= 3
58-
case 15: return parts[1].toInteger() >= 6
60+
case 14: return major >= 7 || (major == 6 && minor >= 3)
61+
case 15: return major >= 7 || (major == 6 && minor >= 6)
62+
case 16: return major >= 7
5963
default: return false // no official information on Gradle compatibility with further versions of Java
6064
}
6165
}

0 commit comments

Comments
 (0)