Merge pull request #13 from benignbala/master

Move OperatingSystem.kt from under the java plugin to top level.

src/main/kotlin/com/beust/kobalt/BuildScript.kt

@@ -6,7 +6,7 @@ import com.beust.kobalt.api.annotation.Directive
 import com.beust.kobalt.maven.DepFactory
 import com.beust.kobalt.maven.IClasspathDependency
 import com.beust.kobalt.misc.KobaltExecutors
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.SystemProperties
 import java.io.File
 
 @Directive

src/main/kotlin/com/beust/kobalt/JavaInfo.kt

@@ -1,4 +1,6 @@
-package com.beust.kobalt.plugin.java
+package com.beust.kobalt
+
+import com.beust.kobalt.OperatingSystem
 
 import java.io.File
 

src/main/kotlin/com/beust/kobalt/Jvm.kt

@@ -1,13 +1,14 @@
-package com.beust.kobalt.plugin.java
+package com.beust.kobalt
 
 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

src/main/kotlin/com/beust/kobalt/Main.kt

@@ -8,7 +8,7 @@ import com.beust.kobalt.kotlin.BuildFile
 import com.beust.kobalt.kotlin.ScriptCompiler
 import com.beust.kobalt.maven.*
 import com.beust.kobalt.misc.*
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.SystemProperties
 import com.beust.kobalt.plugin.publish.JCenterApi
 import com.beust.kobalt.plugin.publish.UnauthenticatedJCenterApi
 import com.beust.kobalt.wrapper.Wrapper

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.*

src/main/kotlin/com/beust/kobalt/SystemProperties.kt

@@ -1,4 +1,4 @@
-package com.beust.kobalt.plugin.java
+package com.beust.kobalt
 
 import java.util.concurrent.locks.ReentrantLock
 import javax.inject.Inject

src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt

@@ -4,8 +4,8 @@ import com.beust.kobalt.api.Project
 import com.beust.kobalt.maven.IClasspathDependency
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltLogger
-import com.beust.kobalt.plugin.java.JavaInfo
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.JavaInfo
+import com.beust.kobalt.SystemProperties
 import java.io.File
 
 abstract class GenericTestRunner(open val project: Project, open val classpath: List<IClasspathDependency>)

src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt

@@ -4,8 +4,8 @@ import com.beust.kobalt.api.Project
 import com.beust.kobalt.maven.IClasspathDependency
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltLogger
-import com.beust.kobalt.plugin.java.JavaInfo
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.JavaInfo
+import com.beust.kobalt.SystemProperties
 import java.io.File
 
 public class JUnitRunner(override val project: Project, override val classpath: List<IClasspathDependency>)

src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt

@@ -4,8 +4,8 @@ import com.beust.kobalt.api.Project
 import com.beust.kobalt.maven.IClasspathDependency
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltLogger
-import com.beust.kobalt.plugin.java.JavaInfo
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.JavaInfo
+import com.beust.kobalt.SystemProperties
 import java.io.File
 import java.util.*
 

src/main/kotlin/com/beust/kobalt/maven/LocalRepo.kt

@@ -3,7 +3,7 @@ package com.beust.kobalt.maven
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltLogger
 import com.beust.kobalt.misc.Versions
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.SystemProperties
 import java.io.File
 import java.util.Collections
 import javax.inject.Inject

src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt

@@ -2,7 +2,7 @@ package com.beust.kobalt.maven
 
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.misc.KobaltLogger
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.SystemProperties
 import com.google.common.base.Preconditions
 import com.google.inject.assistedinject.Assisted
 import org.apache.maven.model.Developer

src/main/kotlin/com/beust/kobalt/misc/KFiles.kt

@@ -4,7 +4,7 @@ import com.beust.kobalt.api.Kobalt
 import com.beust.kobalt.homeDir
 import com.beust.kobalt.kotlin.BuildFile
 import com.beust.kobalt.maven.KobaltException
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.SystemProperties
 import java.io.File
 import java.io.IOException
 import java.io.InputStream

src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt

@@ -11,6 +11,9 @@ import com.beust.kobalt.maven.*
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltExecutors
 import com.beust.kobalt.misc.KobaltLogger
+import com.beust.kobalt.JavaInfo
+import com.beust.kobalt.Jvm
+import com.beust.kobalt.SystemProperties
 import java.io.File
 import javax.inject.Inject
 import javax.inject.Singleton

src/main/kotlin/com/beust/kobalt/wrapper/Wrapper.kt

@@ -4,8 +4,8 @@ import com.beust.kobalt.maven.Http
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltLogger
 import com.beust.kobalt.misc.benchmark
-import com.beust.kobalt.plugin.java.JavaInfo
-import com.beust.kobalt.plugin.java.SystemProperties
+import com.beust.kobalt.JavaInfo
+import com.beust.kobalt.SystemProperties
 import java.io.File
 import java.io.FileReader
 import java.io.IOException