Renamed min java for test property to better reflect its purpose (#2917)
This commit is contained in:
parent
1579d59abd
commit
53c38ac8e4
|
@ -33,8 +33,8 @@ if (applyCodeCoverage) {
|
|||
apply from: "$rootDir/gradle/jacoco.gradle"
|
||||
}
|
||||
|
||||
if (project.hasProperty("minJavaVersionForTests")) {
|
||||
project.ext.release = project.getProperty("minJavaVersionForTests")
|
||||
if (project.hasProperty("minJavaVersionSupported")) {
|
||||
project.ext.release = project.getProperty("minJavaVersionSupported")
|
||||
} else {
|
||||
project.ext.release = JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
@ -171,7 +171,7 @@ project.afterEvaluate {
|
|||
}
|
||||
|
||||
def isJavaVersionAllowed(JavaVersion version) {
|
||||
if (project.hasProperty('minJavaVersionForTests') && project.getProperty('minJavaVersionForTests').compareTo(version) > 0) {
|
||||
if (project.hasProperty('minJavaVersionSupported') && project.getProperty('minJavaVersionSupported').compareTo(version) > 0) {
|
||||
return false
|
||||
}
|
||||
if (project.hasProperty('maxJavaVersionForTests') && project.getProperty('maxJavaVersionForTests').compareTo(version) < 0) {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
ext {
|
||||
minJavaVersionForTests = JavaVersion.VERSION_11
|
||||
minJavaVersionSupported = JavaVersion.VERSION_11
|
||||
}
|
||||
|
||||
apply from: "$rootDir/gradle/instrumentation.gradle"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
ext {
|
||||
minJavaVersionForTests = JavaVersion.VERSION_11
|
||||
minJavaVersionSupported = JavaVersion.VERSION_11
|
||||
}
|
||||
|
||||
apply from: "$rootDir/gradle/instrumentation.gradle"
|
||||
|
|
|
@ -4,7 +4,7 @@ ext {
|
|||
// we only need to run the Spock test itself under a single Java version, and the Spock test in
|
||||
// turn is parameterized and runs the test using different docker containers that run different
|
||||
// Java versions
|
||||
minJavaVersionForTests = JavaVersion.VERSION_11
|
||||
minJavaVersionSupported = JavaVersion.VERSION_11
|
||||
maxJavaVersionForTests = JavaVersion.VERSION_11
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue