diff --git a/appveyor.yml b/appveyor.yml index 04d77a095..257dac8c4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,7 +24,7 @@ environment: build_script: - ps: Start-Job -filepath .\metadata\scripts\start-it-auth-server.ps1 -ArgumentList $pwd\metadata, $env:TEST_REPOSITORY_HOST, $env:TEST_REPOSITORY_PORT, $env:TEST_REPOSITORY_USER, $env:TEST_REPOSITORY_PASSWORD test_script: - - sbt ++2.12.7 sbt-coursier/scripted sbt-shading/scripted + - sbt ++2.12.7 "sbt-lm-coursier/scripted shared-1/*" "sbt-lm-coursier/scripted shared-2/*" sbt-coursier/scripted sbt-shading/scripted branches: only: - master diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/test b/modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/test rename to modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala b/modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala rename to modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/src/main/scala/App.scala b/modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/src/main/scala/App.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/src/main/scala/App.scala rename to modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/src/main/scala/App.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/test b/modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/test rename to modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/test b/modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/test rename to modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/test b/modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/test rename to modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/test b/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/test rename to modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/test b/modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/test rename to modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/extra.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/extra.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/extra.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/extra.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/test b/modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/test rename to modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/test b/modules/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/test rename to modules/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/test b/modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/test rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/scala-js/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-js/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/extra.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/scala-js/project/extra.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/extra.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-js/project/extra.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/scala-js/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-js/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/test b/modules/sbt-coursier/src/sbt-test/shared-2/scala-js/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/test rename to modules/sbt-coursier/src/sbt-test/shared-2/scala-js/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/simple/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/simple/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/simple/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/simple/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/simple/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/simple/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/test b/modules/sbt-coursier/src/sbt-test/shared-2/simple/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/test rename to modules/sbt-coursier/src/sbt-test/shared-2/simple/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/test b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/test rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel-force-version-stdlib/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/test b/modules/sbt-coursier/src/sbt-test/shared-2/typelevel/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/test rename to modules/sbt-coursier/src/sbt-test/shared-2/typelevel/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/unidoc/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/unidoc/build.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/extra.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/unidoc/project/extra.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/extra.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/unidoc/project/extra.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/unidoc/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/unidoc/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/src/main/scala/Foo.scala b/modules/sbt-coursier/src/sbt-test/shared-2/unidoc/src/main/scala/Foo.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/src/main/scala/Foo.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/unidoc/src/main/scala/Foo.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/test b/modules/sbt-coursier/src/sbt-test/shared-2/unidoc/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/test rename to modules/sbt-coursier/src/sbt-test/shared-2/unidoc/test diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/build.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/build.sbt rename to modules/sbt-coursier/src/sbt-test/shared-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/shared-2/zookeeper/project/plugins.sbt similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt rename to modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/src/main/scala/Main.scala similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/src/main/scala/Main.scala rename to modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/src/main/scala/Main.scala diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/test b/modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/test similarity index 100% rename from modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/test rename to modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/test diff --git a/scripts/travis.sh b/scripts/travis.sh index af5522f57..1cc647126 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -20,7 +20,10 @@ sbtShading() { } runLmCoursierTests() { - sbt ++$TRAVIS_SCALA_VERSION lm-coursier/test + ./metadata/scripts/with-test-repo.sh sbt \ + ++$TRAVIS_SCALA_VERSION \ + lm-coursier/test \ + "sbt-lm-coursier/scripted shared-1/* shared-2/*" } runSbtCoursierTests() {