diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt deleted file mode 100644 index dcebbada7..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt +++ /dev/null @@ -1,18 +0,0 @@ -scalaVersion := "2.12.8" - -libraryDependencies += { - sys.props("sbt.log.noformat") = "true" // disables colors in coursierWhatDependsOn output - "org.apache.zookeeper" % "zookeeper" % "3.5.0-alpha" -} - -lazy val whatDependsOnCheck = TaskKey[Unit]("whatDependsOnCheck") - -import java.nio.file.{Files, Paths} -import CoursierPlugin.autoImport._ - -whatDependsOnCheck := { - val result = (coursierWhatDependsOn in Compile).toTask(" log4j:log4j").value - .replace(System.lineSeparator(), "\n") - val expected = new String(Files.readAllBytes(Paths.get("whatDependsOnResult.log")), "UTF-8") - assert(expected == result, s"Expected '$expected', got '$result'") -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/test b/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/test deleted file mode 100644 index d2b57bc5c..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/test +++ /dev/null @@ -1,2 +0,0 @@ -> coursierDependencyTree -> whatDependsOnCheck diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/whatDependsOnResult.log b/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/whatDependsOnResult.log deleted file mode 100644 index 64d70c9bb..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/whatDependsOnResult.log +++ /dev/null @@ -1,5 +0,0 @@ -dependency-graph (configurations compile) -└─ log4j:log4j:1.2.17 - ├─ org.apache.zookeeper:zookeeper:3.5.0-alpha log4j:log4j:1.2.16 -> 1.2.17 - └─ org.slf4j:slf4j-log4j12:1.7.5 - └─ org.apache.zookeeper:zookeeper:3.5.0-alpha diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/build.sbt deleted file mode 100644 index f808c3249..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/build.sbt +++ /dev/null @@ -1,10 +0,0 @@ -scalaVersion := "2.12.8" - -coursierArtifacts := { - val f = file("coursier-artifacts") - if (f.exists()) - sys.error(s"$f file found") - - java.nio.file.Files.write(f.toPath, Array.empty[Byte]) - coursierArtifacts.value -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/test b/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/test deleted file mode 100644 index b53f21c43..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/test +++ /dev/null @@ -1,4 +0,0 @@ -$ delete coursier-artifacts -> update -$ exists coursier-artifacts -> update diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/build.sbt deleted file mode 100644 index 4138b0846..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/build.sbt +++ /dev/null @@ -1,56 +0,0 @@ -scalaVersion := "2.12.8" - -resolvers += "Private S3 Snapshots" atS3 - "s3://s3-us-west-2.amazonaws.com/bucket-name/snapshots" -resolvers += "Private S3 Releases" atS3 - "s3://s3-us-west-2.amazonaws.com/bucket-name/releases" - -// TODO: Would need a public s3 bucket to download an artifact - -lazy val check = taskKey[Unit]("") - -// Checks FromSbt.repository parses the "s3://" urls correctly. - -check := { - val s: TaskStreams = streams.value - - val sbtResolvers: Seq[sbt.librarymanagement.Resolver] = coursierResolvers.value - - // Sanity check to ensure SBT is loading the resolvers properly - assert(sbtResolvers.exists(_.name == "Private S3 Snapshots")) - assert(sbtResolvers.exists(_.name == "Private S3 Releases")) - - // Have Coursier SBT Plugin Parse the SBT Resolvers - val parsedCoursierResolvers: Seq[coursier.core.Repository] = - sbtResolvers.flatMap{ sbtResolver: sbt.librarymanagement.Resolver => - lmcoursier.internal.Resolvers.repository( - resolver = sbtResolver, - ivyProperties = lmcoursier.internal.ResolutionParams.defaultIvyProperties( - ivyPaths.value.ivyHome - ), - log = s.log, - authentication = None, - classLoaders = Seq() - ) - } - - // Verify the input resolvers == output resolvers - assert( - sbtResolvers.size == parsedCoursierResolvers.size, - s"SBT resolvers size (${sbtResolvers.size}) did not match " + - s"Coursier resolvers size (${parsedCoursierResolvers.size})" - ) - - def containsRepo(repo: String): Boolean = { - val accepted = Set(repo, repo.stripSuffix("/")) - parsedCoursierResolvers.exists { - case m: coursier.maven.MavenRepositoryLike => accepted(m.root) - case _ => false - } - } - - assert(containsRepo("s3://s3-us-west-2.amazonaws.com/bucket-name/snapshots/"), - "Didn't have snapshots s3 repo") - assert(containsRepo("s3://s3-us-west-2.amazonaws.com/bucket-name/releases/"), - "Didn't have releases s3 repo") -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/build.properties b/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/build.properties deleted file mode 100644 index c0bab0494..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.2.8 diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/extra.sbt b/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/extra.sbt deleted file mode 100644 index 8bb66653d..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/extra.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.18.0") \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/plugins.sbt deleted file mode 100644 index 3a2d48ea4..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtCoursier diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/src/main/scala/Foo.scala b/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/src/main/scala/Foo.scala deleted file mode 100644 index d37c10456..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/src/main/scala/Foo.scala +++ /dev/null @@ -1 +0,0 @@ -object Foo \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/test b/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/test deleted file mode 100644 index a5912a391..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-coursier/s3/test +++ /dev/null @@ -1 +0,0 @@ -> check \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/build.sbt deleted file mode 100644 index 7df3d167c..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/build.sbt +++ /dev/null @@ -1,4 +0,0 @@ -scalaVersion := "2.13.1" - -libraryDependencies += "com.typesafe.play" %% "play-test" % "2.8.0-RC1" % Test // worked around in 2.8.0 -libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8" % Test diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/src/test/scala/t/UnitSpec.scala b/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/src/test/scala/t/UnitSpec.scala deleted file mode 100644 index d1735b308..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/src/test/scala/t/UnitSpec.scala +++ /dev/null @@ -1,20 +0,0 @@ -package t - -import com.typesafe.config.ConfigFactory -import org.scalatest.{ MustMatchers, WordSpec } - -class UnitSpec extends WordSpec with MustMatchers { - def conf = ConfigFactory.defaultReference() - - "Config" should { - "return Akka HTTP server provider" in { - val serverProvider = conf.getString("play.server.provider") - serverProvider mustBe "play.core.server.AkkaHttpServerProvider" - } - - "be able to load Netty settings" in { - val nettyTransport = conf.getString("play.server.netty.transport") - nettyTransport mustBe "jdk" - } - } -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/test b/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/test deleted file mode 100644 index 388482c7e..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/test +++ /dev/null @@ -1,6 +0,0 @@ -# https://github.com/coursier/coursier/issues/1466 -> test -# ideally we can flip & assert the test fails -# but need to run this scripted test on sbt 1.3 in order to have a csrConfiguration -# > set csrConfiguration ~= (_.withClasspathOrder(false)) -# -> test diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/evicted/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/evicted/project/plugins.sbt deleted file mode 100644 index 503ac2871..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/evicted/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/neo-sbt-scalafmt/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/neo-sbt-scalafmt/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/neo-sbt-scalafmt/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/build.sbt deleted file mode 100644 index cac761e5c..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/build.sbt +++ /dev/null @@ -1 +0,0 @@ -scalaVersion := "2.13.0" diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/disabled b/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/disabled deleted file mode 100644 index f9d160f99..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/disabled +++ /dev/null @@ -1,4 +0,0 @@ -# currently, the coursier-based sbt launcher starts sbt in the scripted tests -# without the coursier sbt plugins. This pulls the lm-coursier-shaded version -# that sbt depends on, which lacks some methods -> updateClassifiers diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/project/build.properties b/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/project/build.properties deleted file mode 100644 index 50ffba806..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/project/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -# testing regression since this sbt version -sbt.version=1.3.0-RC1 diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/scala-211/typelevel/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/aar-packaging/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/aar-packaging/build.sbt deleted file mode 100644 index d4295f81b..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/aar-packaging/build.sbt +++ /dev/null @@ -1,6 +0,0 @@ -scalaVersion := "2.12.8" - -libraryDependencies += ("com.rengwuxian.materialedittext" % "library" % "2.1.4") - .exclude("com.android.support", "support-v4") - .exclude("com.android.support", "support-annotations") - .exclude("com.android.support", "appcompat-v7") diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/aar-packaging/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/aar-packaging/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/aar-packaging/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/aar-packaging/src/main/scala/Main.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/aar-packaging/src/main/scala/Main.scala deleted file mode 100644 index 61295349d..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/aar-packaging/src/main/scala/Main.scala +++ /dev/null @@ -1,6 +0,0 @@ -import java.io.File -import java.nio.file.Files - -object Main extends App { - Files.write(new File("output").toPath, "OK".getBytes("UTF-8")) -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/aar-packaging/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/aar-packaging/test deleted file mode 100644 index 2182f57b0..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/aar-packaging/test +++ /dev/null @@ -1,3 +0,0 @@ -$ delete output -> run -$ exists output diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/build.sbt deleted file mode 100644 index ca5e529b7..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/build.sbt +++ /dev/null @@ -1,11 +0,0 @@ - -scalaVersion := "2.12.8" - -organization := "io.get-coursier.test" -name := "sbt-coursier-all-exclude-dependencies" -version := "0.1.0-SNAPSHOT" - -libraryDependencies += "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M11" - -allExcludeDependencies += sbt.ExclusionRule("com.chuusai", "shapeless_2.12") -allExcludeDependencies += "io.argonaut" %% "argonaut" diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/coursier b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/coursier deleted file mode 100755 index 1153c1797..000000000 Binary files a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/coursier and /dev/null differ diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/project/build.properties b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/project/build.properties deleted file mode 100644 index 3149e6ba1..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.3.0-M2 diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/src/main/scala/Main.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/src/main/scala/Main.scala deleted file mode 100644 index 89960e16b..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/src/main/scala/Main.scala +++ /dev/null @@ -1,30 +0,0 @@ -import java.io.File -import java.nio.file.Files - -import scala.util.Try - -object Main extends App { - - def classFound(clsName: String) = Try( - Thread.currentThread() - .getContextClassLoader() - .loadClass(clsName) - ).toOption.nonEmpty - - val shapelessFound = classFound("shapeless.HList") - val argonautFound = classFound("argonaut.Json") - val argonautShapelessFound = classFound("argonaut.derive.MkEncodeJson") - - assert( - argonautShapelessFound, - "Expected to find class from argonaut-shapeless" - ) - assert( - !shapelessFound, - "Expected not to find classes from shapeless" - ) - assert( - !argonautFound, - "Expected not to find classes from argonaut" - ) -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/test deleted file mode 100644 index 731ff86e2..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/test +++ /dev/null @@ -1,3 +0,0 @@ -> run -> publishLocal -$ exec java -jar coursier launch io.get-coursier.test:sbt-coursier-all-exclude-dependencies_2.12:0.1.0-SNAPSHOT diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/api-url/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/api-url/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/api-url/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/auto-scala-library/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/auto-scala-library/build.sbt deleted file mode 100644 index 20969e7e5..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/auto-scala-library/build.sbt +++ /dev/null @@ -1,20 +0,0 @@ -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/lm-coursier/sbt-coursier/src/sbt-test/shared-1/auto-scala-library/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/auto-scala-library/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/auto-scala-library/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/auto-scala-library/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/auto-scala-library/test deleted file mode 100644 index f56f5a75e..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/auto-scala-library/test +++ /dev/null @@ -1 +0,0 @@ -> checkScalaLibrary diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/README.md b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/README.md deleted file mode 100644 index 51a739067..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/README.md +++ /dev/null @@ -1 +0,0 @@ -Imported from https://github.com/sbt/sbt/tree/f5edeec2fdabd4313d2976b389bb6101775a5554/sbt/src/sbt-test/dependency-management/cache-local diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/cache.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/cache.sbt deleted file mode 100644 index 869c6d489..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/cache.sbt +++ /dev/null @@ -1 +0,0 @@ -ivyPaths := { IvyPaths(baseDirectory.value, Some(target.value / ".ivy2")) } diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/changes/def.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/changes/def.sbt deleted file mode 100644 index 3e64f64c9..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/changes/def.sbt +++ /dev/null @@ -1,7 +0,0 @@ -organization := "org.example" - -name := "def" - -version := "1.0" - -autoScalaLibrary := false diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/changes/resolver.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/changes/resolver.sbt deleted file mode 100644 index 642794849..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/changes/resolver.sbt +++ /dev/null @@ -1,5 +0,0 @@ - -publishTo := baseDirectory(base => Some(Resolver.file("filesys-publish", base / "repo")) ).value - -resolvers += baseDirectory(base => "filesys" at (base / "repo").toURI.toString).value - diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/changes/use.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/changes/use.sbt deleted file mode 100644 index d1b96f297..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/changes/use.sbt +++ /dev/null @@ -1,9 +0,0 @@ -organization := "org.example" - -name := "use" - -version := "1.0" - -autoScalaLibrary := false - -libraryDependencies += "org.example" %% "def" % "1.0" diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/test deleted file mode 100644 index faf195ef2..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/cache-local/test +++ /dev/null @@ -1,21 +0,0 @@ -$ copy-file changes/def.sbt build.sbt -$ copy-file changes/resolver.sbt resolver.sbt -> reload -> publishLocal -> publish - -$ delete build.sbt -$ delete resolver.sbt -$ copy-file changes/use.sbt build.sbt -> reload -> update -> update - -# needed for sbt-coursier (clear in-memory cache) -> clean -$ delete target/.ivy2/local --> update - -$ copy-file changes/resolver.sbt resolver.sbt -> reload -> update diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/caller/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/caller/project/plugins.sbt deleted file mode 100644 index 503ac2871..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/caller/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/classifiers/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/classifiers/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/classifiers/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/clean/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/clean/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/clean/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/build.sbt deleted file mode 100644 index 14c04d3e6..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/build.sbt +++ /dev/null @@ -1,7 +0,0 @@ -scalaVersion := "2.12.8" - -resolvers += "authenticated" at sys.env("TEST_REPOSITORY") - -coursierCredentials += "authenticated" -> coursier.Credentials(file("credentials")) - -libraryDependencies += "com.abc" % "test" % "0.1" diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/credentials b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/credentials deleted file mode 100644 index 03c71b2e5..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/credentials +++ /dev/null @@ -1,2 +0,0 @@ -user=user -password=pass diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/src/main/scala/Main.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/src/main/scala/Main.scala deleted file mode 100644 index 86ae9e9e3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/src/main/scala/Main.scala +++ /dev/null @@ -1 +0,0 @@ -object Main extends App \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/plugins/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/plugins/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/plugins/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/build.sbt deleted file mode 100644 index f69b5e3e6..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/build.sbt +++ /dev/null @@ -1,10 +0,0 @@ -scalaVersion := "2.12.8" - -resolvers += "authenticated" at sys.env("TEST_REPOSITORY") - -coursierCredentials += "authenticated" -> coursier.Credentials( - sys.env("TEST_REPOSITORY_USER"), - sys.env("TEST_REPOSITORY_PASSWORD") -) - -libraryDependencies += "com.abc" % "test" % "0.1" diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/src/main/scala/Main.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/src/main/scala/Main.scala deleted file mode 100644 index 86ae9e9e3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/src/main/scala/Main.scala +++ /dev/null @@ -1 +0,0 @@ -object Main extends App \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/test deleted file mode 100644 index 103bd8d2f..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/test +++ /dev/null @@ -1 +0,0 @@ -> update diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/plugins/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/plugins/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/plugins/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials/build.sbt deleted file mode 100644 index fab59da31..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials/build.sbt +++ /dev/null @@ -1,11 +0,0 @@ -scalaVersion := "2.12.8" - -resolvers += "authenticated" at sys.env("TEST_REPOSITORY") - -coursierExtraCredentials += lmcoursier.credentials.Credentials( - uri(sys.env("TEST_REPOSITORY")).getHost, - sys.env("TEST_REPOSITORY_USER"), - sys.env("TEST_REPOSITORY_PASSWORD") -).withHttpsOnly(false).withMatchHost(true) - -libraryDependencies += "com.abc" % "test" % "0.1" diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials/src/main/scala/Main.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials/src/main/scala/Main.scala deleted file mode 100644 index 86ae9e9e3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials/src/main/scala/Main.scala +++ /dev/null @@ -1 +0,0 @@ -object Main extends App \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials/test deleted file mode 100644 index 103bd8d2f..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials/test +++ /dev/null @@ -1 +0,0 @@ -> update diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/README.md b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/README.md deleted file mode 100644 index 16cb3eefc..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/README.md +++ /dev/null @@ -1 +0,0 @@ -Adapted from https://github.com/sbt/sbt/tree/57a86e60f6d7c6fd428fb73a6786b62972fdae54/sbt/src/sbt-test/dependency-management/default-artifact diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/build.sbt deleted file mode 100644 index 5e6e57433..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/build.sbt +++ /dev/null @@ -1,13 +0,0 @@ - -resolvers += Resolver.file("buggy", file("repo"))( - Patterns( - ivyPatterns = Vector("[organization]/[module]/[revision]/ivy.xml"), - artifactPatterns = Vector("[organization]/[module]/[revision]/[artifact].[ext]"), - isMavenCompatible = false, - descriptorOptional = true, - skipConsistencyCheck = true - ) -) - -libraryDependencies += "a" % "b" % "1.0.0" % "compile->runtime" artifacts(Artifact("b1", "jar", "jar")) -libraryDependencies += "a" % "b" % "1.0.0" % "test->runtime" artifacts(Artifact("b1", "jar", "jar")) diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/repo/a/b/1.0.0/b1.jar b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/repo/a/b/1.0.0/b1.jar deleted file mode 100644 index 619fa9368..000000000 Binary files a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/repo/a/b/1.0.0/b1.jar and /dev/null differ diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/repo/a/b/1.0.0/b2.jar b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/repo/a/b/1.0.0/b2.jar deleted file mode 100644 index 619fa9368..000000000 Binary files a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/repo/a/b/1.0.0/b2.jar and /dev/null differ diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/repo/a/b/1.0.0/ivy.xml b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/repo/a/b/1.0.0/ivy.xml deleted file mode 100644 index 165b4c192..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/repo/a/b/1.0.0/ivy.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - a - - - - - - - - - - - diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/test deleted file mode 100644 index cd1752ba7..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/default-artifact/test +++ /dev/null @@ -1,5 +0,0 @@ -# Verify that we successfully get the artifacts. -# This project depends on a module for which we cannot generate a "default artifact", -# because no such artifact exists. - -> update \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dependency-overrides/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dependency-overrides/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dependency-overrides/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/LICENSE b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/LICENSE deleted file mode 100644 index 728844ee3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2015 The dotty-example-project contributors. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/README.md b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/README.md deleted file mode 100644 index e476c5c1d..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/README.md +++ /dev/null @@ -1 +0,0 @@ -Cut-n-pasted from https://github.com/lampepfl/dotty-example-project/tree/a753b14e281bbaa6c69f26298913ad6feba969c7 diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/build.sbt deleted file mode 100644 index 817bf2f68..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/build.sbt +++ /dev/null @@ -1,24 +0,0 @@ -scalaVersion.in(ThisBuild) := "0.16.0-RC3" - -organization.in(ThisBuild) := "ch.epfl.lamp" -version.in(ThisBuild) := "0.16.0-bin-SNAPSHOT" - -// same projects (same module / versions) as the dotty-build -// these shouldn't make the internal dependency resolutions of sbt-dotty crash -lazy val `dotty-compiler` = project -lazy val `dotty-doc` = project -lazy val `dotty-interfaces` = project -lazy val `dotty-library` = project -lazy val `dotty-sbt-bridge` = project -lazy val `dotty` = project - -lazy val foo = project - .in(file(".")) - .dependsOn( - `dotty-compiler`, - `dotty-doc`, - `dotty-interfaces`, - `dotty-library`, - `dotty-sbt-bridge`, - `dotty` - ) diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/build.properties b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/build.properties deleted file mode 100644 index 16dc090c5..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/build.properties +++ /dev/null @@ -1,3 +0,0 @@ -# sbt-coursier scripted tests: required, as we default to sbt 1.0.3, -# but sbt-dotty requires sbt >= 1.2.7 -sbt.version=1.2.7 diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/plugins.sbt deleted file mode 100644 index 7b0d11a1f..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/plugins.sbt +++ /dev/null @@ -1,2 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.3") -addSbtCoursier diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/src/main/scala/Main.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/src/main/scala/Main.scala deleted file mode 100644 index 8a44ae4ef..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/src/main/scala/Main.scala +++ /dev/null @@ -1,16 +0,0 @@ - -object Main { - - def main(args: Array[String]): Unit = { - - runExample("Trait Params")(TraitParams.test) - - } - - private def runExample(name: String)(f: => Unit) = { - println(Console.MAGENTA + s"$name example:" + Console.RESET) - f - println() - } - -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/src/main/scala/TraitParams.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/src/main/scala/TraitParams.scala deleted file mode 100644 index 5d4409971..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/src/main/scala/TraitParams.scala +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Trait Parameters: https://dotty.epfl.ch/docs/reference/other-new-features/trait-parameters.html - */ -object TraitParams { - - trait Base(val msg: String) - class A extends Base("Hello") - class B extends Base("Dotty!") - - // Union types only exist in Dotty, so there's no chance that this will accidentally be compiled with Scala 2 - private def printMessages(msgs: (A | B)*) = println(msgs.map(_.msg).mkString(" ")) - - def test: Unit = { - - printMessages(new A, new B) - - // Sanity check the classpath: this won't run if the dotty jar is not present. - val x: Int => Int = z => z - x(1) - } -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/test deleted file mode 100644 index 3a957361c..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/test +++ /dev/null @@ -1 +0,0 @@ -> foo/scalaInstance diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/LICENSE b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/LICENSE deleted file mode 100644 index 728844ee3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2015 The dotty-example-project contributors. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/README.md b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/README.md deleted file mode 100644 index e476c5c1d..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/README.md +++ /dev/null @@ -1 +0,0 @@ -Cut-n-pasted from https://github.com/lampepfl/dotty-example-project/tree/a753b14e281bbaa6c69f26298913ad6feba969c7 diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/build.sbt deleted file mode 100644 index e38070b5e..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/build.sbt +++ /dev/null @@ -1 +0,0 @@ -scalaVersion := "0.13.0-RC1" diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/project/build.properties b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/project/build.properties deleted file mode 100644 index 16dc090c5..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/project/build.properties +++ /dev/null @@ -1,3 +0,0 @@ -# sbt-coursier scripted tests: required, as we default to sbt 1.0.3, -# but sbt-dotty requires sbt >= 1.2.7 -sbt.version=1.2.7 diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/project/plugins.sbt deleted file mode 100644 index 115463586..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/project/plugins.sbt +++ /dev/null @@ -1,2 +0,0 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.0") -addSbtCoursier diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/project/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/src/main/scala/Main.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/src/main/scala/Main.scala deleted file mode 100644 index 8a44ae4ef..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/src/main/scala/Main.scala +++ /dev/null @@ -1,16 +0,0 @@ - -object Main { - - def main(args: Array[String]): Unit = { - - runExample("Trait Params")(TraitParams.test) - - } - - private def runExample(name: String)(f: => Unit) = { - println(Console.MAGENTA + s"$name example:" + Console.RESET) - f - println() - } - -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/src/main/scala/TraitParams.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/src/main/scala/TraitParams.scala deleted file mode 100644 index 5d4409971..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/src/main/scala/TraitParams.scala +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Trait Parameters: https://dotty.epfl.ch/docs/reference/other-new-features/trait-parameters.html - */ -object TraitParams { - - trait Base(val msg: String) - class A extends Base("Hello") - class B extends Base("Dotty!") - - // Union types only exist in Dotty, so there's no chance that this will accidentally be compiled with Scala 2 - private def printMessages(msgs: (A | B)*) = println(msgs.map(_.msg).mkString(" ")) - - def test: Unit = { - - printMessages(new A, new B) - - // Sanity check the classpath: this won't run if the dotty jar is not present. - val x: Int => Int = z => z - x(1) - } -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/test deleted file mode 100644 index 62ea636c1..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/dotty/test +++ /dev/null @@ -1 +0,0 @@ -> run diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/evicted/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/evicted/build.sbt similarity index 100% rename from lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/evicted/build.sbt rename to lm-coursier/sbt-coursier/src/sbt-test/shared-1/evicted/build.sbt diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/evicted/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/evicted/test similarity index 100% rename from lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/evicted/test rename to lm-coursier/sbt-coursier/src/sbt-test/shared-1/evicted/test diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/a/src/main/scala/Main.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/a/src/main/scala/Main.scala deleted file mode 100644 index 89960e16b..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/a/src/main/scala/Main.scala +++ /dev/null @@ -1,30 +0,0 @@ -import java.io.File -import java.nio.file.Files - -import scala.util.Try - -object Main extends App { - - def classFound(clsName: String) = Try( - Thread.currentThread() - .getContextClassLoader() - .loadClass(clsName) - ).toOption.nonEmpty - - val shapelessFound = classFound("shapeless.HList") - val argonautFound = classFound("argonaut.Json") - val argonautShapelessFound = classFound("argonaut.derive.MkEncodeJson") - - assert( - argonautShapelessFound, - "Expected to find class from argonaut-shapeless" - ) - assert( - !shapelessFound, - "Expected not to find classes from shapeless" - ) - assert( - !argonautFound, - "Expected not to find classes from argonaut" - ) -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/b/src/main/scala/Main.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/b/src/main/scala/Main.scala deleted file mode 100644 index 89960e16b..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/b/src/main/scala/Main.scala +++ /dev/null @@ -1,30 +0,0 @@ -import java.io.File -import java.nio.file.Files - -import scala.util.Try - -object Main extends App { - - def classFound(clsName: String) = Try( - Thread.currentThread() - .getContextClassLoader() - .loadClass(clsName) - ).toOption.nonEmpty - - val shapelessFound = classFound("shapeless.HList") - val argonautFound = classFound("argonaut.Json") - val argonautShapelessFound = classFound("argonaut.derive.MkEncodeJson") - - assert( - argonautShapelessFound, - "Expected to find class from argonaut-shapeless" - ) - assert( - !shapelessFound, - "Expected not to find classes from shapeless" - ) - assert( - !argonautFound, - "Expected not to find classes from argonaut" - ) -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/build.sbt deleted file mode 100644 index 7888e23ca..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/build.sbt +++ /dev/null @@ -1,26 +0,0 @@ - -lazy val a = project - .settings( - organization := "io.get-coursier.test", - name := "sbt-coursier-exclude-dependencies", - version := "0.1.0-SNAPSHOT", - scalaVersion := "2.12.8", - libraryDependencies += "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M11", - excludeDependencies += sbt.ExclusionRule("com.chuusai", "shapeless_2.12"), - excludeDependencies += "io.argonaut" %% "argonaut" - ) - -lazy val b = project - .settings( - organization := "io.get-coursier.test", - name := "sbt-coursier-exclude-dependencies-2", - version := "0.1.0-SNAPSHOT", - scalaVersion := "2.12.8", - libraryDependencies ++= Seq( - "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M11", - "com.chuusai" %% "shapeless" % "2.3.3", - "io.argonaut" %% "argonaut" % "6.2.3" - ), - excludeDependencies += sbt.ExclusionRule("com.chuusai", "shapeless_2.12"), - excludeDependencies += "io.argonaut" %% "argonaut" - ) diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/coursier b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/coursier deleted file mode 100755 index eb1b55198..000000000 Binary files a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/coursier and /dev/null differ diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/test deleted file mode 100644 index 11d45a4a2..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/test +++ /dev/null @@ -1,6 +0,0 @@ -> a/run -> a/publishLocal -$ exec java -jar coursier launch io.get-coursier.test:sbt-coursier-exclude-dependencies_2.12:0.1.0-SNAPSHOT -> b/run -> b/publishLocal -$ exec java -jar coursier launch io.get-coursier.test:sbt-coursier-exclude-dependencies-2_2.12:0.1.0-SNAPSHOT diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/a/src/main/scala/A.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/a/src/main/scala/A.scala deleted file mode 100644 index 954405774..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/a/src/main/scala/A.scala +++ /dev/null @@ -1,6 +0,0 @@ - -case class A(msg: String) - -object A { - def default = A("OK") -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/b/src/main/scala/Main.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/b/src/main/scala/Main.scala deleted file mode 100644 index 59bb6d372..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/b/src/main/scala/Main.scala +++ /dev/null @@ -1,9 +0,0 @@ -import java.io.File -import java.nio.file.Files - -object Main extends App { - - val msg = shapeless.Generic[A].to(A.default).head - - Files.write(new File("output").toPath, msg.getBytes("UTF-8")) -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/build.sbt deleted file mode 100644 index 8da3cb827..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/build.sbt +++ /dev/null @@ -1,20 +0,0 @@ - -lazy val a = project - .settings(sharedSettings) - .settings( - libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.234" from "https://oss.sonatype.org/content/repositories/releases/com/chuusai/shapeless_2.12/2.3.3/shapeless_2.12-2.3.3.jar" - ) - -lazy val b = project - .dependsOn(a) - .settings(sharedSettings) - -lazy val root = project - .in(file(".")) - .aggregate(a, b) - .settings(sharedSettings) - - -lazy val sharedSettings = Seq( - scalaVersion := "2.12.8" -) diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/test deleted file mode 100644 index ea53e1abb..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/test +++ /dev/null @@ -1,3 +0,0 @@ -$ delete output -> b/run -$ exists output diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-no-head/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-no-head/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-no-head/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/from/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/global-plugins/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/global-plugins/build.sbt deleted file mode 100644 index 5642f168f..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/global-plugins/build.sbt +++ /dev/null @@ -1 +0,0 @@ -scalaVersion := "2.12.8" diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/global-plugins/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/global-plugins/project/plugins.sbt deleted file mode 100644 index 3a2d48ea4..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/global-plugins/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtCoursier diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/global-plugins/project/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/global-plugins/project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/global-plugins/project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/global-plugins/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/global-plugins/test deleted file mode 100644 index 67a8b1ff1..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/global-plugins/test +++ /dev/null @@ -1,2 +0,0 @@ -> metalsEnable -> bloopInstall diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/build.sbt deleted file mode 100644 index ed962eef6..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/build.sbt +++ /dev/null @@ -1,3 +0,0 @@ -scalaVersion := "2.12.8" - -libraryDependencies += "org.apache.hadoop" % "hadoop-yarn-server-resourcemanager" % "2.7.1" diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala deleted file mode 100644 index 032874759..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala +++ /dev/null @@ -1,8 +0,0 @@ -import java.io.File -import java.nio.file.Files - -import org.apache.zookeeper.ZooKeeper - -object Main extends App { - Files.write(new File("output").toPath, classOf[ZooKeeper].getSimpleName.getBytes("UTF-8")) -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/test deleted file mode 100644 index 2182f57b0..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/test +++ /dev/null @@ -1,3 +0,0 @@ -$ delete output -> run -$ exists output diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-scala-tool/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-scala-tool/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project-scala-tool/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project/a/src/main/scala/A.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project/a/src/main/scala/A.scala deleted file mode 100644 index 5308caa95..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project/a/src/main/scala/A.scala +++ /dev/null @@ -1,6 +0,0 @@ - -object A { - - def msg = "OK" - -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project/b/src/main/scala/Main.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project/b/src/main/scala/Main.scala deleted file mode 100644 index 624039aa5..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project/b/src/main/scala/Main.scala +++ /dev/null @@ -1,13 +0,0 @@ -import java.io.File -import java.nio.file.Files - -import argonaut._, Argonaut._, ArgonautShapeless._ - -object Main extends App { - - case class CC(i: Int, s: String) - - val msg = CC(2, A.msg).asJson.spaces2 - - Files.write(new File("output").toPath, msg.getBytes("UTF-8")) -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project/build.sbt deleted file mode 100644 index b316b5a05..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project/build.sbt +++ /dev/null @@ -1,41 +0,0 @@ - -lazy val sharedSettings = Seq( - scalaVersion := "2.12.8" -) - -/** Module with the same Maven coordinates as shapeless 2.3.3 */ -lazy val `shapeless-mock` = project - .settings(sharedSettings) - .settings( - organization := "com.chuusai", - name := "shapeless", - version := "2.3.3" - ) - -lazy val a = project - .settings(sharedSettings) - .settings( - organization := "com.pany", - name := "a", - version := "0.0.1" - ) - -/** Transitively depends on the - real - shapeless 2.3.3 */ -lazy val b = project - .dependsOn(a) - .settings(sharedSettings) - .settings( - organization := "com.pany", - name := "b", - version := "0.0.1", - libraryDependencies += "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M11" - ) - -lazy val c = project - .dependsOn(b % Configurations.CompilerPlugin) - .settings(sharedSettings) - .settings( - organization := "com.pany", - name := "c", - version := "0.0.1" - ) diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project/test deleted file mode 100644 index 221db3b39..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/inter-project/test +++ /dev/null @@ -1,4 +0,0 @@ -$ delete output -> b/run -$ exists output -> c/compile diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/logger/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-1/logger/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/logger/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-compatible/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-compatible/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-compatible/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/pending similarity index 100% rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/test rename to lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/pending diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/plugins.sbt index a8b4cde61..1f7bae5f9 100644 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/plugins.sbt +++ b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/plugins.sbt @@ -1,2 +1 @@ -addSbtCoursier addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.25") diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/project/plugins.sbt deleted file mode 100644 index 503ac2871..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missing-credentials/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missing-credentials/build.sbt deleted file mode 100644 index bcdd10769..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missing-credentials/build.sbt +++ /dev/null @@ -1,2 +0,0 @@ -scalaVersion := "2.12.8" -credentials += Credentials(file("nope/nope/nope/nope/nope")) diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missing-credentials/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missing-credentials/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missing-credentials/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missing-credentials/src/main/scala/Main.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missing-credentials/src/main/scala/Main.scala deleted file mode 100644 index 86ae9e9e3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missing-credentials/src/main/scala/Main.scala +++ /dev/null @@ -1 +0,0 @@ -object Main extends App \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missing-credentials/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missing-credentials/test deleted file mode 100644 index 103bd8d2f..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missing-credentials/test +++ /dev/null @@ -1 +0,0 @@ -> update diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missingok/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missingok/build.sbt deleted file mode 100644 index 886ddeebb..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missingok/build.sbt +++ /dev/null @@ -1,40 +0,0 @@ -scalaVersion := "2.13.2" -libraryDependencies ++= Seq( - "com.chuusai" %% "shapeless" % "2.3.3", - // non-existing - "org.webjars" % "npm" % "0.0.99" -) -updateConfiguration := updateConfiguration.value.withMissingOk(true) - -lazy val check = taskKey[Unit]("") - -check := { - val updateReport = update.value - val updateClassifiersReport = updateClassifiers.value - - val compileReport = updateReport - .configuration(Compile) - .getOrElse { - sys.error("Compile configuration not found in update report") - } - - val compileClassifiersReport = updateClassifiersReport - .configuration(Compile) - .getOrElse { - sys.error("Compile configuration not found in update classifiers report") - } - - val shapelessModule = compileReport - .modules - .find(_.module.name == "shapeless_2.13") - .getOrElse { - sys.error(s"shapeless module not found in ${compileReport.modules.map(_.module)}") - } - - val shapelessClassifiersModule = compileClassifiersReport - .modules - .find(_.module.name == "shapeless_2.13") - .getOrElse { - sys.error(s"shapeless module not found in ${compileClassifiersReport.modules.map(_.module)}") - } -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missingok/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missingok/project/plugins.sbt deleted file mode 100644 index 503ac2871..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missingok/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missingok/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missingok/test deleted file mode 100644 index 15675b169..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/missingok/test +++ /dev/null @@ -1 +0,0 @@ -> check diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/neo-sbt-scalafmt/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/build.sbt similarity index 100% rename from lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/neo-sbt-scalafmt/build.sbt rename to lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/build.sbt diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/neo-sbt-scalafmt/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/pending similarity index 100% rename from lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/neo-sbt-scalafmt/test rename to lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/pending diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/neo-sbt-scalafmt/project/extra.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/plugins.sbt similarity index 100% rename from lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/neo-sbt-scalafmt/project/extra.sbt rename to lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/plugins.sbt diff --git a/lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/neo-sbt-scalafmt/src/main/scala/Main.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/src/main/scala/Main.scala similarity index 100% rename from lm-coursier/sbt-coursier/src/sbt-test/sbt-lm-coursier/neo-sbt-scalafmt/src/main/scala/Main.scala rename to lm-coursier/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/src/main/scala/Main.scala diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/build.sbt deleted file mode 100644 index 7465c34d7..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/build.sbt +++ /dev/null @@ -1,30 +0,0 @@ - -lazy val noPomCheck = TaskKey[Unit]("noPomCheck") - -noPomCheck := { - - val log = streams.value.log - - val configReport = update.value - .configuration(Compile) - .getOrElse { - throw new Exception( - "compile configuration not found in update report" - ) - } - - val artifacts = configReport - .modules - .flatMap(_.artifacts) - .map(_._1) - - val pomArtifacts = artifacts - .filter { a => - a.`type` == "pom" && a.classifier.isEmpty - } - - for (a <- pomArtifacts) - log.error(s"Found POM artifact $a") - - assert(pomArtifacts.isEmpty) -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/test deleted file mode 100644 index 67b4dc666..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/test +++ /dev/null @@ -1 +0,0 @@ -> noPomCheck diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/per-config-resolution/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/per-config-resolution/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/per-config-resolution/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/profiles/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/profiles/build.sbt deleted file mode 100644 index 4b7ec60fb..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/profiles/build.sbt +++ /dev/null @@ -1,5 +0,0 @@ -scalaVersion := "2.12.8" - -libraryDependencies += "org.apache.spark" %% "spark-sql" % "2.4.3" - -mavenProfiles += "hadoop-3.1" diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/profiles/output b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/profiles/output deleted file mode 100644 index a0aba9318..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/profiles/output +++ /dev/null @@ -1 +0,0 @@ -OK \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/profiles/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/profiles/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/profiles/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/profiles/src/main/scala/Main.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/profiles/src/main/scala/Main.scala deleted file mode 100644 index b1ad346f1..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/profiles/src/main/scala/Main.scala +++ /dev/null @@ -1,19 +0,0 @@ -import java.io.File -import java.nio.file.Files - -object Main extends App { - val p = new java.util.Properties - p.load( - Thread.currentThread() - .getContextClassLoader - .getResource("common-version-info.properties") - .openStream() - ) - - val hadoopVersion = p.getProperty("version") - Console.err.println(s"Found hadoop version $hadoopVersion") - - assert(hadoopVersion.startsWith("3.1.")) - - Files.write(new File("output").toPath, "OK".getBytes("UTF-8")) -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/profiles/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/profiles/test deleted file mode 100644 index 2182f57b0..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/profiles/test +++ /dev/null @@ -1,3 +0,0 @@ -$ delete output -> run -$ exists output diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/provided/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/provided/build.sbt deleted file mode 100644 index 745b26de1..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/provided/build.sbt +++ /dev/null @@ -1,73 +0,0 @@ -import sbt.librarymanagement.Configurations.{ CompileInternal, RuntimeInternal, TestInternal } - -libraryDependencies ++= Seq( - "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M5", - "com.chuusai" %% "shapeless" % "2.3.3" % Provided, - "javax.servlet" % "servlet-api" % "2.5" % Provided -) -scalaVersion := "2.12.11" - -lazy val check = taskKey[Unit]("") - -check := { - - val updateReport = update.value - - def configReport(config: Configuration) = updateReport - .configuration(config) - .getOrElse { - throw new Exception( - s"$config configuration not found in update report" - ) - } - - def checkShapelessVersions(config: Configuration, expected: Option[String]): Unit = { - - val shapelessVersions = configReport(config) - .modules - .map(_.module) - .collect { - case m if m.organization == "com.chuusai" && m.name.startsWith("shapeless") => - m.revision - } - .toSet - - assert( - shapelessVersions == expected.toSet, - s"Expected shapeless versions ${expected.toSet} in $config, got $shapelessVersions" - ) - } - - def checkServletVersions(config: Configuration, expected: Option[String]): Unit = { - - val servletVersions = configReport(config) - .modules - .map(_.module) - .collect { - case m if m.organization == "javax.servlet" && m.name.startsWith("servlet-api") => - m.revision - } - .toSet - - assert( - servletVersions == expected.toSet, - s"Expected servlet-api versions ${expected.toSet} in $config, got $servletVersions" - ) - } - - checkShapelessVersions(Compile, Some("2.3.2")) - checkShapelessVersions(CompileInternal, Some("2.3.3")) - checkShapelessVersions(Test, Some("2.3.2")) - checkShapelessVersions(TestInternal, Some("2.3.3")) - checkShapelessVersions(Provided, Some("2.3.3")) - checkShapelessVersions(Runtime, Some("2.3.2")) - checkShapelessVersions(RuntimeInternal, Some("2.3.2")) - - checkServletVersions(Compile, None) - checkServletVersions(CompileInternal, Some("2.5")) - checkServletVersions(Test, None) - checkServletVersions(TestInternal, Some("2.5")) - checkServletVersions(Provided, Some("2.5")) - checkServletVersions(Runtime, None) - checkServletVersions(RuntimeInternal, None) -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/provided/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/provided/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/provided/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/provided/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/provided/test deleted file mode 100644 index 15675b169..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/provided/test +++ /dev/null @@ -1 +0,0 @@ -> check diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/pending similarity index 100% rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/test rename to lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/pending diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/project/extra.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/project/extra.sbt deleted file mode 100644 index 15a80bc35..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/project/extra.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/project/plugins.sbt index 71a44ffd3..15a80bc35 100644 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/project/plugins.sbt +++ b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/project/plugins.sbt @@ -1,13 +1 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-sources-javadoc-conf/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-sources-javadoc-conf/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/publish-local-sources-javadoc-conf/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/pending similarity index 100% rename from lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/test rename to lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/pending diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/extra.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/extra.sbt deleted file mode 100644 index 652a3b93b..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/extra.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6") diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/plugins.sbt index 3a2d48ea4..652a3b93b 100644 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/plugins.sbt +++ b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/plugins.sbt @@ -1 +1 @@ -addSbtCoursier +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6") diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/build.sbt deleted file mode 100644 index cac761e5c..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/build.sbt +++ /dev/null @@ -1 +0,0 @@ -scalaVersion := "2.13.0" diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/plugins.sbt deleted file mode 100644 index 2ba44cb94..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/plugins.sbt +++ /dev/null @@ -1,2 +0,0 @@ -addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.2.6") -addSbtCoursier diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/test deleted file mode 100644 index 5df2af1f3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/test +++ /dev/null @@ -1 +0,0 @@ -> compile diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-jars/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-jars/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-jars/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-js/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-js/build.sbt deleted file mode 100644 index 2c43a4b30..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-js/build.sbt +++ /dev/null @@ -1,3 +0,0 @@ -scalaVersion := "2.12.3" -enablePlugins(ScalaJSPlugin) -libraryDependencies += "org.scala-js" %%% "scalajs-java-time" % "0.2.2" diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-js/project/extra.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-js/project/extra.sbt deleted file mode 100644 index 4f6de4f49..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-js/project/extra.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19") diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-js/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-js/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-js/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-js/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-js/test deleted file mode 100644 index 103bd8d2f..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-js/test +++ /dev/null @@ -1 +0,0 @@ -> update diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-sources-javadoc-jars/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-sources-javadoc-jars/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/scala-sources-javadoc-jars/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/semver-reconciliation/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/semver-reconciliation/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/semver-reconciliation/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/simple/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/simple/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/simple/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/strict-conflict-manager/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/strict-conflict-manager/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/strict-conflict-manager/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/tests-classifier/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/tests-classifier/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/tests-classifier/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/unidoc/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/unidoc/build.sbt deleted file mode 100644 index 3aa46422f..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/unidoc/build.sbt +++ /dev/null @@ -1,5 +0,0 @@ -scalaVersion := "2.12.1" -scalacOptions += "-Xfatal-warnings" // required for the test - -enablePlugins(ScalaUnidocPlugin) -autoAPIMappings := true diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/unidoc/project/extra.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/unidoc/project/extra.sbt deleted file mode 100644 index ade7d89a5..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/unidoc/project/extra.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2") diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/unidoc/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/unidoc/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/unidoc/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/unidoc/src/main/scala/Foo.scala b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/unidoc/src/main/scala/Foo.scala deleted file mode 100644 index b5ba8323e..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/unidoc/src/main/scala/Foo.scala +++ /dev/null @@ -1,3 +0,0 @@ - -/** Default instances for Scala's [[scala.concurrent.Future Future]]. */ -class Foo diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/unidoc/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/unidoc/test deleted file mode 100644 index 7439923b4..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/unidoc/test +++ /dev/null @@ -1 +0,0 @@ -> unidoc diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers-2/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers-2/project/plugins.sbt deleted file mode 100644 index 531a4d36f..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers-2/project/plugins.sbt +++ /dev/null @@ -1,15 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} - -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.0") diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/url/README.md b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/url/README.md deleted file mode 100644 index ef566da2e..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/url/README.md +++ /dev/null @@ -1 +0,0 @@ -Originally from https://github.com/sbt/sbt/tree/57a86e60f6d7c6fd428fb73a6786b62972fdae54/sbt/src/sbt-test/dependency-management/url diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/url/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/url/build.sbt deleted file mode 100644 index f3b8f6fa2..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/url/build.sbt +++ /dev/null @@ -1,22 +0,0 @@ -import sbt.internal.inc.classpath.ClasspathUtilities - -lazy val root = (project in file(".")). - settings( - ivyPaths := IvyPaths(baseDirectory.value, Some(target.value / "ivy-cache")), - libraryDependencies += "org.jsoup" % "jsoup" % "1.9.1" % Test from "http://jsoup.org/packages/jsoup-1.9.1.jar", - ivyLoggingLevel := UpdateLogging.Full, - TaskKey[Unit]("checkInTest") := checkClasspath(Test).value, - TaskKey[Unit]("checkInCompile") := checkClasspath(Compile).value - ) - -def checkClasspath(conf: Configuration) = - fullClasspath in conf map { cp => - try { - val loader = ClasspathUtilities.toLoader(cp.files) - Class.forName("org.jsoup.Jsoup", false, loader) - () - } - catch { - case _: ClassNotFoundException => sys.error(s"could not instantiate org.jsoup.Jsoup: ${cp.files}") - } - } diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/url/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/url/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/url/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/url/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/url/test deleted file mode 100644 index 691336b66..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/url/test +++ /dev/null @@ -1,2 +0,0 @@ -> checkInTest --> checkInCompile diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-interval/build.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-interval/build.sbt deleted file mode 100644 index efeaf236e..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-interval/build.sbt +++ /dev/null @@ -1,35 +0,0 @@ - -libraryDependencies += "org.json4s" %% "json4s-native" % "[3.3.0,3.5.0)" - - -lazy val actualVersionCheck = taskKey[Unit]("") - -actualVersionCheck := { - - val log = streams.value.log - - val configReport = update.value - .configuration(Compile) - .getOrElse { - sys.error("compile configuration not found in update report") - } - - val modules = configReport - .modules - .map(_.module) - - assert(modules.nonEmpty) - assert(modules.exists(_.name.startsWith("json4s-native"))) - - val wrongModules = modules.filter { m => - val v = m.revision - v.contains("[") || v.contains("]") || v.contains("(") || v.contains(")") - } - - if (wrongModules.nonEmpty) { - log.error("Found unexpected intervals in revisions") - for (m <- wrongModules) - log.error(s" ${m.organization}:${m.name}:${m.revision}") - sys.error("Found intervals in revisions") - } -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-interval/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-interval/project/plugins.sbt deleted file mode 100644 index 503ac2871..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-interval/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-interval/test b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-interval/test deleted file mode 100644 index 99803d595..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-interval/test +++ /dev/null @@ -1 +0,0 @@ -> actualVersionCheck diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-reconciliation/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-reconciliation/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/version-reconciliation/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/whitespace-resolver/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/whitespace-resolver/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/whitespace-resolver/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/zookeeper/project/plugins.sbt b/lm-coursier/sbt-coursier/src/sbt-test/shared-2/zookeeper/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/lm-coursier/sbt-coursier/src/sbt-test/shared-2/zookeeper/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -addSbtPlugin { - - val name = sys.props.getOrElse( - "plugin.name", - sys.error("plugin.name Java property not set") - ) - val version = sys.props.getOrElse( - "plugin.version", - sys.error("plugin.version Java property not set") - ) - - "io.get-coursier" % name % version -} \ No newline at end of file diff --git a/sbt-app/src/sbt-test/dependency-management/credentials/test b/sbt-app/src/sbt-test/dependency-management/credentials/test deleted file mode 100644 index 103bd8d2f..000000000 --- a/sbt-app/src/sbt-test/dependency-management/credentials/test +++ /dev/null @@ -1 +0,0 @@ -> update diff --git a/sbt-app/src/sbt-test/dependency-management/credentials/build.sbt b/sbt-app/src/sbt-test/dependency-management/missing-credentials/build.sbt similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/credentials/build.sbt rename to sbt-app/src/sbt-test/dependency-management/missing-credentials/build.sbt diff --git a/lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/test b/sbt-app/src/sbt-test/dependency-management/missing-credentials/test similarity index 100% rename from lm-coursier/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/test rename to sbt-app/src/sbt-test/dependency-management/missing-credentials/test