Skip to content

Commit 3170956

Browse files
committed
fix: Replace Groovy's getProperty by Project.findProperty
1 parent f1626ee commit 3170956

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

gradle/java_no_deps.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ if (project.hasProperty('minJavaVersionForTests') && project.findProperty('minJa
7777

7878
// In some cases we would like to avoid setting java version to `minJavaVersionForTests`.
7979
// For example we would like to be able to run profiling tests with ZULU8, but we cannot run it with other JDK8 implementations at the moment
80-
def skipSettingTestJavaVersion = project.hasProperty('skipSettingTestJavaVersion') && project.getProperty('skipSettingTestJavaVersion')
80+
def skipSettingTestJavaVersion = project.hasProperty('skipSettingTestJavaVersion') && project.findProperty('skipSettingTestJavaVersion')
8181
if (!skipSettingTestJavaVersion) {
8282
tasks.withType(JavaCompile).configureEach {
8383
if (it.name.toLowerCase().contains("test")) {
@@ -414,21 +414,21 @@ def isJavaVersionAllowedForProperty(JavaVersion version, String propertyPrefix =
414414
def maxProp = propertyPrefix.isEmpty() ? 'maxJavaVersionForTests' : "${propertyPrefix}MaxJavaVersionForTests"
415415
def definedMin = project.hasProperty(minProp)
416416
def definedMax = project.hasProperty(maxProp)
417-
if (definedMin && project.getProperty(minProp).compareTo(version) > 0) {
417+
if (definedMin && project.findProperty(minProp).compareTo(version) > 0) {
418418
logger.info("isJavaVersionAllowedForProperty is false b/o minProp=${minProp} is defined and greater than version=${version}")
419419
return false
420420
}
421421
//default to the general min if defined and specific one is was not defined
422-
if (!propertyPrefix.isEmpty() && !definedMin && project.hasProperty('minJavaVersionForTests') && project.getProperty('minJavaVersionForTests').compareTo(version) > 0) {
423-
logger.info("isJavaVersionAllowedForProperty is false b/o minJavaVersionForTests=${project.getProperty('minJavaVersionForTests')} is defined and greater than version=${version}")
422+
if (!propertyPrefix.isEmpty() && !definedMin && project.hasProperty('minJavaVersionForTests') && project.findProperty('minJavaVersionForTests').compareTo(version) > 0) {
423+
logger.info("isJavaVersionAllowedForProperty is false b/o minJavaVersionForTests=${project.findProperty('minJavaVersionForTests')} is defined and greater than version=${version}")
424424
return false
425425
}
426-
if (definedMax && project.getProperty(maxProp).compareTo(version) < 0) {
427-
logger.info("isJavaVersionAllowedForProperty is false b/o maxProp=${project.getProperty(maxProp)} is defined and lower than version=${version}")
426+
if (definedMax && project.findProperty(maxProp).compareTo(version) < 0) {
427+
logger.info("isJavaVersionAllowedForProperty is false b/o maxProp=${project.findProperty(maxProp)} is defined and lower than version=${version}")
428428
return false
429429
}
430-
if (!propertyPrefix.isEmpty() && !definedMax && project.hasProperty('maxJavaVersionForTests') && project.getProperty('maxJavaVersionForTests').compareTo(version) < 0) {
431-
logger.info("isJavaVersionAllowedForProperty is false b/o maxJavaVersionForTests=${project.getProperty('maxJavaVersionForTests')} is defined and lower than version=${version}")
430+
if (!propertyPrefix.isEmpty() && !definedMax && project.hasProperty('maxJavaVersionForTests') && project.findProperty('maxJavaVersionForTests').compareTo(version) < 0) {
431+
logger.info("isJavaVersionAllowedForProperty is false b/o maxJavaVersionForTests=${project.findProperty('maxJavaVersionForTests')} is defined and lower than version=${version}")
432432
return false
433433
}
434434
return true
@@ -444,11 +444,11 @@ def isJavaLanguageVersionAllowed(JavaLanguageVersion languageVersion, String tes
444444
}
445445

446446
def isJdkForced(String javaName) {
447-
return (project.hasProperty('forceJdk') && project.getProperty('forceJdk').any { it.equalsIgnoreCase(javaName) })
447+
return (project.hasProperty('forceJdk') && project.findProperty('forceJdk').any { it.equalsIgnoreCase(javaName) })
448448
}
449449

450450
def isJdkExcluded(String javaName) {
451-
return (project.hasProperty('excludeJdk') && project.getProperty('excludeJdk').any { it.equalsIgnoreCase(javaName) })
451+
return (project.hasProperty('excludeJdk') && project.findProperty('excludeJdk').any { it.equalsIgnoreCase(javaName) })
452452
}
453453

454454
def getJavaHomePath(String path) {

0 commit comments

Comments
 (0)