summaryrefslogtreecommitdiff
path: root/project/Layers.scala
diff options
context:
space:
mode:
authorJosh Suereth <joshua.suereth@gmail.com>2011-12-16 10:49:28 -0500
committerJosh Suereth <joshua.suereth@gmail.com>2011-12-16 10:49:28 -0500
commit971536593f33f357356b4c58d8a66742755801b8 (patch)
tree01b88f42d6ac16f44d59500266461ec46f5e8298 /project/Layers.scala
parente5961909c0775682d840aa18baabea9755c82822 (diff)
downloadscala-971536593f33f357356b4c58d8a66742755801b8.tar.gz
scala-971536593f33f357356b4c58d8a66742755801b8.tar.bz2
scala-971536593f33f357356b4c58d8a66742755801b8.zip
Brought version detection up-to-date.
* SBT's version creation is now on par with tools/get-latest-version
Diffstat (limited to 'project/Layers.scala')
-rw-r--r--project/Layers.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/project/Layers.scala b/project/Layers.scala
index 905d312fff..d39e58014c 100644
--- a/project/Layers.scala
+++ b/project/Layers.scala
@@ -57,7 +57,7 @@ trait Layers extends Build {
// TODO - Allow other scalac option settings.
scalacOptions in Compile <++= (scalaSource in Compile) map (src => Seq("-sourcepath", src.getAbsolutePath)),
classpathOptions := ClasspathOptions.manual,
- resourceGenerators in Compile <+= (baseDirectory, version, resourceManaged, gitRunner) map Release.generatePropertiesFile("library.properties"),
+ resourceGenerators in Compile <+= (baseDirectory, version, resourceManaged, gitRunner, streams) map Release.generatePropertiesFile("library.properties"),
referenceScala
)
@@ -70,7 +70,7 @@ trait Layers extends Build {
defaultExcludes := ("tests"),
javacOptions ++= Seq("-source", "1.4"),
defaultExcludes in unmanagedResources := "*.scala",
- resourceGenerators in Compile <+= (baseDirectory, version, resourceManaged, gitRunner) map Release.generatePropertiesFile("compiler.properties"),
+ resourceGenerators in Compile <+= (baseDirectory, version, resourceManaged, gitRunner, streams) map Release.generatePropertiesFile("compiler.properties"),
// Note, we might be able to use the default task, but for some reason ant was filtering files out. Not sure what's up, but we'll
// stick with that for now.
unmanagedResources in Compile <<= (baseDirectory) map {