From 826ac554820cf947e98cdaa6cf5b4bf35d225aa5 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 24 Sep 2018 14:44:29 +0200 Subject: [PATCH] Run former sbt 0.13 specific tests with sbt 1.x too --- .../neo-sbt-scalafmt/build.sbt | 0 .../neo-sbt-scalafmt/project/plugins.sbt | 2 +- .../neo-sbt-scalafmt/src/main/scala/Main.scala | 0 .../neo-sbt-scalafmt/test | 0 .../publish-local-signed/README | 0 .../publish-local-signed/build.sbt | 3 +++ .../publish-local-signed/project/plugins.sbt | 2 +- .../publish-local-signed/pubring.pgp | 0 .../publish-local-signed/secring.pgp | 0 .../publish-local-signed/src/main/scala/Foo.scala | 0 .../publish-local-signed/test | 0 .../unidoc/build.sbt | 0 .../unidoc/project/plugins.sbt | 2 +- .../unidoc/src/main/scala/Foo.scala | 0 .../{sbt-coursier-0.13 => sbt-coursier}/unidoc/test | 0 .../cross-project-shading/build.sbt | 2 +- .../cross-project-shading/coursier | Bin .../jvm/src/main/scala/Main.scala | 0 .../cross-project-shading/project/plugins.sbt | 2 +- .../shared/src/main/scala/Foo.scala | 0 .../cross-project-shading/test | 0 21 files changed, 8 insertions(+), 5 deletions(-) rename sbt-coursier/src/sbt-test/{sbt-coursier-0.13 => sbt-coursier}/neo-sbt-scalafmt/build.sbt (100%) rename sbt-coursier/src/sbt-test/{sbt-coursier-0.13 => sbt-coursier}/neo-sbt-scalafmt/project/plugins.sbt (85%) rename sbt-coursier/src/sbt-test/{sbt-coursier-0.13 => sbt-coursier}/neo-sbt-scalafmt/src/main/scala/Main.scala (100%) rename sbt-coursier/src/sbt-test/{sbt-coursier-0.13 => sbt-coursier}/neo-sbt-scalafmt/test (100%) rename sbt-coursier/src/sbt-test/{sbt-coursier-0.13 => sbt-coursier}/publish-local-signed/README (100%) rename sbt-coursier/src/sbt-test/{sbt-coursier-0.13 => sbt-coursier}/publish-local-signed/build.sbt (69%) rename sbt-coursier/src/sbt-test/{sbt-coursier-0.13 => sbt-coursier}/publish-local-signed/project/plugins.sbt (85%) rename sbt-coursier/src/sbt-test/{sbt-coursier-0.13 => sbt-coursier}/publish-local-signed/pubring.pgp (100%) rename sbt-coursier/src/sbt-test/{sbt-coursier-0.13 => sbt-coursier}/publish-local-signed/secring.pgp (100%) rename sbt-coursier/src/sbt-test/{sbt-coursier-0.13 => sbt-coursier}/publish-local-signed/src/main/scala/Foo.scala (100%) rename sbt-coursier/src/sbt-test/{sbt-coursier-0.13 => sbt-coursier}/publish-local-signed/test (100%) rename sbt-coursier/src/sbt-test/{sbt-coursier-0.13 => sbt-coursier}/unidoc/build.sbt (100%) rename sbt-coursier/src/sbt-test/{sbt-coursier-0.13 => sbt-coursier}/unidoc/project/plugins.sbt (85%) rename sbt-coursier/src/sbt-test/{sbt-coursier-0.13 => sbt-coursier}/unidoc/src/main/scala/Foo.scala (100%) rename sbt-coursier/src/sbt-test/{sbt-coursier-0.13 => sbt-coursier}/unidoc/test (100%) rename sbt-shading/src/sbt-test/{sbt-shading-0.13 => sbt-shading}/cross-project-shading/build.sbt (94%) rename sbt-shading/src/sbt-test/{sbt-shading-0.13 => sbt-shading}/cross-project-shading/coursier (100%) rename sbt-shading/src/sbt-test/{sbt-shading-0.13 => sbt-shading}/cross-project-shading/jvm/src/main/scala/Main.scala (100%) rename sbt-shading/src/sbt-test/{sbt-shading-0.13 => sbt-shading}/cross-project-shading/project/plugins.sbt (85%) rename sbt-shading/src/sbt-test/{sbt-shading-0.13 => sbt-shading}/cross-project-shading/shared/src/main/scala/Foo.scala (100%) rename sbt-shading/src/sbt-test/{sbt-shading-0.13 => sbt-shading}/cross-project-shading/test (100%) diff --git a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/neo-sbt-scalafmt/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/build.sbt similarity index 100% rename from sbt-coursier/src/sbt-test/sbt-coursier-0.13/neo-sbt-scalafmt/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/build.sbt diff --git a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/neo-sbt-scalafmt/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/project/plugins.sbt similarity index 85% rename from sbt-coursier/src/sbt-test/sbt-coursier-0.13/neo-sbt-scalafmt/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/project/plugins.sbt index 5e4c84f03..74fe8317e 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/neo-sbt-scalafmt/project/plugins.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/project/plugins.sbt @@ -10,4 +10,4 @@ addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) } -addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "0.3") +addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15") diff --git a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/neo-sbt-scalafmt/src/main/scala/Main.scala b/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/src/main/scala/Main.scala similarity index 100% rename from sbt-coursier/src/sbt-test/sbt-coursier-0.13/neo-sbt-scalafmt/src/main/scala/Main.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/src/main/scala/Main.scala diff --git a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/neo-sbt-scalafmt/test b/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/test similarity index 100% rename from sbt-coursier/src/sbt-test/sbt-coursier-0.13/neo-sbt-scalafmt/test rename to sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/test diff --git a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/README b/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/README similarity index 100% rename from sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/README rename to sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/README diff --git a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/build.sbt similarity index 69% rename from sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/build.sbt index 8759d53dd..dda7affb7 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/build.sbt @@ -4,3 +4,6 @@ scalaVersion := "2.12.3" credentials.in(GlobalScope) := Seq(Credentials("", "pgp", "", "test password")) pgpSecretRing := baseDirectory.value / "secring.pgp" pgpPublicRing := baseDirectory.value / "pubring.pgp" + +// Workaround for https://github.com/sbt/sbt-pgp/issues/148 +publishTo := Some("dummy" at java.nio.file.Paths.get("").toAbsolutePath.toUri.toASCIIString) diff --git a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/project/plugins.sbt similarity index 85% rename from sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/project/plugins.sbt index 3b6ee8315..6e19fd0da 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/project/plugins.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/project/plugins.sbt @@ -10,4 +10,4 @@ addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) } -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") diff --git a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/pubring.pgp b/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/pubring.pgp similarity index 100% rename from sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/pubring.pgp rename to sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/pubring.pgp diff --git a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/secring.pgp b/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/secring.pgp similarity index 100% rename from sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/secring.pgp rename to sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/secring.pgp diff --git a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/src/main/scala/Foo.scala b/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/src/main/scala/Foo.scala similarity index 100% rename from sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/src/main/scala/Foo.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/src/main/scala/Foo.scala diff --git a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/test b/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/test similarity index 100% rename from sbt-coursier/src/sbt-test/sbt-coursier-0.13/publish-local-signed/test rename to sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/test diff --git a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/unidoc/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/build.sbt similarity index 100% rename from sbt-coursier/src/sbt-test/sbt-coursier-0.13/unidoc/build.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/unidoc/build.sbt diff --git a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/unidoc/project/plugins.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/project/plugins.sbt similarity index 85% rename from sbt-coursier/src/sbt-test/sbt-coursier-0.13/unidoc/project/plugins.sbt rename to sbt-coursier/src/sbt-test/sbt-coursier/unidoc/project/plugins.sbt index debe75f50..ed7c665fe 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/unidoc/project/plugins.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/project/plugins.sbt @@ -10,4 +10,4 @@ addSbtPlugin("io.get-coursier" % "sbt-coursier" % pluginVersion) } -addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.0") +addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2") diff --git a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/unidoc/src/main/scala/Foo.scala b/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/src/main/scala/Foo.scala similarity index 100% rename from sbt-coursier/src/sbt-test/sbt-coursier-0.13/unidoc/src/main/scala/Foo.scala rename to sbt-coursier/src/sbt-test/sbt-coursier/unidoc/src/main/scala/Foo.scala diff --git a/sbt-coursier/src/sbt-test/sbt-coursier-0.13/unidoc/test b/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/test similarity index 100% rename from sbt-coursier/src/sbt-test/sbt-coursier-0.13/unidoc/test rename to sbt-coursier/src/sbt-test/sbt-coursier/unidoc/test diff --git a/sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/build.sbt b/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/build.sbt similarity index 94% rename from sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/build.sbt rename to sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/build.sbt index 0144a1ce2..6ecadf4c7 100644 --- a/sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/build.sbt +++ b/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/build.sbt @@ -9,7 +9,7 @@ lazy val root = crossProject libraryDependencies += "io.argonaut" %% "argonaut" % "6.2-RC2" % "shaded" ) .settings( - scalaVersion := "2.11.8", + scalaVersion := "2.11.12", organization := "io.get-coursier.test", name := "shading-cross-test", version := "0.1.0-SNAPSHOT", diff --git a/sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/coursier b/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/coursier similarity index 100% rename from sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/coursier rename to sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/coursier diff --git a/sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/jvm/src/main/scala/Main.scala b/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/jvm/src/main/scala/Main.scala similarity index 100% rename from sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/jvm/src/main/scala/Main.scala rename to sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/jvm/src/main/scala/Main.scala diff --git a/sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/project/plugins.sbt b/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/project/plugins.sbt similarity index 85% rename from sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/project/plugins.sbt rename to sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/project/plugins.sbt index 046224961..caf456ff5 100644 --- a/sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/project/plugins.sbt +++ b/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/project/plugins.sbt @@ -10,4 +10,4 @@ addSbtPlugin("io.get-coursier" % "sbt-shading" % pluginVersion) } -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25") diff --git a/sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/shared/src/main/scala/Foo.scala b/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/shared/src/main/scala/Foo.scala similarity index 100% rename from sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/shared/src/main/scala/Foo.scala rename to sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/shared/src/main/scala/Foo.scala diff --git a/sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/test b/sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/test similarity index 100% rename from sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/test rename to sbt-shading/src/sbt-test/sbt-shading/cross-project-shading/test