diff --git a/src/main/kotlin/com/beust/kobalt/Main.kt b/src/main/kotlin/com/beust/kobalt/Main.kt index 373a8985..ad055b98 100644 --- a/src/main/kotlin/com/beust/kobalt/Main.kt +++ b/src/main/kotlin/com/beust/kobalt/Main.kt @@ -2,8 +2,8 @@ package com.beust.kobalt import com.beust.jcommander.JCommander import com.beust.kobalt.api.Kobalt -import com.beust.kobalt.api.PluginInfo import com.beust.kobalt.api.Project +import com.beust.kobalt.internal.PluginInfo import com.beust.kobalt.internal.TaskManager import com.beust.kobalt.internal.remote.KobaltClient import com.beust.kobalt.internal.remote.KobaltServer diff --git a/src/main/kotlin/com/beust/kobalt/Plugins.kt b/src/main/kotlin/com/beust/kobalt/Plugins.kt index 0280408e..60fabc7e 100644 --- a/src/main/kotlin/com/beust/kobalt/Plugins.kt +++ b/src/main/kotlin/com/beust/kobalt/Plugins.kt @@ -2,6 +2,7 @@ package com.beust.kobalt 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.maven.DepFactory diff --git a/src/main/kotlin/com/beust/kobalt/ProjectGenerator.kt b/src/main/kotlin/com/beust/kobalt/ProjectGenerator.kt index 3bde0814..f6528681 100644 --- a/src/main/kotlin/com/beust/kobalt/ProjectGenerator.kt +++ b/src/main/kotlin/com/beust/kobalt/ProjectGenerator.kt @@ -1,7 +1,7 @@ package com.beust.kobalt import com.beust.kobalt.api.IInitContributor -import com.beust.kobalt.api.PluginInfo +import com.beust.kobalt.internal.PluginInfo import com.beust.kobalt.misc.log import com.google.inject.Inject import java.io.File diff --git a/src/main/kotlin/com/beust/kobalt/api/KobaltContext.kt b/src/main/kotlin/com/beust/kobalt/api/KobaltContext.kt index f8e9e630..207742fc 100644 --- a/src/main/kotlin/com/beust/kobalt/api/KobaltContext.kt +++ b/src/main/kotlin/com/beust/kobalt/api/KobaltContext.kt @@ -2,6 +2,7 @@ package com.beust.kobalt.api import com.beust.kobalt.Args import com.beust.kobalt.Plugins +import com.beust.kobalt.internal.PluginInfo public class KobaltContext(val args: Args) { fun findPlugin(name: String) = Plugins.findPlugin(name) diff --git a/src/main/kotlin/com/beust/kobalt/api/KobaltPluginXml.kt b/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt similarity index 98% rename from src/main/kotlin/com/beust/kobalt/api/KobaltPluginXml.kt rename to src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt index 844b7cc1..bdb39d46 100644 --- a/src/main/kotlin/com/beust/kobalt/api/KobaltPluginXml.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt @@ -1,5 +1,6 @@ -package com.beust.kobalt.api +package com.beust.kobalt.internal +import com.beust.kobalt.api.* import com.beust.kobalt.misc.log import java.io.ByteArrayInputStream import java.io.InputStream diff --git a/src/main/kotlin/com/beust/kobalt/internal/remote/GetDependenciesCommand.kt b/src/main/kotlin/com/beust/kobalt/internal/remote/GetDependenciesCommand.kt index 009ecab8..4883f773 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/remote/GetDependenciesCommand.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/remote/GetDependenciesCommand.kt @@ -1,7 +1,7 @@ package com.beust.kobalt.internal.remote import com.beust.kobalt.Args -import com.beust.kobalt.api.PluginInfo +import com.beust.kobalt.internal.PluginInfo import com.beust.kobalt.kotlin.BuildFile import com.beust.kobalt.kotlin.BuildFileCompiler import com.beust.kobalt.maven.DependencyManager diff --git a/src/main/kotlin/com/beust/kobalt/kotlin/BuildFileCompiler.kt b/src/main/kotlin/com/beust/kobalt/kotlin/BuildFileCompiler.kt index e4df9ee7..45850d7e 100644 --- a/src/main/kotlin/com/beust/kobalt/kotlin/BuildFileCompiler.kt +++ b/src/main/kotlin/com/beust/kobalt/kotlin/BuildFileCompiler.kt @@ -5,6 +5,7 @@ import com.beust.kobalt.Plugins import com.beust.kobalt.api.* import com.beust.kobalt.api.annotation.Task import com.beust.kobalt.internal.JvmCompiler +import com.beust.kobalt.internal.PluginInfo import com.beust.kobalt.maven.IClasspathDependency import com.beust.kobalt.maven.KobaltException import com.beust.kobalt.misc.KFiles diff --git a/src/main/kotlin/com/beust/kobalt/misc/MainModule.kt b/src/main/kotlin/com/beust/kobalt/misc/MainModule.kt index 9ee9220b..f63b9130 100644 --- a/src/main/kotlin/com/beust/kobalt/misc/MainModule.kt +++ b/src/main/kotlin/com/beust/kobalt/misc/MainModule.kt @@ -1,7 +1,7 @@ package com.beust.kobalt.misc import com.beust.kobalt.Args -import com.beust.kobalt.api.PluginInfo +import com.beust.kobalt.internal.PluginInfo import com.beust.kobalt.kotlin.BuildFileCompiler import com.beust.kobalt.maven.* import com.beust.kobalt.plugin.publish.JCenterApi diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index f31ba26f..464dd988 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,6 +1,6 @@ kobalt - com.beust.kobalt.api.GuiceFactory + com.beust.kobalt.internal.GuiceFactory com.beust.kobalt.plugin.android.AndroidPlugin com.beust.kobalt.plugin.application.ApplicationPlugin diff --git a/src/test/kotlin/com/beust/kobalt/maven/PomTest.kt b/src/test/kotlin/com/beust/kobalt/maven/PomTest.kt index 5a9a54ae..fb3b6eca 100644 --- a/src/test/kotlin/com/beust/kobalt/maven/PomTest.kt +++ b/src/test/kotlin/com/beust/kobalt/maven/PomTest.kt @@ -2,7 +2,7 @@ package com.beust.kobalt.maven import com.beust.kobalt.Args import com.beust.kobalt.ProjectGenerator -import com.beust.kobalt.api.PluginInfo +import com.beust.kobalt.internal.PluginInfo import com.google.inject.Inject import org.testng.Assert import org.testng.annotations.Test