erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Remove public.

Browse source
This commit is contained in:
Cedric Beust 2017-01-17 14:32:43 -08:00
parent 9a249c2a6c
commit 39d0e4e464
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/JavaInfo.kt
View file

@ -2,18 +2,18 @@ package com.beust.kobalt
import java.io.File import java.io.File
abstract public class JavaInfo { abstract class JavaInfo {
public var javaExecutable: File? = null var javaExecutable: File? = null
get() = findExecutable("java") get() = findExecutable("java")
public var javacExecutable: File? = null var javacExecutable: File? = null
get() = findExecutable("javac") get() = findExecutable("javac")
public var javadocExecutable: File? = null var javadocExecutable: File? = null
get() = findExecutable("javadoc") get() = findExecutable("javadoc")
abstract public var javaHome: File? abstract var javaHome: File?
abstract public var runtimeJar: File? abstract var runtimeJar: File?
abstract public var toolsJar: File? abstract var toolsJar: File?
abstract public fun findExecutable(command: String) : File abstract fun findExecutable(command: String) : File
companion object { companion object {
fun create(javaBase: File?): Jvm { fun create(javaBase: File?): Jvm {

10
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Jvm.kt
View file

@ -5,14 +5,14 @@ import com.beust.kobalt.misc.warn
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
public open class Jvm constructor( open class Jvm constructor(
val os: OperatingSystem, val os: OperatingSystem,
var javaBase: File? = null) : JavaInfo() { var javaBase: File? = null) : JavaInfo() {
private var _javaHome: File? = null private var _javaHome: File? = null
override public var javaHome: File? = null override var javaHome: File? = null
get() = _javaHome!! get() = _javaHome!!
override public var runtimeJar: File? = null override var runtimeJar: File? = null
private fun findRuntimeJar() : File? { private fun findRuntimeJar() : File? {
var runtimeJar = File(javaBase, "lib/rt.jar") var runtimeJar = File(javaBase, "lib/rt.jar")
if (runtimeJar.exists()) { if (runtimeJar.exists()) {
@ -21,7 +21,7 @@ public open class Jvm constructor(
runtimeJar = File(javaBase, "jre/lib/rt.jar") runtimeJar = File(javaBase, "jre/lib/rt.jar")
return if (runtimeJar.exists()) runtimeJar else null return if (runtimeJar.exists()) runtimeJar else null
} }
override public var toolsJar: File? = null override var toolsJar: File? = null
private var userSupplied: Boolean? = false private var userSupplied: Boolean? = false
private var javaVersion: String? = null private var javaVersion: String? = null
@ -89,7 +89,7 @@ public open class Jvm constructor(
return null return null
} }
// open public fun isIbmJvm(): Boolean { // open fun isIbmJvm(): Boolean {
// return false // return false
// } // }