Add internal namespace and reactive convention mapping for bootstrap …

…tasks
wooga · Feb 13, 2018 · 30b068d · 30b068d
1 parent 3a2db62
commit 30b068d
Show file tree

Hide file tree

Showing 31 changed files with 46 additions and 55 deletions.
diff --git a/docs/api/index-all.html b/docs/api/index-all.html
@@ -179,7 +179,7 @@ <h2 class="title">C</h2>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="wooga/gradle/paket/publish/PaketPublishPlugin.html#createPublishLocalTask(org.gradle.api.tasks.TaskContainer)" title="Method in PaketPublishPlugin">createPublishLocalTask(TaskContainer)</a></span> - Method in <a href="wooga/gradle/paket/publish/PaketPublishPlugin.html">PaketPublishPlugin</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="wooga/gradle/paket/publish/PaketPublishPlugin.html#createPublishTasks(org.gradle.api.tasks.TaskContainer, org.gradle.api.artifacts.PublishArtifactSet, wooga.gradle.paket.publish.repository.NugetRepository)" title="Method in PaketPublishPlugin">createPublishTasks(TaskContainer, PublishArtifactSet, NugetRepository)</a></span> - Method in <a href="wooga/gradle/paket/publish/PaketPublishPlugin.html">PaketPublishPlugin</a>
+<dt><span class="strong"><a href="wooga/gradle/paket/publish/PaketPublishPlugin.html#createPublishTasks(org.gradle.api.tasks.TaskContainer, org.gradle.api.artifacts.PublishArtifactSet, wooga.gradle.paket.publish.repository.internal.NugetRepository)" title="Method in PaketPublishPlugin">createPublishTasks(TaskContainer, PublishArtifactSet, NugetRepository)</a></span> - Method in <a href="wooga/gradle/paket/publish/PaketPublishPlugin.html">PaketPublishPlugin</a>
 </dt><dd> <div class="block"></div></dd>
 </dl>
 

diff --git a/docs/api/wooga/gradle/paket/base/tasks/AbstractPaketTask.html b/docs/api/wooga/gradle/paket/base/tasks/AbstractPaketTask.html
@@ -91,7 +91,7 @@ <h2 title="[Groovy] Class AbstractPaketTask&lt;T extends AbstractPaketTask&gt;"
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li>wooga.gradle.paket.base.tasks.AbstractPaketTask
+<li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li>wooga.gradle.paket.base.tasks.internal.AbstractPaketTask
 </ul>
 <div class="description">
     <ul class="blockList">

diff --git a/docs/api/wooga/gradle/paket/base/utils/PaketDependencies.html b/docs/api/wooga/gradle/paket/base/utils/PaketDependencies.html
@@ -91,7 +91,7 @@ <h2 title="[Groovy] Class PaketDependencies" class="title">[Groovy] Class PaketD
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><ul class="inheritance"></ul></li><li>wooga.gradle.paket.base.utils.PaketDependencies
+<li><ul class="inheritance"></ul></li><li>wooga.gradle.paket.base.utils.internal.PaketDependencies
 </ul>
 <div class="description">
     <ul class="blockList">

diff --git a/docs/api/wooga/gradle/paket/base/utils/PaketTemplate.html b/docs/api/wooga/gradle/paket/base/utils/PaketTemplate.html
@@ -91,7 +91,7 @@ <h2 title="[Groovy] Class PaketTemplate" class="title">[Groovy] Class PaketTempl
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><ul class="inheritance"></ul></li><li>wooga.gradle.paket.base.utils.PaketTemplate
+<li><ul class="inheritance"></ul></li><li>wooga.gradle.paket.base.utils.internal.PaketTemplate
 </ul>
 <div class="description">
     <ul class="blockList">

