diff --git a/src/main/kotlin/com/beust/kobalt/BasePluginTask.kt b/src/main/kotlin/com/beust/kobalt/BasePluginTask.kt index 99f43d28..e54d73f5 100644 --- a/src/main/kotlin/com/beust/kobalt/BasePluginTask.kt +++ b/src/main/kotlin/com/beust/kobalt/BasePluginTask.kt @@ -3,7 +3,7 @@ package com.beust.kobalt import com.beust.kobalt.api.IPlugin import com.beust.kobalt.api.PluginTask import com.beust.kobalt.api.Project -import com.beust.kobalt.internal.TaskResult +import com.beust.kobalt.TaskResult import com.beust.kobalt.internal.TaskResult2 public abstract class BasePluginTask(override val plugin: IPlugin, diff --git a/src/main/kotlin/com/beust/kobalt/Plugins.kt b/src/main/kotlin/com/beust/kobalt/Plugins.kt index 60fabc7e..54046db5 100644 --- a/src/main/kotlin/com/beust/kobalt/Plugins.kt +++ b/src/main/kotlin/com/beust/kobalt/Plugins.kt @@ -4,7 +4,7 @@ import com.beust.kobalt.api.* import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.internal.PluginInfo import com.beust.kobalt.internal.TaskManager -import com.beust.kobalt.internal.TaskResult +import com.beust.kobalt.TaskResult import com.beust.kobalt.maven.DepFactory import com.beust.kobalt.maven.IClasspathDependency import com.beust.kobalt.maven.KobaltException diff --git a/src/main/kotlin/com/beust/kobalt/TaskResult.kt b/src/main/kotlin/com/beust/kobalt/TaskResult.kt new file mode 100644 index 00000000..4d6a45f3 --- /dev/null +++ b/src/main/kotlin/com/beust/kobalt/TaskResult.kt @@ -0,0 +1,3 @@ +package com.beust.kobalt + +open public class TaskResult(val success: Boolean = true, val errorMessage: String? = null) diff --git a/src/main/kotlin/com/beust/kobalt/api/IPlugin.kt b/src/main/kotlin/com/beust/kobalt/api/IPlugin.kt index d2d36207..1cde0b6c 100644 --- a/src/main/kotlin/com/beust/kobalt/api/IPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/api/IPlugin.kt @@ -3,7 +3,7 @@ package com.beust.kobalt.api import com.beust.kobalt.BasePluginTask import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.internal.TaskManager -import com.beust.kobalt.internal.TaskResult +import com.beust.kobalt.TaskResult import com.beust.kobalt.internal.TaskResult2 import java.lang.reflect.Method import java.util.* diff --git a/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt b/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt index 7875ffc4..c11a1830 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt @@ -1,5 +1,6 @@ package com.beust.kobalt.internal +import com.beust.kobalt.TaskResult import com.beust.kobalt.misc.NamedThreadFactory import com.beust.kobalt.misc.log import com.beust.kobalt.misc.* diff --git a/src/main/kotlin/com/beust/kobalt/internal/JvmCompiler.kt b/src/main/kotlin/com/beust/kobalt/internal/JvmCompiler.kt index 5c7d3a6a..17ed498d 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/JvmCompiler.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/JvmCompiler.kt @@ -1,5 +1,6 @@ package com.beust.kobalt.internal +import com.beust.kobalt.TaskResult import com.beust.kobalt.api.IClasspathContributor import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.Project diff --git a/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt b/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt index ba2f3dbb..d6221160 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt @@ -1,5 +1,6 @@ package com.beust.kobalt.internal +import com.beust.kobalt.TaskResult import com.beust.kobalt.api.BasePlugin import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.Project diff --git a/src/main/kotlin/com/beust/kobalt/internal/RunnableTask.kt b/src/main/kotlin/com/beust/kobalt/internal/RunnableTask.kt deleted file mode 100644 index ad93be6e..00000000 --- a/src/main/kotlin/com/beust/kobalt/internal/RunnableTask.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.beust.kobalt.internal - -import com.beust.kobalt.Plugins -import com.beust.kobalt.api.BasePlugin -import com.beust.kobalt.maven.KobaltException -import java.lang.reflect.Method -import java.util.concurrent.Callable - -open public class TaskResult(val success: Boolean = true, val errorMessage: String? = null) diff --git a/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt b/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt index d2c3f57e..56f0c3b7 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt @@ -3,6 +3,7 @@ package com.beust.kobalt.internal import com.beust.kobalt.Args import com.beust.kobalt.AsciiArt import com.beust.kobalt.Plugins +import com.beust.kobalt.TaskResult import com.beust.kobalt.api.PluginTask import com.beust.kobalt.api.Project import com.beust.kobalt.maven.KobaltException diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt index 5360db76..8b835ec6 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt @@ -6,7 +6,7 @@ import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.homeDir import com.beust.kobalt.internal.JvmCompilerPlugin -import com.beust.kobalt.internal.TaskResult +import com.beust.kobalt.TaskResult import com.beust.kobalt.maven.FileDependency import com.beust.kobalt.maven.IClasspathDependency import com.beust.kobalt.maven.MavenId diff --git a/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt index 8af4dbbc..eebfa3b0 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt @@ -7,7 +7,7 @@ import com.beust.kobalt.api.BasePlugin import com.beust.kobalt.api.Project import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.api.annotation.Task -import com.beust.kobalt.internal.TaskResult +import com.beust.kobalt.TaskResult import com.beust.kobalt.maven.KobaltException import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.RunCommand diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt index 279be7de..3cbc1107 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt @@ -7,7 +7,7 @@ import com.beust.kobalt.api.Project import com.beust.kobalt.internal.CompilerActionInfo import com.beust.kobalt.internal.ICompilerAction import com.beust.kobalt.internal.JvmCompiler -import com.beust.kobalt.internal.TaskResult +import com.beust.kobalt.TaskResult import com.beust.kobalt.maven.IClasspathDependency import com.beust.kobalt.misc.log import com.google.inject.Inject 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 6cfd288f..acbff16b 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt @@ -8,7 +8,7 @@ import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.internal.JvmCompiler import com.beust.kobalt.internal.JvmCompilerPlugin -import com.beust.kobalt.internal.TaskResult +import com.beust.kobalt.TaskResult import com.beust.kobalt.maven.DepFactory import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.LocalRepo diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt index 4128ad34..526f169e 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt @@ -6,7 +6,7 @@ import com.beust.kobalt.api.Project import com.beust.kobalt.internal.CompilerActionInfo import com.beust.kobalt.internal.ICompilerAction import com.beust.kobalt.internal.JvmCompiler -import com.beust.kobalt.internal.TaskResult +import com.beust.kobalt.TaskResult import com.beust.kobalt.maven.DepFactory import com.beust.kobalt.maven.FileDependency import com.beust.kobalt.maven.IClasspathDependency diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt index a09a9930..bd4be44b 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt @@ -5,7 +5,7 @@ import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.internal.JvmCompiler import com.beust.kobalt.internal.JvmCompilerPlugin -import com.beust.kobalt.internal.TaskResult +import com.beust.kobalt.TaskResult import com.beust.kobalt.maven.* import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KobaltExecutors diff --git a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt index f8cfe011..c21ad717 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt @@ -12,7 +12,7 @@ import com.beust.kobalt.api.annotation.ExportedProperty import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.glob import com.beust.kobalt.internal.JvmCompilerPlugin -import com.beust.kobalt.internal.TaskResult +import com.beust.kobalt.TaskResult import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.LocalRepo import com.beust.kobalt.misc.KFiles diff --git a/src/main/kotlin/com/beust/kobalt/plugin/publish/JCenterApi.kt b/src/main/kotlin/com/beust/kobalt/plugin/publish/JCenterApi.kt index 30e524c6..b00dabce 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/publish/JCenterApi.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/publish/JCenterApi.kt @@ -1,7 +1,7 @@ package com.beust.kobalt.plugin.publish import com.beust.kobalt.api.Project -import com.beust.kobalt.internal.TaskResult +import com.beust.kobalt.TaskResult import com.beust.kobalt.maven.Gpg import com.beust.kobalt.maven.Http import com.beust.kobalt.maven.KobaltException diff --git a/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt index b956736e..22ef0a61 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt @@ -5,7 +5,7 @@ import com.beust.kobalt.api.Kobalt import com.beust.kobalt.api.Project import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.api.annotation.Task -import com.beust.kobalt.internal.TaskResult +import com.beust.kobalt.TaskResult import com.beust.kobalt.maven.PomGenerator import com.beust.kobalt.misc.* import com.google.common.base.Preconditions