From 4d86a4b3f844c06c94521017b38b9fd23fcdfb79 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 28 Mar 2016 14:05:27 -0400 Subject: [PATCH] Port dependency-management/pom-classpaths --- .../pom-classpaths/build.sbt | 34 +++++++++++++++++ .../pom-classpaths/project/Build.scala | 38 ------------------- 2 files changed, 34 insertions(+), 38 deletions(-) create mode 100644 sbt/src/sbt-test/dependency-management/pom-classpaths/build.sbt delete mode 100644 sbt/src/sbt-test/dependency-management/pom-classpaths/project/Build.scala diff --git a/sbt/src/sbt-test/dependency-management/pom-classpaths/build.sbt b/sbt/src/sbt-test/dependency-management/pom-classpaths/build.sbt new file mode 100644 index 000000000..cd5d8fb2b --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/pom-classpaths/build.sbt @@ -0,0 +1,34 @@ +import complete._ +import complete.DefaultParsers._ + +lazy val root = (project in file(".")). + settings( + externalPom(), + scalaVersion := "2.9.0-1", + check <<= checkTask, + managedClasspath in Provided <<= (classpathTypes, update) map { (cpts, report) => Classpaths.managedJars(Provided, cpts, report) } + ) + +def checkTask = InputTask(_ => parser ) { result => + (result, managedClasspath in Provided, fullClasspath in Compile, fullClasspath in Test, fullClasspath in Runtime) map { case ((conf, names), p, c, t, r) => + println("Checking: " + conf.name) + checkClasspath(conf match { + case Provided => p + case Compile => c + case Test => t + case Runtime => r + }, names.toSet) + } + } + +lazy val check = InputKey[Unit]("check") +def parser: Parser[(Configuration,Seq[String])] = (Space ~> token(cp(Compile) | cp(Runtime) | cp(Provided) | cp(Test))) ~ spaceDelimited("") +def cp(c: Configuration): Parser[Configuration] = c.name ^^^ c +def checkClasspath(cp: Seq[Attributed[File]], names: Set[String]) = +{ + val fs = cp.files filter { _.getName endsWith ".jar" } + val intersect = fs filter { f => names exists { f.getName startsWith _ } } + assert(intersect == fs, "Expected:" + seqStr(names.toSeq) + "Got: " + seqStr(fs)) + () +} +def seqStr(s: Seq[_]) = s.mkString("\n\t", "\n\t", "\n") diff --git a/sbt/src/sbt-test/dependency-management/pom-classpaths/project/Build.scala b/sbt/src/sbt-test/dependency-management/pom-classpaths/project/Build.scala deleted file mode 100644 index c8633ba71..000000000 --- a/sbt/src/sbt-test/dependency-management/pom-classpaths/project/Build.scala +++ /dev/null @@ -1,38 +0,0 @@ -import sbt._ -import Import._ -import Keys._ -import complete._ -import complete.DefaultParsers._ - -object MyBuild extends Build -{ - lazy val root = Project("root", file(".")) settings( externalPom() :_*) settings( - scalaVersion := "2.9.0-1", - check <<= checkTask, - managedClasspath in Provided <<= (classpathTypes, update) map { (cpts, report) => Classpaths.managedJars(Provided, cpts, report) } - ) - - def checkTask = InputTask(_ => parser ) { result => - (result, managedClasspath in Provided, fullClasspath in Compile, fullClasspath in Test, fullClasspath in Runtime) map { case ((conf, names), p, c, t, r) => - println("Checking: " + conf.name) - checkClasspath(conf match { - case Provided => p - case Compile => c - case Test => t - case Runtime => r - }, names.toSet) - } - } - - lazy val check = InputKey[Unit]("check") - def parser: Parser[(Configuration,Seq[String])] = (Space ~> token(cp(Compile) | cp(Runtime) | cp(Provided) | cp(Test))) ~ spaceDelimited("") - def cp(c: Configuration): Parser[Configuration] = c.name ^^^ c - def checkClasspath(cp: Seq[Attributed[File]], names: Set[String]) = - { - val fs = cp.files filter { _.getName endsWith ".jar" } - val intersect = fs filter { f => names exists { f.getName startsWith _ } } - assert(intersect == fs, "Expected:" + seqStr(names.toSeq) + "Got: " + seqStr(fs)) - () - } - def seqStr(s: Seq[_]) = s.mkString("\n\t", "\n\t", "\n") -}