From f31141d3bb95b92c3f25f015df1c3ac7db736bca Mon Sep 17 00:00:00 2001 From: Balachandran Sivakumar Date: Thu, 8 Oct 2015 00:42:08 +0530 Subject: [PATCH 1/2] 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 From f11d651a92b61a89e5eec049f6675f7bda058c93 Mon Sep 17 00:00:00 2001 From: Balachandran Sivakumar Date: Thu, 8 Oct 2015 09:18:39 +0530 Subject: [PATCH 2/2] Moved common files to com.beust.kobalt package Moved files that were originally under com.beust.kobalt.plugin.java package to com.beust.kobalt package so that all plugins can access those classes. Most probably, we should subsequently move these to com.beust.kobalt.api or com.beust.kobalt.common package. --- src/main/kotlin/com/beust/kobalt/BuildScript.kt | 2 +- .../kotlin/com/beust/kobalt/{plugin/java => }/JavaInfo.kt | 2 +- src/main/kotlin/com/beust/kobalt/{plugin/java => }/Jvm.kt | 2 +- src/main/kotlin/com/beust/kobalt/Main.kt | 2 +- .../com/beust/kobalt/{plugin/java => }/SystemProperties.kt | 2 +- src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt | 4 ++-- src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt | 4 ++-- src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt | 4 ++-- src/main/kotlin/com/beust/kobalt/maven/LocalRepo.kt | 2 +- src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt | 2 +- src/main/kotlin/com/beust/kobalt/misc/KFiles.kt | 2 +- src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt | 3 +++ src/main/kotlin/com/beust/kobalt/wrapper/Wrapper.kt | 4 ++-- 13 files changed, 19 insertions(+), 16 deletions(-) rename src/main/kotlin/com/beust/kobalt/{plugin/java => }/JavaInfo.kt (96%) rename src/main/kotlin/com/beust/kobalt/{plugin/java => }/Jvm.kt (99%) rename src/main/kotlin/com/beust/kobalt/{plugin/java => }/SystemProperties.kt (93%) diff --git a/src/main/kotlin/com/beust/kobalt/BuildScript.kt b/src/main/kotlin/com/beust/kobalt/BuildScript.kt index 8e744ab3..88690a16 100644 --- a/src/main/kotlin/com/beust/kobalt/BuildScript.kt +++ b/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 diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaInfo.kt b/src/main/kotlin/com/beust/kobalt/JavaInfo.kt similarity index 96% rename from src/main/kotlin/com/beust/kobalt/plugin/java/JavaInfo.kt rename to src/main/kotlin/com/beust/kobalt/JavaInfo.kt index bf08eb08..4221110a 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaInfo.kt +++ b/src/main/kotlin/com/beust/kobalt/JavaInfo.kt @@ -1,4 +1,4 @@ -package com.beust.kobalt.plugin.java +package com.beust.kobalt import com.beust.kobalt.OperatingSystem diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/Jvm.kt b/src/main/kotlin/com/beust/kobalt/Jvm.kt similarity index 99% rename from src/main/kotlin/com/beust/kobalt/plugin/java/Jvm.kt rename to src/main/kotlin/com/beust/kobalt/Jvm.kt index d50e6de2..1bc16a41 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/Jvm.kt +++ b/src/main/kotlin/com/beust/kobalt/Jvm.kt @@ -1,4 +1,4 @@ -package com.beust.kobalt.plugin.java +package com.beust.kobalt import com.beust.kobalt.misc.KobaltLogger import com.beust.kobalt.maven.KobaltException diff --git a/src/main/kotlin/com/beust/kobalt/Main.kt b/src/main/kotlin/com/beust/kobalt/Main.kt index 484b33ef..cce98715 100644 --- a/src/main/kotlin/com/beust/kobalt/Main.kt +++ b/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 diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/SystemProperties.kt b/src/main/kotlin/com/beust/kobalt/SystemProperties.kt similarity index 93% rename from src/main/kotlin/com/beust/kobalt/plugin/java/SystemProperties.kt rename to src/main/kotlin/com/beust/kobalt/SystemProperties.kt index 549463f1..eb223589 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/SystemProperties.kt +++ b/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 diff --git a/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt b/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt index e753b389..badef0e8 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt +++ b/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) diff --git a/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt b/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt index b357cffc..7f6dccd2 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt +++ b/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) diff --git a/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt b/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt index 1dff75f4..42c038f9 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt +++ b/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.* diff --git a/src/main/kotlin/com/beust/kobalt/maven/LocalRepo.kt b/src/main/kotlin/com/beust/kobalt/maven/LocalRepo.kt index 06f80177..e91048e6 100644 --- a/src/main/kotlin/com/beust/kobalt/maven/LocalRepo.kt +++ b/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 diff --git a/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt b/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt index a6be2dbe..2d90cec9 100644 --- a/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt +++ b/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 diff --git a/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt b/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt index fc6b3001..faf591f2 100644 --- a/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt +++ b/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 diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt index eba9a749..39ed8033 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt +++ b/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 diff --git a/src/main/kotlin/com/beust/kobalt/wrapper/Wrapper.kt b/src/main/kotlin/com/beust/kobalt/wrapper/Wrapper.kt index 5d0f2c8c..b1e5d14f 100644 --- a/src/main/kotlin/com/beust/kobalt/wrapper/Wrapper.kt +++ b/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