From 5d9263eda9135ae1475e507597cb79203b0cd89b Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 19 Jan 2017 10:24:25 -0800 Subject: [PATCH] Warnings. --- .../src/main/kotlin/com/beust/kobalt/JavaInfo.kt | 6 +++--- .../src/main/kotlin/com/beust/kobalt/Jvm.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/JavaInfo.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/JavaInfo.kt index aad489b4..3c957454 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/JavaInfo.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/JavaInfo.kt @@ -3,11 +3,11 @@ package com.beust.kobalt import java.io.File abstract class JavaInfo { - var javaExecutable: File? = null + val javaExecutable: File? get() = findExecutable("java") - var javacExecutable: File? = null + val javacExecutable: File? get() = findExecutable("javac") - var javadocExecutable: File? = null + val javadocExecutable: File? get() = findExecutable("javadoc") abstract var javaHome: File? abstract var runtimeJar: File? diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Jvm.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Jvm.kt index f11ee9d2..598ca401 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Jvm.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Jvm.kt @@ -97,7 +97,7 @@ open class Jvm constructor( if (javaHome != null) { val jdkHome = if (javaHome!!.endsWith("jre")) javaHome!!.parentFile else javaHome val exec = File(jdkHome, "bin/" + command) - var executable = File(os.getExecutableName(exec.absolutePath)) + val executable = File(os.getExecutableName(exec.absolutePath)) if (executable.isFile) { return executable }