From a6b9c845c280bfc423b3f646bcaf4be7a4a6f07e Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Thu, 2 Feb 2017 02:06:04 +0100 Subject: [PATCH] Rename plugin module to sbt-coursier --- .ci/travis.sh | 4 ++-- appveyor.yml | 2 +- build.sbt | 9 +++------ .../src/main/scala-2.10/coursier/CoursierPlugin.scala | 0 .../src/main/scala-2.10/coursier/Credentials.scala | 0 .../coursier/FallbackDependenciesRepository.scala | 0 .../src/main/scala-2.10/coursier/FromSbt.scala | 0 .../scala-2.10/coursier/InterProjectRepository.scala | 0 .../src/main/scala-2.10/coursier/IvyXml.scala | 0 .../src/main/scala-2.10/coursier/Keys.scala | 0 .../src/main/scala-2.10/coursier/ResolutionError.scala | 0 .../main/scala-2.10/coursier/ResolutionException.scala | 0 .../src/main/scala-2.10/coursier/SbtBootJars.scala | 0 .../src/main/scala-2.10/coursier/Settings.scala | 0 .../src/main/scala-2.10/coursier/Structure.scala | 0 .../src/main/scala-2.10/coursier/Tasks.scala | 0 .../src/main/scala-2.10/coursier/ToSbt.scala | 0 .../src/sbt-test/sbt-coursier/aar-packaging/build.sbt | 0 .../sbt-coursier/aar-packaging/project/plugins.sbt | 0 .../sbt-coursier/aar-packaging/src/main/scala/Main.scala | 0 .../src/sbt-test/sbt-coursier/aar-packaging/test | 0 .../sbt-coursier/credentials-from-file/build.sbt | 0 .../sbt-coursier/credentials-from-file/credentials | 0 .../credentials-from-file/project/plugins.sbt | 0 .../credentials-from-file/src/main/scala/Main.scala | 0 .../src/sbt-test/sbt-coursier/credentials-from-file/test | 0 .../src/sbt-test/sbt-coursier/credentials-sbt/build.sbt | 0 .../sbt-coursier/credentials-sbt/project/plugins.sbt | 0 .../credentials-sbt/src/main/scala/Main.scala | 0 .../src/sbt-test/sbt-coursier/credentials-sbt/test | 0 .../src/sbt-test/sbt-coursier/credentials/build.sbt | 0 .../sbt-coursier/credentials/project/plugins.sbt | 0 .../sbt-coursier/credentials/src/main/scala/Main.scala | 0 .../src/sbt-test/sbt-coursier/credentials/test | 0 .../sbt-test/sbt-coursier/exclude-dependencies/build.sbt | 0 .../exclude-dependencies/project/plugins.sbt | 0 .../exclude-dependencies/src/main/scala/Main.scala | 0 .../src/sbt-test/sbt-coursier/exclude-dependencies/test | 0 .../a/src/main/scala/A.scala | 0 .../b/src/main/scala/Main.scala | 0 .../fallback-dependencies-inter-project/build.sbt | 0 .../project/plugins.sbt | 0 .../fallback-dependencies-inter-project/test | 0 .../src/sbt-test/sbt-coursier/from-no-head/build.sbt | 0 .../sbt-coursier/from-no-head/project/plugins.sbt | 0 .../sbt-coursier/from-no-head/src/main/scala/Main.scala | 0 .../src/sbt-test/sbt-coursier/from-no-head/test | 0 .../src/sbt-test/sbt-coursier/from-wrong-url/build.sbt | 0 .../sbt-coursier/from-wrong-url/project/plugins.sbt | 0 .../from-wrong-url/src/main/scala/Main.scala | 0 .../src/sbt-test/sbt-coursier/from-wrong-url/test | 0 .../src/sbt-test/sbt-coursier/from/build.sbt | 0 .../src/sbt-test/sbt-coursier/from/project/plugins.sbt | 0 .../sbt-test/sbt-coursier/from/src/main/scala/Main.scala | 0 .../src/sbt-test/sbt-coursier/from/test | 0 .../hadoop-yarn-server-resourcemanager/build.sbt | 0 .../project/plugins.sbt | 0 .../src/main/scala/Main.scala | 0 .../sbt-coursier/hadoop-yarn-server-resourcemanager/test | 0 .../inter-project-resolvers/a/src/main/scala/A.scala | 0 .../inter-project-resolvers/b/src/main/scala/Main.scala | 0 .../sbt-coursier/inter-project-resolvers/build.sbt | 0 .../inter-project-resolvers/project/plugins.sbt | 0 .../sbt-test/sbt-coursier/inter-project-resolvers/test | 0 .../sbt-coursier/inter-project/a/src/main/scala/A.scala | 0 .../inter-project/b/src/main/scala/Main.scala | 0 .../src/sbt-test/sbt-coursier/inter-project/build.sbt | 0 .../sbt-coursier/inter-project/project/plugins.sbt | 0 .../src/sbt-test/sbt-coursier/inter-project/test | 0 .../src/sbt-test/sbt-coursier/maven-compatible/build.sbt | 0 .../sbt-coursier/maven-compatible/project/plugins.sbt | 0 .../maven-compatible/src/main/scala/Main.scala | 0 .../src/sbt-test/sbt-coursier/maven-compatible/test | 0 .../src/sbt-test/sbt-coursier/profiles/build.sbt | 0 .../src/sbt-test/sbt-coursier/profiles/output | 0 .../sbt-test/sbt-coursier/profiles/project/plugins.sbt | 0 .../sbt-coursier/profiles/src/main/scala/Main.scala | 0 .../src/sbt-test/sbt-coursier/profiles/test | 0 .../src/sbt-test/sbt-coursier/scala-jars/build.sbt | 0 .../sbt-test/sbt-coursier/scala-jars/project/plugins.sbt | 0 .../sbt-coursier/scala-jars/src/main/scala/Main.scala | 0 .../src/sbt-test/sbt-coursier/scala-jars/test | 0 .../sbt-coursier/scala-sources-javadoc-jars/build.sbt | 0 .../scala-sources-javadoc-jars/project/plugins.sbt | 0 .../scala-sources-javadoc-jars/src/main/scala/Main.scala | 0 .../sbt-coursier/scala-sources-javadoc-jars/test | 0 .../src/sbt-test/sbt-coursier/simple/build.sbt | 0 .../src/sbt-test/sbt-coursier/simple/project/plugins.sbt | 0 .../sbt-coursier/simple/src/main/scala/Main.scala | 0 .../src/sbt-test/sbt-coursier/simple/test | 0 .../typelevel-force-version-stdlib/build.sbt | 0 .../typelevel-force-version-stdlib/project/plugins.sbt | 0 .../src/main/scala/Main.scala | 0 .../sbt-coursier/typelevel-force-version-stdlib/test | 0 .../src/sbt-test/sbt-coursier/typelevel/build.sbt | 0 .../sbt-test/sbt-coursier/typelevel/project/plugins.sbt | 0 .../sbt-coursier/typelevel/src/main/scala/Main.scala | 0 .../src/sbt-test/sbt-coursier/typelevel/test | 0 .../src/sbt-test/sbt-coursier/zookeeper/build.sbt | 0 .../sbt-test/sbt-coursier/zookeeper/project/plugins.sbt | 0 .../sbt-coursier/zookeeper/src/main/scala/Main.scala | 0 .../src/sbt-test/sbt-coursier/zookeeper/test | 0 102 files changed, 6 insertions(+), 9 deletions(-) rename {plugin => sbt-coursier}/src/main/scala-2.10/coursier/CoursierPlugin.scala (100%) rename {plugin => sbt-coursier}/src/main/scala-2.10/coursier/Credentials.scala (100%) rename {plugin => sbt-coursier}/src/main/scala-2.10/coursier/FallbackDependenciesRepository.scala (100%) rename {plugin => sbt-coursier}/src/main/scala-2.10/coursier/FromSbt.scala (100%) rename {plugin => sbt-coursier}/src/main/scala-2.10/coursier/InterProjectRepository.scala (100%) rename {plugin => sbt-coursier}/src/main/scala-2.10/coursier/IvyXml.scala (100%) rename {plugin => sbt-coursier}/src/main/scala-2.10/coursier/Keys.scala (100%) rename {plugin => sbt-coursier}/src/main/scala-2.10/coursier/ResolutionError.scala (100%) rename {plugin => sbt-coursier}/src/main/scala-2.10/coursier/ResolutionException.scala (100%) rename {plugin => sbt-coursier}/src/main/scala-2.10/coursier/SbtBootJars.scala (100%) rename {plugin => sbt-coursier}/src/main/scala-2.10/coursier/Settings.scala (100%) rename {plugin => sbt-coursier}/src/main/scala-2.10/coursier/Structure.scala (100%) rename {plugin => sbt-coursier}/src/main/scala-2.10/coursier/Tasks.scala (100%) rename {plugin => sbt-coursier}/src/main/scala-2.10/coursier/ToSbt.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/aar-packaging/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/aar-packaging/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/aar-packaging/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/aar-packaging/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/credentials-from-file/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/credentials-from-file/credentials (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/credentials-from-file/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/credentials-from-file/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/credentials-from-file/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/credentials-sbt/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/credentials-sbt/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/credentials-sbt/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/credentials-sbt/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/credentials/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/credentials/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/credentials/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/credentials/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/exclude-dependencies/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/exclude-dependencies/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/exclude-dependencies/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/a/src/main/scala/A.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/b/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/from-no-head/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/from-no-head/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/from-no-head/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/from-no-head/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/from-wrong-url/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/from-wrong-url/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/from-wrong-url/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/from-wrong-url/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/from/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/from/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/from/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/from/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/inter-project-resolvers/a/src/main/scala/A.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/inter-project-resolvers/b/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/inter-project-resolvers/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/inter-project-resolvers/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/inter-project-resolvers/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/inter-project/a/src/main/scala/A.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/inter-project/b/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/inter-project/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/inter-project/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/inter-project/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/maven-compatible/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/maven-compatible/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/maven-compatible/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/maven-compatible/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/profiles/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/profiles/output (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/profiles/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/profiles/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/profiles/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/scala-jars/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/scala-jars/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/scala-jars/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/scala-jars/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/simple/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/simple/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/simple/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/simple/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/typelevel/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/typelevel/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/typelevel/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/typelevel/test (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/zookeeper/build.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/zookeeper/project/plugins.sbt (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/zookeeper/src/main/scala/Main.scala (100%) rename {plugin => sbt-coursier}/src/sbt-test/sbt-coursier/zookeeper/test (100%) diff --git a/.ci/travis.sh b/.ci/travis.sh index f52120f17..6a853d75e 100755 --- a/.ci/travis.sh +++ b/.ci/travis.sh @@ -47,7 +47,7 @@ RUN_SHADING_TESTS=1 if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.10"; then SBT_COMMANDS="$SBT_COMMANDS publishLocal" # to make the scripted tests happy - SBT_COMMANDS="$SBT_COMMANDS plugin/scripted" + SBT_COMMANDS="$SBT_COMMANDS sbt-coursier/scripted" if [ "$RUN_SHADING_TESTS" = 1 ]; then # for the shading scripted test @@ -68,7 +68,7 @@ if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.10"; then rm -rf jarjar fi - SBT_COMMANDS="$SBT_COMMANDS plugin/publishLocal sbt-shading/scripted" + SBT_COMMANDS="$SBT_COMMANDS sbt-coursier/publishLocal sbt-shading/scripted" fi fi diff --git a/appveyor.yml b/appveyor.yml index 5a7cad557..88b57bc96 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,7 +30,7 @@ test_script: - ps: Start-Job { & java -jar -noverify C:\projects\coursier\coursier launch -r http://dl.bintray.com/scalaz/releases io.get-coursier:http-server-java7_2.11:1.0.0-SNAPSHOT -- -d /C:/projects/coursier/tests/jvm/src/test/resources/test-repo/http/abc.com -u user -P pass -r realm -v } - sbt ++2.12.1 testsJVM/test testsJVM/it:test # Would node be around for testsJS/test? - sbt ++2.11.8 testsJVM/test testsJVM/it:test - - sbt ++2.10.6 testsJVM/test testsJVM/it:test plugin/scripted plugin/publishLocal sbt-shading/scripted + - sbt ++2.10.6 testsJVM/test testsJVM/it:test sbt-coursier/scripted sbt-coursier/publishLocal sbt-shading/scripted cache: - C:\Users\appveyor\.ivy2\cache - C:\Users\appveyor\.m2 diff --git a/build.sbt b/build.sbt index 050184561..55eed0e38 100644 --- a/build.sbt +++ b/build.sbt @@ -345,16 +345,13 @@ lazy val doc = project ) // Don't try to compile that if you're not in 2.10 -lazy val plugin = project +lazy val `sbt-coursier` = project .dependsOn(coreJvm, cache) .settings(pluginSettings) - .settings( - name := "sbt-coursier" - ) // Don't try to compile that if you're not in 2.10 lazy val `sbt-shading` = project - .dependsOn(plugin) + .dependsOn(`sbt-coursier`) .settings(pluginSettings) .settings( // Warning: this version doesn't handle well class names with '$'s @@ -404,7 +401,7 @@ lazy val `coursier` = project.in(file(".")) cache, bootstrap, cli, - plugin, + `sbt-coursier`, `sbt-shading`, web, doc, diff --git a/plugin/src/main/scala-2.10/coursier/CoursierPlugin.scala b/sbt-coursier/src/main/scala-2.10/coursier/CoursierPlugin.scala similarity index 100% rename from plugin/src/main/scala-2.10/coursier/CoursierPlugin.scala rename to sbt-coursier/src/main/scala-2.10/coursier/CoursierPlugin.scala diff --git a/plugin/src/main/scala-2.10/coursier/Credentials.scala b/sbt-coursier/src/main/scala-2.10/coursier/Credentials.scala similarity index 100% rename from plugin/src/main/scala-2.10/coursier/Credentials.scala rename to sbt-coursier/src/main/scala-2.10/coursier/Credentials.scala diff --git a/plugin/src/main/scala-2.10/coursier/FallbackDependenciesRepository.scala b/sbt-coursier/src/main/scala-2.10/coursier/FallbackDependenciesRepository.scala similarity index 100% rename from plugin/src/main/scala-2.10/coursier/FallbackDependenciesRepository.scala rename to sbt-coursier/src/main/scala-2.10/coursier/FallbackDependenciesRepository.scala diff --git a/plugin/src/main/scala-2.10/coursier/FromSbt.scala b/sbt-coursier/src/main/scala-2.10/coursier/FromSbt.scala similarity index 100% rename from plugin/src/main/scala-2.10/coursier/FromSbt.scala rename to sbt-coursier/src/main/scala-2.10/coursier/FromSbt.scala diff --git a/plugin/src/main/scala-2.10/coursier/InterProjectRepository.scala b/sbt-coursier/src/main/scala-2.10/coursier/InterProjectRepository.scala similarity index 100% rename from plugin/src/main/scala-2.10/coursier/InterProjectRepository.scala rename to sbt-coursier/src/main/scala-2.10/coursier/InterProjectRepository.scala diff --git a/plugin/src/main/scala-2.10/coursier/IvyXml.scala b/sbt-coursier/src/main/scala-2.10/coursier/IvyXml.scala similarity index 100% rename from plugin/src/main/scala-2.10/coursier/IvyXml.scala rename to sbt-coursier/src/main/scala-2.10/coursier/IvyXml.scala diff --git a/plugin/src/main/scala-2.10/coursier/Keys.scala b/sbt-coursier/src/main/scala-2.10/coursier/Keys.scala similarity index 100% rename from plugin/src/main/scala-2.10/coursier/Keys.scala rename to sbt-coursier/src/main/scala-2.10/coursier/Keys.scala diff --git a/plugin/src/main/scala-2.10/coursier/ResolutionError.scala b/sbt-coursier/src/main/scala-2.10/coursier/ResolutionError.scala similarity index 100% rename from plugin/src/main/scala-2.10/coursier/ResolutionError.scala rename to sbt-coursier/src/main/scala-2.10/coursier/ResolutionError.scala diff --git a/plugin/src/main/scala-2.10/coursier/ResolutionException.scala b/sbt-coursier/src/main/scala-2.10/coursier/ResolutionException.scala similarity index 100% rename from plugin/src/main/scala-2.10/coursier/ResolutionException.scala rename to sbt-coursier/src/main/scala-2.10/coursier/ResolutionException.scala diff --git a/plugin/src/main/scala-2.10/coursier/SbtBootJars.scala b/sbt-coursier/src/main/scala-2.10/coursier/SbtBootJars.scala similarity index 100% rename from plugin/src/main/scala-2.10/coursier/SbtBootJars.scala rename to sbt-coursier/src/main/scala-2.10/coursier/SbtBootJars.scala diff --git a/plugin/src/main/scala-2.10/coursier/Settings.scala b/sbt-coursier/src/main/scala-2.10/coursier/Settings.scala similarity index 100% rename from plugin/src/main/scala-2.10/coursier/Settings.scala rename to sbt-coursier/src/main/scala-2.10/coursier/Settings.scala diff --git a/plugin/src/main/scala-2.10/coursier/Structure.scala b/sbt-coursier/src/main/scala-2.10/coursier/Structure.scala similarity index 100% rename from plugin/src/main/scala-2.10/coursier/Structure.scala rename to sbt-coursier/src/main/scala-2.10/coursier/Structure.scala diff --git a/plugin/src/main/scala-2.10/coursier/Tasks.scala b/sbt-coursier/src/main/scala-2.10/coursier/Tasks.scala similarity index 100% rename from plugin/src/main/scala-2.10/coursier/Tasks.scala rename to sbt-coursier/src/main/scala-2.10/coursier/Tasks.scala diff --git a/plugin/src/main/scala-2.10/coursier/ToSbt.scala b/sbt-coursier/src/main/scala-2.10/coursier/ToSbt.scala similarity index 100% rename from plugin/src/main/scala-2.10/coursier/ToSbt.scala rename to sbt-coursier/src/main/scala-2.10/coursier/ToSbt.scala diff --git a/plugin/src/sbt-test/sbt-coursier/aar-packaging/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/aar-packaging/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/aar-packaging/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/aar-packaging/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/aar-packaging/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/aar-packaging/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/aar-packaging/test b/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/aar-packaging/test rename to sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/test diff --git a/plugin/src/sbt-test/sbt-coursier/credentials-from-file/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/credentials-from-file/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/credentials-from-file/credentials b/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/credentials similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/credentials-from-file/credentials rename to sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/credentials diff --git a/plugin/src/sbt-test/sbt-coursier/credentials-from-file/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/credentials-from-file/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/credentials-from-file/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/credentials-from-file/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/credentials-from-file/test b/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/credentials-from-file/test rename to sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/test diff --git a/plugin/src/sbt-test/sbt-coursier/credentials-sbt/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/credentials-sbt/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/credentials-sbt/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/credentials-sbt/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/credentials-sbt/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/credentials-sbt/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/credentials-sbt/test b/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/credentials-sbt/test rename to sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/test diff --git a/plugin/src/sbt-test/sbt-coursier/credentials/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/credentials/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/credentials/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/credentials/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/credentials/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/credentials/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/credentials/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/credentials/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/credentials/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/credentials/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/credentials/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/credentials/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/credentials/test b/sbt-coursier/src/sbt-test/sbt-coursier/credentials/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/credentials/test rename to sbt-coursier/src/sbt-test/sbt-coursier/credentials/test diff --git a/plugin/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/exclude-dependencies/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/exclude-dependencies/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/exclude-dependencies/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/exclude-dependencies/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/exclude-dependencies/test b/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/exclude-dependencies/test rename to sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/test diff --git a/plugin/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/a/src/main/scala/A.scala b/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/a/src/main/scala/A.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/a/src/main/scala/A.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/a/src/main/scala/A.scala diff --git a/plugin/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/b/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/b/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/b/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/b/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/test b/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/test rename to sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/test diff --git a/plugin/src/sbt-test/sbt-coursier/from-no-head/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/from-no-head/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/from-no-head/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/from-no-head/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/from-no-head/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/from-no-head/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/from-no-head/test b/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/from-no-head/test rename to sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/test diff --git a/plugin/src/sbt-test/sbt-coursier/from-wrong-url/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/from-wrong-url/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/from-wrong-url/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/from-wrong-url/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/from-wrong-url/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/from-wrong-url/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/from-wrong-url/test b/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/from-wrong-url/test rename to sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/test diff --git a/plugin/src/sbt-test/sbt-coursier/from/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/from/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/from/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/from/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/from/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/from/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/from/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/from/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/from/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/from/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/from/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/from/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/from/test b/sbt-coursier/src/sbt-test/sbt-coursier/from/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/from/test rename to sbt-coursier/src/sbt-test/sbt-coursier/from/test diff --git a/plugin/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/test b/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/test rename to sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/test diff --git a/plugin/src/sbt-test/sbt-coursier/inter-project-resolvers/a/src/main/scala/A.scala b/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/a/src/main/scala/A.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/inter-project-resolvers/a/src/main/scala/A.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/a/src/main/scala/A.scala diff --git a/plugin/src/sbt-test/sbt-coursier/inter-project-resolvers/b/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/b/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/inter-project-resolvers/b/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/b/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/inter-project-resolvers/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/inter-project-resolvers/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/inter-project-resolvers/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/inter-project-resolvers/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/inter-project-resolvers/test b/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/inter-project-resolvers/test rename to sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/test diff --git a/plugin/src/sbt-test/sbt-coursier/inter-project/a/src/main/scala/A.scala b/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/a/src/main/scala/A.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/inter-project/a/src/main/scala/A.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/inter-project/a/src/main/scala/A.scala diff --git a/plugin/src/sbt-test/sbt-coursier/inter-project/b/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/b/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/inter-project/b/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/inter-project/b/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/inter-project/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/inter-project/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/inter-project/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/inter-project/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/inter-project/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/inter-project/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/inter-project/test b/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/inter-project/test rename to sbt-coursier/src/sbt-test/sbt-coursier/inter-project/test diff --git a/plugin/src/sbt-test/sbt-coursier/maven-compatible/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/maven-compatible/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/maven-compatible/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/maven-compatible/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/maven-compatible/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/maven-compatible/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/maven-compatible/test b/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/maven-compatible/test rename to sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/test diff --git a/plugin/src/sbt-test/sbt-coursier/profiles/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/profiles/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/profiles/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/profiles/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/profiles/output b/sbt-coursier/src/sbt-test/sbt-coursier/profiles/output similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/profiles/output rename to sbt-coursier/src/sbt-test/sbt-coursier/profiles/output diff --git a/plugin/src/sbt-test/sbt-coursier/profiles/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/profiles/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/profiles/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/profiles/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/profiles/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/profiles/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/profiles/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/profiles/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/profiles/test b/sbt-coursier/src/sbt-test/sbt-coursier/profiles/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/profiles/test rename to sbt-coursier/src/sbt-test/sbt-coursier/profiles/test diff --git a/plugin/src/sbt-test/sbt-coursier/scala-jars/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/scala-jars/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/scala-jars/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/scala-jars/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/scala-jars/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/scala-jars/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/scala-jars/test b/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/scala-jars/test rename to sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/test diff --git a/plugin/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/test b/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/test rename to sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/test diff --git a/plugin/src/sbt-test/sbt-coursier/simple/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/simple/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/simple/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/simple/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/simple/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/simple/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/simple/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/simple/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/simple/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/simple/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/simple/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/simple/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/simple/test b/sbt-coursier/src/sbt-test/sbt-coursier/simple/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/simple/test rename to sbt-coursier/src/sbt-test/sbt-coursier/simple/test diff --git a/plugin/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/test b/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/test rename to sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/test diff --git a/plugin/src/sbt-test/sbt-coursier/typelevel/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/typelevel/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/typelevel/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/typelevel/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/typelevel/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/typelevel/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/typelevel/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/typelevel/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/typelevel/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/typelevel/test b/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/typelevel/test rename to sbt-coursier/src/sbt-test/sbt-coursier/typelevel/test diff --git a/plugin/src/sbt-test/sbt-coursier/zookeeper/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/build.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/zookeeper/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/build.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/zookeeper/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/project/plugins.sbt similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/zookeeper/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/project/plugins.sbt diff --git a/plugin/src/sbt-test/sbt-coursier/zookeeper/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/src/main/scala/Main.scala similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/zookeeper/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/src/main/scala/Main.scala diff --git a/plugin/src/sbt-test/sbt-coursier/zookeeper/test b/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/test similarity index 100% rename from plugin/src/sbt-test/sbt-coursier/zookeeper/test rename to sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/test