diff --git a/docs/api/wooga/gradle/paket/publish/PaketPublishPlugin.html b/docs/api/wooga/gradle/paket/publish/PaketPublishPlugin.html
@@ -190,7 +190,7 @@ <h3>Methods Summary</h3>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>void</code></td>
-                            <td class="colLast"><code><strong><a href="#createPublishTasks(org.gradle.api.tasks.TaskContainer, org.gradle.api.artifacts.PublishArtifactSet, wooga.gradle.paket.publish.repository.NugetRepository)">createPublishTasks</a></strong>(org.gradle.api.tasks.TaskContainer tasks, org.gradle.api.artifacts.PublishArtifactSet artifacts, <a href='../../../../wooga/gradle/paket/publish/repository/NugetRepository.html'>NugetRepository</a> repository)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#createPublishTasks(org.gradle.api.tasks.TaskContainer, org.gradle.api.artifacts.PublishArtifactSet, wooga.gradle.paket.publish.repository.internal.NugetRepository)">createPublishTasks</a></strong>(org.gradle.api.tasks.TaskContainer tasks, org.gradle.api.artifacts.PublishArtifactSet artifacts, <a href='../../../../wooga/gradle/paket/publish/repository/NugetRepository.html'>NugetRepository</a> repository)</code><br></td>
                         </tr>
 
                     </table>
