diff --git a/.gitignore b/.gitignore index 533b402af..2f7896d1d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1 @@ target/ -.idea/ -node_modules/ - -# tut backups? -.*.swp - -# pants -.pants.d -.pants.workdir.file_lock -.pids diff --git a/.travis.yml b/.travis.yml index fc44bcdc4..98e82b35f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,22 @@ language: scala scala: 2.12.7 os: linux jdk: oraclejdk8 +before_install: + - git fetch --tags script: - scripts/travis.sh -matrix: +stages: + - name: test + - name: release + if: (branch = master AND type = push) OR (tag IS present) +jobs: include: - - env: SBT_COURSIER=1 + - env: SBT_COURSIER=1 SBT_COURSIER_TEST_GROUP=1 + - env: SBT_COURSIER=1 SBT_COURSIER_TEST_GROUP=2 - env: SBT_SHADING=1 - env: SBT_PGP_COURSIER=1 + - stage: release + script: sbt ci-release branches: only: - master diff --git a/build.sbt b/build.sbt index cf57f7fe0..89002a7ce 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,20 @@ import Aliases._ import Settings._ -import Publish._ + +inThisBuild(List( + organization := "io.get-coursier", + homepage := Some(url("https://github.com/coursier/coursier")), + licenses := Seq("Apache 2.0" -> url("http://opensource.org/licenses/Apache-2.0")), + developers := List( + Developer( + "alexarchambault", + "Alexandre Archambault", + "", + url("https://github.com/alexarchambault") + ) + ) +)) val coursierVersion = "1.1.0-M7" @@ -16,7 +29,7 @@ lazy val `sbt-shared` = project // because we don't publish for 2.11 the following declaration // is more wordy than usual // once support for sbt 0.13 is removed, this dependency can go away - libs ++= { + libraryDependencies ++= { val dependency = "com.dwijnand" % "sbt-compat" % "1.2.6" val sbtV = (sbtBinaryVersion in pluginCrossBuild).value val scalaV = (scalaBinaryVersion in update).value @@ -30,10 +43,12 @@ lazy val `sbt-shared` = project lazy val `sbt-coursier` = project .in(file("modules/sbt-coursier")) + .enablePlugins(ScriptedPlugin) .dependsOn(`sbt-shared`) .settings( plugin, - utest, + libraryDependencies += "com.lihaoyi" %% "utest" % "0.6.4" % Test, + testFrameworks += new TestFramework("utest.runner.Framework"), libraryDependencies ++= Seq( "io.get-coursier" %% "coursier" % coursierVersion, "io.get-coursier" %% "coursier-cache" % coursierVersion, @@ -51,10 +66,16 @@ lazy val `sbt-coursier` = project lazy val `sbt-pgp-coursier` = project .in(file("modules/sbt-pgp-coursier")) + .enablePlugins(ScriptedPlugin) .dependsOn(`sbt-coursier`) .settings( plugin, - libs += Deps.sbtPgp.value, + libraryDependencies += { + val sbtv = CrossVersion.binarySbtVersion(sbtVersion.in(pluginCrossBuild).value) + val sv = scalaBinaryVersion.value + val ver = "1.1.1" + Defaults.sbtPluginExtra("com.jsuereth" % "sbt-pgp" % ver, sbtv, sv) + }, scriptedDependencies := { scriptedDependencies.value // TODO Get dependency projects automatically @@ -64,14 +85,19 @@ lazy val `sbt-pgp-coursier` = project lazy val `sbt-shading` = project .in(file("modules/sbt-shading")) - .enablePlugins(ShadingPlugin) + .enablePlugins(ScriptedPlugin, ShadingPlugin) .dependsOn(`sbt-coursier`) .settings( plugin, shading, - libs += Deps.jarjar % "shaded", + libraryDependencies += "io.get-coursier.jarjar" % "jarjar-core" % "1.0.1-coursier-1" % "shaded", // dependencies of jarjar-core - directly depending on these so that they don't get shaded - libs ++= Deps.jarjarTransitiveDeps, + libraryDependencies ++= Seq( + "com.google.code.findbugs" % "jsr305" % "2.0.2", + "org.ow2.asm" % "asm-commons" % "5.2", + "org.ow2.asm" % "asm-util" % "5.2", + "org.slf4j" % "slf4j-api" % "1.7.25" + ), scriptedDependencies := { scriptedDependencies.value // TODO Get dependency projects automatically @@ -89,8 +115,7 @@ lazy val coursier = project ) .settings( shared, - dontPublish, + skip.in(publish) := true, moduleName := "sbt-coursier-root" ) - diff --git a/modules/sbt-coursier/src/main/scala/coursier/Tasks.scala b/modules/sbt-coursier/src/main/scala/coursier/Tasks.scala index 19d191015..dd58a2b98 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/Tasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/Tasks.scala @@ -814,6 +814,8 @@ object Tasks { val (currentProject, fallbackDependencies, configGraphs) = currentProjectTask.value + val autoScalaLib = autoScalaLibrary.value + val resolvers = resolversTask.value // TODO Warn about possible duplicated modules from source repositories? @@ -909,7 +911,7 @@ object Tasks { forceVersions = // order matters here userForceVersions ++ - (if (configs("compile") || configs("scala-tool")) forcedScalaModules(so, sv) else Map()) ++ + (if (autoScalaLib && (configs("compile") || configs("scala-tool"))) forcedScalaModules(so, sv) else Map()) ++ interProjectDependencies.map(_.moduleVersion), projectCache = parentProjectCache, mapDependencies = if (typelevel && (configs("compile") || configs("scala-tool"))) typelevelOrgSwap else None diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/build.sbt new file mode 100644 index 000000000..20969e7e5 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/build.sbt @@ -0,0 +1,20 @@ +autoScalaLibrary := false +libraryDependencies += "com.chuusai" % "shapeless_2.12" % "2.3.2" + +val checkScalaLibrary = TaskKey[Unit]("checkScalaLibrary") + +checkScalaLibrary := { + val scalaLibsJars = managedClasspath + .in(Compile) + .value + .map(_.data.getName) + .filter(_.startsWith("scala-library")) + .sorted + val expectedScalaLibsJars = Seq( + "scala-library-2.12.0.jar" + ) + assert( + scalaLibsJars == expectedScalaLibsJars, + s"$scalaLibsJars != $expectedScalaLibsJars" + ) +} diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/test new file mode 100644 index 000000000..f56f5a75e --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/auto-scala-library/test @@ -0,0 +1 @@ +> checkScalaLibrary diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/project/helper.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/helper.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/project/helper.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/helper.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/src/main/scala/App.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/src/main/scala/App.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/src/main/scala/App.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/src/main/scala/App.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/credentials b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/credentials similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/credentials rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/credentials diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/whatDependsOnResult.log b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/whatDependsOnResult.log similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/whatDependsOnResult.log rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/whatDependsOnResult.log diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/coursier b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/coursier similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/coursier rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/coursier diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/Dummy.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/Dummy.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/Dummy.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/Dummy.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/a/src/main/scala/A.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/a/src/main/scala/A.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/a/src/main/scala/A.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/a/src/main/scala/A.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/b/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/b/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/b/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/b/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/build.sbt similarity index 95% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/build.sbt index 355f1d74c..45605c30a 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/build.sbt @@ -5,6 +5,8 @@ libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.41" from { val f = file(sys.props("sbttest.base")) / "sbt-coursier" / "from" / "shapeless_2.11-2.3.0.jar" if (!f.exists()) { + f.getParentFile.mkdirs() + val url0 = "https://repo1.maven.org/maven2/com/chuusai/shapeless_2.11/2.3.0/shapeless_2.11-2.3.0.jar" sLog.value.warn(s"Fetching $url0") diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/a/src/main/scala/A.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/a/src/main/scala/A.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/a/src/main/scala/A.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/a/src/main/scala/A.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/b/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/b/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/b/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/b/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/a/src/main/scala/A.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/a/src/main/scala/A.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/a/src/main/scala/A.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/a/src/main/scala/A.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/b/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/b/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/b/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/b/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/logger/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/logger/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/logger/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/logger/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/logger/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/logger/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/output b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/output similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/output rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/output diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/project/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/README b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/README similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/README rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/README diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/pubring.pgp b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/pubring.pgp similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/pubring.pgp rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/pubring.pgp diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/secring.pgp b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/secring.pgp similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/secring.pgp rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/secring.pgp diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/src/main/scala/Foo.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/src/main/scala/Foo.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/src/main/scala/Foo.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/src/main/scala/Foo.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/a/src/main/scala/a/A.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/a/src/main/scala/a/A.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/a/src/main/scala/a/A.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/a/src/main/scala/a/A.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/a/src/test/scala/a/ATest.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/a/src/test/scala/a/ATest.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/a/src/test/scala/a/ATest.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/a/src/test/scala/a/ATest.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/b/src/main/scala/b/B.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/b/src/main/scala/b/B.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/b/src/main/scala/b/B.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/b/src/main/scala/b/B.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/b/src/test/scala/b/BTest.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/b/src/test/scala/b/BTest.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/b/src/test/scala/b/BTest.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/b/src/test/scala/b/BTest.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/src/main/scala/Foo.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/src/main/scala/Foo.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/src/main/scala/Foo.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/src/main/scala/Foo.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/src/main/scala/Foo.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/src/main/scala/Foo.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/src/main/scala/Foo.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/src/main/scala/Foo.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/update-sbt-classifiers/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/update-sbt-classifiers/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/update-sbt-classifiers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/update-sbt-classifiers/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/update-sbt-classifiers/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/update-sbt-classifiers/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/build.sbt rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt new file mode 100644 index 000000000..152225a9e --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt @@ -0,0 +1,11 @@ +{ + val pluginVersion = sys.props.getOrElse( + "plugin.version", + throw new RuntimeException( + """|The system property 'plugin.version' is not defined. + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) + ) + + addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) +} diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/test rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/test diff --git a/project/Aliases.scala b/project/Aliases.scala index da28c68a2..c155ac6b8 100644 --- a/project/Aliases.scala +++ b/project/Aliases.scala @@ -7,36 +7,12 @@ import sbt.librarymanagement.CrossVersion.partialVersion object Aliases { - def libs = libraryDependencies - def withScriptedTests: Seq[Def.Setting[_]] = ScriptedPlugin.globalSettings ++ ScriptedPlugin.projectSettings.filterNot(_.key.key.label == libraryDependencies.key.label) ++ Seq( - libraryDependencies ++= { - scalaBinaryVersion.value match { - case "2.12" => - partialVersion(scriptedSbt.value) match { - case Some((1, _)) => - Seq( - "org.scala-sbt" %% "scripted-sbt" % scriptedSbt.value % ScriptedConf, - "org.scala-sbt" % "sbt-launch" % scriptedSbt.value % ScriptedLaunchConf - ) - case other => - sys.error(s"Unrecognized sbt partial version: $other") - } - case _ => - Seq() - } - } + libraryDependencies ++= Seq( + "org.scala-sbt" %% "scripted-sbt" % scriptedSbt.value % ScriptedConf, + "org.scala-sbt" % "sbt-launch" % scriptedSbt.value % ScriptedLaunchConf + ) ) - def hasITs = itSettings - - def ShadingPlugin = coursier.ShadingPlugin - - - implicit class ProjectOps(val proj: Project) extends AnyVal { - def dummy: Project = - proj.in(file(s"target/${proj.id}")) - } - } diff --git a/project/Deps.scala b/project/Deps.scala deleted file mode 100644 index 51f16f1ee..000000000 --- a/project/Deps.scala +++ /dev/null @@ -1,25 +0,0 @@ - -import sbt._ -import sbt.Defaults.sbtPluginExtra -import sbt.Keys._ - -object Deps { - - def sbtPgp = Def.setting { - val sbtv = CrossVersion.binarySbtVersion(sbtVersion.in(pluginCrossBuild).value) - val sv = scalaBinaryVersion.value - val ver = "1.1.1" - sbtPluginExtra("com.jsuereth" % "sbt-pgp" % ver, sbtv, sv) - } - - def jarjar = "io.get-coursier.jarjar" % "jarjar-core" % "1.0.1-coursier-1" - - def jarjarTransitiveDeps = Seq( - "com.google.code.findbugs" % "jsr305" % "2.0.2", - "org.ow2.asm" % "asm-commons" % "5.2", - "org.ow2.asm" % "asm-util" % "5.2", - "org.slf4j" % "slf4j-api" % "1.7.25" - ) - - def utest = "com.lihaoyi" %% "utest" % "0.6.4" -} diff --git a/project/HttpUtil.scala b/project/HttpUtil.scala deleted file mode 100644 index 1bff37b4f..000000000 --- a/project/HttpUtil.scala +++ /dev/null @@ -1,61 +0,0 @@ -import java.io.{ByteArrayOutputStream, InputStream} -import java.net.{HttpURLConnection, URL, URLConnection} -import java.nio.charset.StandardCharsets - -import sbt.Logger - -object HttpUtil { - - private def readFully(is: InputStream): Array[Byte] = { - val buffer = new ByteArrayOutputStream - val data = Array.ofDim[Byte](16384) - - var nRead = 0 - while ({ - nRead = is.read(data, 0, data.length) - nRead != -1 - }) - buffer.write(data, 0, nRead) - - buffer.flush() - buffer.toByteArray - } - - def fetch(url: String, log: Logger, extraHeaders: Seq[(String, String)] = Nil): String = { - - val url0 = new URL(url) - - log.info(s"Fetching $url") - - val (rawResp, code) = { - - var conn: URLConnection = null - var httpConn: HttpURLConnection = null - var is: InputStream = null - - try { - conn = url0.openConnection() - httpConn = conn.asInstanceOf[HttpURLConnection] - for ((k, v) <- extraHeaders) - httpConn.setRequestProperty(k, v) - is = conn.getInputStream - - (readFully(is), httpConn.getResponseCode) - } finally { - if (is != null) - is.close() - if (httpConn != null) { - scala.util.Try(httpConn.getInputStream).filter(_ != null).foreach(_.close()) - scala.util.Try(httpConn.getErrorStream).filter(_ != null).foreach(_.close()) - httpConn.disconnect() - } - } - } - - if (code / 100 != 2) - sys.error(s"Unexpected response code when getting $url: $code") - - new String(rawResp, StandardCharsets.UTF_8) - } - -} diff --git a/project/Mima.scala b/project/Mima.scala deleted file mode 100644 index b9d2f2a3a..000000000 --- a/project/Mima.scala +++ /dev/null @@ -1,24 +0,0 @@ - -import sbt._ -import sbt.Keys._ - -import com.typesafe.tools.mima.plugin.MimaKeys._ - -object Mima { - - // Important: the line with the "binary compatibility versions" comment below is matched during releases - def binaryCompatibilityVersions = Set( - "" // binary compatibility versions - ) - - - lazy val previousArtifacts = Seq( - mimaPreviousArtifacts := { - binaryCompatibilityVersions.collect { - case ver if ver.nonEmpty => - organization.value %% moduleName.value % ver - } - } - ) - -} diff --git a/project/Publish.scala b/project/Publish.scala deleted file mode 100644 index 2ba2a1ba0..000000000 --- a/project/Publish.scala +++ /dev/null @@ -1,74 +0,0 @@ - -import sbt._ -import sbt.Keys._ - -object Publish { - - lazy val dontPublish = Seq( - publish := {}, - publishLocal := {}, - publishArtifact := false - ) - - def dontPublishIn(sbv: String*) = Seq( - // Doesn't work, the second publish or publishLocal seem not to reference the previous implementation of the key. - // This only seems to prevent ivy.xml files to be published locally anyway… - // See also similar case in Settings.scala. - // publish := Def.taskDyn { - // if (sbv.contains(scalaBinaryVersion.value)) - // Def.task(()) - // else - // publish - // }, - // publishLocal := Def.taskDyn { - // if (sbv.contains(scalaBinaryVersion.value)) - // Def.task(()) - // else - // publishLocal - // }, - publishArtifact := { - !sbv.contains(scalaBinaryVersion.value) && publishArtifact.value - } - ) - - private def pomStuff = Seq( - licenses := Seq("Apache 2.0" -> url("http://opensource.org/licenses/Apache-2.0")), - homepage := Some(url("https://github.com/coursier/coursier")), - scmInfo := Some(ScmInfo( - url("https://github.com/coursier/coursier.git"), - "scm:git:github.com/coursier/coursier.git", - Some("scm:git:git@github.com:coursier/coursier.git") - )), - pomExtra := { - - - alexarchambault - Alexandre Archambault - https://github.com/alexarchambault - - - } - ) - - private def pushToSonatypeStuff = Seq( - publishMavenStyle := true, - publishTo := { - val nexus = "https://oss.sonatype.org/" - if (isSnapshot.value) - Some("snapshots" at nexus + "content/repositories/snapshots") - else - Some("releases" at nexus + "service/local/staging/deploy/maven2") - }, - credentials ++= { - Seq("SONATYPE_USER", "SONATYPE_PASS").map(sys.env.get) match { - case Seq(Some(user), Some(pass)) => - Seq(Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", user, pass)) - case _ => - Seq() - } - } - ) - - lazy val released = pomStuff ++ pushToSonatypeStuff - -} diff --git a/project/Settings.scala b/project/Settings.scala index 3c3ae844b..e2aa9bbb8 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -1,12 +1,10 @@ -import java.nio.file.Files - import sbt._ import sbt.Keys._ -import sbt.ScriptedPlugin.autoImport.{sbtLauncher, scriptedBufferLog, ScriptedLaunchConf, scriptedLaunchOpts} +import sbt.ScriptedPlugin.autoImport.{scriptedBufferLog, scriptedLaunchOpts} import com.typesafe.sbt.pgp._ -import coursier.ShadingPlugin.autoImport._ +import coursier.ShadingPlugin.autoImport.{Shading, shadingNamespace} import Aliases._ @@ -14,39 +12,22 @@ object Settings { def scala212 = "2.12.7" - def sonatypeRepository(name: String) = { - resolvers += Resolver.sonatypeRepo(name) - } + def sbt10Version = "1.0.2" - lazy val shared = Publish.released ++ Seq( - organization := "io.get-coursier", - sonatypeRepository("releases"), + lazy val shared = Seq( + resolvers += Resolver.sonatypeRepo("releases"), crossScalaVersions := Seq(scala212), scalaVersion := scala212, scalacOptions ++= Seq( - "-target:jvm-1.8", "-feature", "-deprecation", "-language:higherKinds", "-language:implicitConversions" - ), - javacOptions ++= Seq( - "-source", "1.8", - "-target", "1.8" - ), - javacOptions.in(Keys.doc) := Seq() + ) ) - lazy val utest = Seq( - libs += Deps.utest % Test, - testFrameworks += new TestFramework("utest.runner.Framework") - ) - - def sbt10Version = "1.0.2" - lazy val plugin = shared ++ - withScriptedTests ++ Seq( scriptedLaunchOpts ++= Seq( "-Xmx1024M", @@ -59,10 +40,10 @@ object Settings { ) lazy val shading = - inConfig(_root_.coursier.ShadingPlugin.Shading)(PgpSettings.projectSettings) ++ + inConfig(Shading)(PgpSettings.projectSettings) ++ // Why does this have to be repeated here? // Can't figure out why configuration gets lost without this in particular... - _root_.coursier.ShadingPlugin.projectSettings ++ + coursier.ShadingPlugin.projectSettings ++ Seq( shadingNamespace := "coursier.shaded", publish := publish.in(Shading).value, diff --git a/project/plugins.sbt b/project/plugins.sbt index b561d716a..4547a2d5b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,6 @@ plugins_( + "com.geirsson" % "sbt-ci-release" % "1.2.1", "io.get-coursier" % "sbt-coursier" % coursierVersion, "com.typesafe" % "sbt-mima-plugin" % "0.3.0", "com.jsuereth" % "sbt-pgp" % "1.1.1", diff --git a/scripts/travis.sh b/scripts/travis.sh index e29a63a7d..4d73ff70e 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -16,7 +16,7 @@ sbtShading() { } runSbtCoursierTests() { - ./metadata/scripts/with-test-repo.sh sbt ++$TRAVIS_SCALA_VERSION sbt-coursier/test sbt-coursier/scripted + ./metadata/scripts/with-test-repo.sh sbt ++$TRAVIS_SCALA_VERSION sbt-coursier/test "sbt-coursier/scripted sbt-coursier-group-$SBT_COURSIER_TEST_GROUP/*" } runSbtShadingTests() { diff --git a/version.sbt b/version.sbt deleted file mode 100644 index bd727575e..000000000 --- a/version.sbt +++ /dev/null @@ -1 +0,0 @@ -version in ThisBuild := "1.1.0-SNAPSHOT"