azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use project.findProperty instead of project.property where nullable is fine

Browse Source 
findProperty throws MissingPropertyException if there's no such property
This commit is contained in:
Alexander Udalov
2017-10-30 15:52:32 +01:00
parent ccd7bfa337
commit 959299eeab
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/build.gradle.kts
+3 -3
View File
@@ -101,7 +101,7 @@ fun Project.codegenTest(target: Int, jvm: Int,
} }
body() body()
doFirst { doFirst {
val jdkPath = project.property(jdk) ?: error("$jdk is not optional to run this test") val jdkPath = project.findProperty(jdk) ?: error("$jdk is not optional to run this test")
executable = "$jdkPath/bin/java" executable = "$jdkPath/bin/java"
println("Running test with $executable") println("Running test with $executable")
} }
@@ -111,12 +111,12 @@ fun Project.codegenTest(target: Int, jvm: Int,
codegenTest(target = 6, jvm = 6, jdk = "JDK_18") { codegenTest(target = 6, jvm = 6, jdk = "JDK_18") {
dependsOn(":compiler:tests-common-jvm6:build") dependsOn(":compiler:tests-common-jvm6:build")
val port = project.property("kotlin.compiler.codegen.tests.port")?.toString() ?: "5100" val port = project.findProperty("kotlin.compiler.codegen.tests.port")?.toString() ?: "5100"
var jdkProcess: Process? = null var jdkProcess: Process? = null
doFirst { doFirst {
logger.info("Configuring JDK 6 server...") logger.info("Configuring JDK 6 server...")
val jdkPath = project.property("JDK_16") ?: error("JDK_16 is not optional to run this test") val jdkPath = project.findProperty("JDK_16") ?: error("JDK_16 is not optional to run this test")
val executable = "$jdkPath/bin/java" val executable = "$jdkPath/bin/java"
val main = "org.jetbrains.kotlin.test.clientserver.TestProcessServer" val main = "org.jetbrains.kotlin.test.clientserver.TestProcessServer"