@@ -286,7 +286,7 @@ <h4>void <strong>createPublishLocalTask</strong>(org.gradle.api.tasks.TaskContai
                             </li>
                         </ul>
 
-                        <a name="createPublishTasks(org.gradle.api.tasks.TaskContainer, org.gradle.api.artifacts.PublishArtifactSet, wooga.gradle.paket.publish.repository.NugetRepository)"><!-- --></a>
+                        <a name="createPublishTasks(org.gradle.api.tasks.TaskContainer, org.gradle.api.artifacts.PublishArtifactSet, wooga.gradle.paket.publish.repository.internal.NugetRepository)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
                                 <h4>void <strong>createPublishTasks</strong>(org.gradle.api.tasks.TaskContainer tasks, org.gradle.api.artifacts.PublishArtifactSet artifacts, <a href='../../../../wooga/gradle/paket/publish/repository/NugetRepository.html'>NugetRepository</a> repository)</h4>

diff --git a/docs/api/wooga/gradle/paket/publish/repository/DefaultNugetRepositoryHandlerConvention.html b/docs/api/wooga/gradle/paket/publish/repository/DefaultNugetRepositoryHandlerConvention.html
@@ -91,7 +91,7 @@ <h2 title="[Groovy] Class DefaultNugetRepositoryHandlerConvention" class="title"
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><ul class="inheritance"></ul></li><li>wooga.gradle.paket.publish.repository.DefaultNugetRepositoryHandlerConvention
+<li><ul class="inheritance"></ul></li><li>wooga.gradle.paket.publish.repository.internal.DefaultNugetRepositoryHandlerConvention
 </ul>
 <div class="description">
     <ul class="blockList">

diff --git a/docs/api/wooga/gradle/paket/publish/repository/NugetRepository.html b/docs/api/wooga/gradle/paket/publish/repository/NugetRepository.html
@@ -91,7 +91,7 @@ <h2 title="[Groovy] Class NugetRepository" class="title">[Groovy] Class NugetRep
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><ul class="inheritance"></ul></li><li>wooga.gradle.paket.publish.repository.NugetRepository
+<li><ul class="inheritance"></ul></li><li>wooga.gradle.paket.publish.repository.internal.NugetRepository
 </ul>
 <div class="description">
     <ul class="blockList">

diff --git a/src/main/groovy/wooga/gradle/paket/base/PaketBasePlugin.groovy b/src/main/groovy/wooga/gradle/paket/base/PaketBasePlugin.groovy
@@ -20,10 +20,8 @@ package wooga.gradle.paket.base
 import org.gradle.api.Action
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.file.FileCollection
-import org.gradle.api.file.FileTree
 import org.gradle.buildinit.tasks.internal.TaskConfiguration
-import wooga.gradle.paket.base.tasks.AbstractPaketTask
+import wooga.gradle.paket.base.tasks.internal.AbstractPaketTask
 import wooga.gradle.paket.base.tasks.PaketBootstrap
 import wooga.gradle.paket.base.tasks.PaketInit
 
@@ -74,6 +72,7 @@ class PaketBasePlugin implements Plugin<Project> {
         project.tasks.withType(AbstractPaketTask, new Action<AbstractPaketTask>() {
             @Override
             void execute(AbstractPaketTask task) {
+
                 final taskConvention = task.conventionMapping
                 taskConvention.map("executable", { extension.getExecutable() })
                 taskConvention.map("monoExecutable", { extension.getMonoExecutable() })
@@ -98,16 +97,10 @@ class PaketBasePlugin implements Plugin<Project> {
     private static void addBootstrapTask(final Project project, PaketPluginExtension extension) {
         PaketBootstrap task = project.tasks.create(name: BOOTSTRAP_TASK_NAME, type: PaketBootstrap)
 
-        task.setExecutable(extension.getBootstrapperExecutable())
-        task.setBootstrapURL(extension.getPaketBootstrapperUrl())
-        task.setPaketVersion(extension.getVersion())
-
-        /*
         final taskConvention = task.conventionMapping
         taskConvention.map("executable", { extension.getBootstrapperExecutable() })
         taskConvention.map("bootstrapURL", { extension.getPaketBootstrapperUrl() })
         taskConvention.map("paketVersion", { extension.getVersion() })
-        */
 
         /*
         taskConvention.map("outputFiles", {

diff --git a/src/main/groovy/wooga/gradle/paket/base/tasks/PaketBootstrap.groovy b/src/main/groovy/wooga/gradle/paket/base/tasks/PaketBootstrap.groovy
@@ -25,6 +25,7 @@ import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputFiles
 import org.gradle.api.tasks.incremental.IncrementalTaskInputs
+import wooga.gradle.paket.base.tasks.internal.AbstractPaketTask
 
 import javax.inject.Inject
 
@@ -42,6 +43,7 @@ class PaketBootstrap extends AbstractPaketTask {
     FileCollection getOutputFiles() {
         return project.files(getExecutable())
     }
+
     void setPaketVersion(String value) {
            paketVersion = value
     }

diff --git a/...paket/base/tasks/AbstractPaketTask.groovy → ...e/tasks/internal/AbstractPaketTask.groovy b/...paket/base/tasks/AbstractPaketTask.groovy → ...e/tasks/internal/AbstractPaketTask.groovy
@@ -15,7 +15,7 @@
  *
  */
 
-package wooga.gradle.paket.base.tasks
+package wooga.gradle.paket.base.tasks.internal
 
 import org.gradle.api.GradleException
 import org.gradle.api.file.FileCollection

diff --git a/...paket/base/utils/PaketDependencies.groovy → ...e/utils/internal/PaketDependencies.groovy b/...paket/base/utils/PaketDependencies.groovy → ...e/utils/internal/PaketDependencies.groovy
@@ -15,7 +15,7 @@
  *
  */
 
-package wooga.gradle.paket.base.utils
+package wooga.gradle.paket.base.utils.internal
 
 class PaketDependencies {
 

diff --git a/...dle/paket/base/utils/PaketTemplate.groovy → .../base/utils/internal/PaketTemplate.groovy b/...dle/paket/base/utils/PaketTemplate.groovy → .../base/utils/internal/PaketTemplate.groovy
@@ -15,7 +15,7 @@
  *
  */
 
-package wooga.gradle.paket.base.utils
+package wooga.gradle.paket.base.utils.internal
 
 class PaketTemplate {
 

diff --git a/src/main/groovy/wooga/gradle/paket/get/PaketGetPlugin.groovy b/src/main/groovy/wooga/gradle/paket/get/PaketGetPlugin.groovy
@@ -21,10 +21,9 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.tasks.TaskContainer
-import wooga.gradle.paket.base.DefaultPaketPluginExtension
 import wooga.gradle.paket.base.PaketBasePlugin
 import wooga.gradle.paket.base.PaketPluginExtension
-import wooga.gradle.paket.base.utils.PaketDependencies
+import wooga.gradle.paket.base.utils.internal.PaketDependencies
 import wooga.gradle.paket.get.tasks.PaketInstall
 import wooga.gradle.paket.get.tasks.PaketOutdated
 import wooga.gradle.paket.get.tasks.PaketRestore

diff --git a/src/main/groovy/wooga/gradle/paket/get/tasks/PaketInstall.groovy b/src/main/groovy/wooga/gradle/paket/get/tasks/PaketInstall.groovy
@@ -17,8 +17,8 @@
 
 package wooga.gradle.paket.get.tasks
 
-import wooga.gradle.paket.PaketCommand
-import wooga.gradle.paket.base.tasks.AbstractPaketTask
+import wooga.gradle.paket.internal.PaketCommand
+import wooga.gradle.paket.base.tasks.internal.AbstractPaketTask
 
 class PaketInstall extends AbstractPaketTask {
 

diff --git a/src/main/groovy/wooga/gradle/paket/get/tasks/PaketOutdated.groovy b/src/main/groovy/wooga/gradle/paket/get/tasks/PaketOutdated.groovy
@@ -17,8 +17,8 @@
 
 package wooga.gradle.paket.get.tasks
 
-import wooga.gradle.paket.PaketCommand
-import wooga.gradle.paket.base.tasks.AbstractPaketTask
+import wooga.gradle.paket.internal.PaketCommand
+import wooga.gradle.paket.base.tasks.internal.AbstractPaketTask
 
 class PaketOutdated extends AbstractPaketTask {
 

diff --git a/src/main/groovy/wooga/gradle/paket/get/tasks/PaketRestore.groovy b/src/main/groovy/wooga/gradle/paket/get/tasks/PaketRestore.groovy
@@ -17,8 +17,8 @@
 
 package wooga.gradle.paket.get.tasks
 
-import wooga.gradle.paket.PaketCommand
-import wooga.gradle.paket.base.tasks.AbstractPaketTask
+import wooga.gradle.paket.internal.PaketCommand
+import wooga.gradle.paket.base.tasks.internal.AbstractPaketTask
 
 class PaketRestore extends AbstractPaketTask {
 

diff --git a/src/main/groovy/wooga/gradle/paket/get/tasks/PaketUpdate.groovy b/src/main/groovy/wooga/gradle/paket/get/tasks/PaketUpdate.groovy
@@ -19,8 +19,8 @@ package wooga.gradle.paket.get.tasks
 
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Optional
-import wooga.gradle.paket.PaketCommand
-import wooga.gradle.paket.base.tasks.AbstractPaketTask
+import wooga.gradle.paket.internal.PaketCommand
+import wooga.gradle.paket.base.tasks.internal.AbstractPaketTask
 
 class PaketUpdate extends AbstractPaketTask {
 

diff --git a/...vy/wooga/gradle/paket/PaketCommand.groovy → ...gradle/paket/internal/PaketCommand.groovy b/...vy/wooga/gradle/paket/PaketCommand.groovy → ...gradle/paket/internal/PaketCommand.groovy
@@ -1,4 +1,4 @@
-package wooga.gradle.paket
+package wooga.gradle.paket.internal
 
 class PaketCommand {
     static final String INSTALL = "install"

diff --git a/src/main/groovy/wooga/gradle/paket/pack/PaketPackPlugin.groovy b/src/main/groovy/wooga/gradle/paket/pack/PaketPackPlugin.groovy
@@ -20,18 +20,15 @@ package wooga.gradle.paket.pack
 import org.gradle.api.Action
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.artifacts.ConfigurablePublishArtifact
 import org.gradle.api.artifacts.PublishArtifact
 import org.gradle.api.internal.ConventionMapping
 import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 import org.gradle.api.plugins.BasePlugin
 import org.gradle.api.tasks.TaskContainer
-import org.gradle.util.GUtil
-import wooga.gradle.paket.base.DefaultPaketPluginExtension
 import wooga.gradle.paket.base.PaketBasePlugin
 import wooga.gradle.paket.base.PaketPluginExtension
-import wooga.gradle.paket.base.utils.PaketTemplate
+import wooga.gradle.paket.base.utils.internal.PaketTemplate
 import wooga.gradle.paket.get.PaketGetPlugin
 import wooga.gradle.paket.pack.tasks.PaketPack
 

diff --git a/src/main/groovy/wooga/gradle/paket/pack/tasks/PaketPack.groovy b/src/main/groovy/wooga/gradle/paket/pack/tasks/PaketPack.groovy
@@ -19,11 +19,9 @@ package wooga.gradle.paket.pack.tasks
 
 import org.gradle.api.Project
 import org.gradle.api.tasks.*
-import wooga.gradle.paket.PaketCommand
-import wooga.gradle.paket.base.tasks.AbstractPaketTask
-import wooga.gradle.paket.base.utils.PaketTemplate
-
-import java.util.concurrent.Callable
+import wooga.gradle.paket.internal.PaketCommand
+import wooga.gradle.paket.base.tasks.internal.AbstractPaketTask
+import wooga.gradle.paket.base.utils.internal.PaketTemplate
 
 class PaketPack extends AbstractPaketTask {
 

diff --git a/src/main/groovy/wooga/gradle/paket/publish/PaketPublishPlugin.groovy b/src/main/groovy/wooga/gradle/paket/publish/PaketPublishPlugin.groovy
@@ -32,8 +32,8 @@ import org.gradle.api.publish.plugins.PublishingPlugin
 import org.gradle.api.tasks.TaskContainer
 import wooga.gradle.paket.base.DefaultPaketPluginExtension
 import wooga.gradle.paket.base.PaketBasePlugin
-import wooga.gradle.paket.publish.repository.DefaultNugetRepositoryHandlerConvention
-import wooga.gradle.paket.publish.repository.NugetRepository
+import wooga.gradle.paket.publish.repository.internal.DefaultNugetRepositoryHandlerConvention
+import wooga.gradle.paket.publish.repository.internal.NugetRepository
 import wooga.gradle.paket.publish.tasks.PaketCopy
 import wooga.gradle.paket.publish.tasks.PaketPush
 

diff --git a/...ltNugetRepositoryHandlerConvention.groovy → ...ltNugetRepositoryHandlerConvention.groovy b/...ltNugetRepositoryHandlerConvention.groovy → ...ltNugetRepositoryHandlerConvention.groovy
@@ -15,11 +15,13 @@
  *
  */
 
-package wooga.gradle.paket.publish.repository
+package wooga.gradle.paket.publish.repository.internal
 
 import org.gradle.api.Action
 import org.gradle.api.artifacts.dsl.RepositoryHandler
 import org.gradle.util.ConfigureUtil
+import wooga.gradle.paket.publish.repository.NugetArtifactRepository
+import wooga.gradle.paket.publish.repository.NugetRepositoryHandlerConvention
 
 class DefaultNugetRepositoryHandlerConvention implements NugetRepositoryHandlerConvention {
 

diff --git a/...publish/repository/NugetRepository.groovy → ...epository/internal/NugetRepository.groovy b/...publish/repository/NugetRepository.groovy → ...epository/internal/NugetRepository.groovy
@@ -15,7 +15,9 @@
  *
  */
 
-package wooga.gradle.paket.publish.repository
+package wooga.gradle.paket.publish.repository.internal
+
+import wooga.gradle.paket.publish.repository.NugetArtifactRepository
 
 class NugetRepository implements NugetArtifactRepository {
 

diff --git a/src/main/groovy/wooga/gradle/paket/publish/tasks/PaketPush.groovy b/src/main/groovy/wooga/gradle/paket/publish/tasks/PaketPush.groovy
@@ -20,7 +20,7 @@ package wooga.gradle.paket.publish.tasks
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.Optional
-import wooga.gradle.paket.base.tasks.AbstractPaketTask
+import wooga.gradle.paket.base.tasks.internal.AbstractPaketTask
 
 import java.util.concurrent.Callable
 

diff --git a/src/main/groovy/wooga/gradle/paket/unity/DefaultPaketUnityPluginExtension.groovy b/src/main/groovy/wooga/gradle/paket/unity/DefaultPaketUnityPluginExtension.groovy
@@ -48,7 +48,7 @@ class DefaultPaketUnityPluginExtension extends DefaultPaketPluginExtension {
 
     @Override
     File getPaketDependenciesFile() {
-        def files = project.files(project.fileTree(dir: project.projectDir, include: "**/paket.unity3d.references").files)
+        def files = project.files(project.fileTree(dir: project.projectDir, include: DEFAULT_PAKET_UNITY_REFERENCES_FILE_NAME).files)
         files.isEmpty() ? new File(project.projectDir, "no-source") : files.first()
     }
 }
diff --git a/src/main/groovy/wooga/gradle/paket/unity/PaketUnityPlugin.groovy b/src/main/groovy/wooga/gradle/paket/unity/PaketUnityPlugin.groovy
@@ -73,15 +73,10 @@ class PaketUnityPlugin implements Plugin<Project> {
 
         def task = project.tasks.create(BOOTSTRAP_TASK_NAME, PaketUnityBootstrap.class)
         def conventionMapping = task.conventionMapping
-        task.setExecutable(extension.getBootstrapperExecutable())
-        task.setBootstrapURL(extension.getPaketBootstrapperUrl())
-        task.setPaketVersion(extension.getVersion())
-        /*
-        task.setDependenciesFile(DependenciesFileCollection(project, extension))
+
         conventionMapping.map("executable", { extension.getBootstrapperExecutable() })
         conventionMapping.map("bootstrapURL", { extension.getPaketBootstrapperUrl() })
         conventionMapping.map("paketVersion", { extension.getVersion() })
-        */
         conventionMapping.map("dependenciesFile", { DependenciesFileCollection(project, extension) })
 
         task

diff --git a/src/main/groovy/wooga/gradle/paket/unity/tasks/PaketUnityInstall.groovy b/src/main/groovy/wooga/gradle/paket/unity/tasks/PaketUnityInstall.groovy
@@ -17,8 +17,8 @@
 
 package wooga.gradle.paket.unity.tasks
 
-import wooga.gradle.paket.PaketCommand
-import wooga.gradle.paket.base.tasks.AbstractPaketTask
+import wooga.gradle.paket.internal.PaketCommand
+import wooga.gradle.paket.base.tasks.internal.AbstractPaketTask
 import wooga.gradle.paket.unity.PaketUnityPlugin
 
 class PaketUnityInstall extends AbstractPaketTask {

diff --git a/src/test/groovy/wooga/gradle/paket/base/utils/PaketDependenciesSpec.groovy b/src/test/groovy/wooga/gradle/paket/base/utils/PaketDependenciesSpec.groovy
@@ -3,6 +3,7 @@ package wooga.gradle.paket.base.utils
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Unroll
+import wooga.gradle.paket.base.utils.internal.PaketDependencies
 
 class PaketDependenciesSpec extends Specification {
 

diff --git a/src/test/groovy/wooga/gradle/paket/base/utils/PaketTemplateSpec.groovy b/src/test/groovy/wooga/gradle/paket/base/utils/PaketTemplateSpec.groovy
@@ -20,6 +20,7 @@ package wooga.gradle.paket.base.utils
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Unroll
+import wooga.gradle.paket.base.utils.internal.PaketTemplate
 
 class PaketTemplateSpec extends Specification {
 

diff --git a/src/test/groovy/wooga/gradle/paket/get/PaketGetPluginSpec.groovy b/src/test/groovy/wooga/gradle/paket/get/PaketGetPluginSpec.groovy
@@ -21,7 +21,7 @@ import nebula.test.PluginProjectSpec
 import nebula.test.ProjectSpec
 import spock.lang.Unroll
 import wooga.gradle.paket.base.PaketBasePlugin
-import wooga.gradle.paket.base.tasks.AbstractPaketTask
+import wooga.gradle.paket.base.tasks.internal.AbstractPaketTask
 import wooga.gradle.paket.get.tasks.PaketInstall
 import wooga.gradle.paket.get.tasks.PaketRestore
 import wooga.gradle.paket.get.tasks.PaketUpdate

diff --git a/src/test/groovy/wooga/gradle/paket/publish/repository/NugetRepositorySpec.groovy b/src/test/groovy/wooga/gradle/paket/publish/repository/NugetRepositorySpec.groovy
@@ -1,6 +1,7 @@
 package wooga.gradle.paket.publish.repository
 
 import spock.lang.Specification
+import wooga.gradle.paket.publish.repository.internal.NugetRepository
 
 class NugetRepositorySpec extends Specification {