From f31141d3bb95b92c3f25f015df1c3ac7db736bca Mon Sep 17 00:00:00 2001 From: Balachandran Sivakumar Date: Thu, 8 Oct 2015 00:42:08 +0530 Subject: [PATCH] Move OperatingSystem.ky from under the java plugin to top level. Since Operating System class will be used by all plugins, it was preferable to have it in a top level package accessible by all plugins instead of just the java plugin. This is part of a bug where the Jvm and JavaInfo also needs moving to top level packages. --- .../com/beust/kobalt/{plugin/java => }/OperatingSystem.kt | 2 +- src/main/kotlin/com/beust/kobalt/plugin/java/JavaInfo.kt | 2 ++ src/main/kotlin/com/beust/kobalt/plugin/java/Jvm.kt | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) rename src/main/kotlin/com/beust/kobalt/{plugin/java => }/OperatingSystem.kt (99%) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/OperatingSystem.kt b/src/main/kotlin/com/beust/kobalt/OperatingSystem.kt similarity index 99% rename from src/main/kotlin/com/beust/kobalt/plugin/java/OperatingSystem.kt rename to src/main/kotlin/com/beust/kobalt/OperatingSystem.kt index 94228a07..d7647ba6 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/OperatingSystem.kt +++ b/src/main/kotlin/com/beust/kobalt/OperatingSystem.kt @@ -1,4 +1,4 @@ -package com.beust.kobalt.plugin.java +package com.beust.kobalt import java.io.File import java.util.* diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaInfo.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaInfo.kt index 8c4dbb89..bf08eb08 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaInfo.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaInfo.kt @@ -1,5 +1,7 @@ package com.beust.kobalt.plugin.java +import com.beust.kobalt.OperatingSystem + import java.io.File abstract public class JavaInfo { diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/Jvm.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/Jvm.kt index df94a5d0..d50e6de2 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/Jvm.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/java/Jvm.kt @@ -2,12 +2,13 @@ package com.beust.kobalt.plugin.java import com.beust.kobalt.misc.KobaltLogger import com.beust.kobalt.maven.KobaltException +import com.beust.kobalt.OperatingSystem import java.io.File import java.io.IOException import java.util.HashMap public open class Jvm constructor( - val os: com.beust.kobalt.plugin.java.OperatingSystem, + val os: com.beust.kobalt.OperatingSystem, var javaBase: File? = null) : JavaInfo(), KobaltLogger { private var _javaHome: File? = null