aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-07-02 11:45:58 +0200
committerJason Zaugg <jzaugg@gmail.com>2013-07-02 11:45:58 +0200
commit232a0bb3c9b808ccd2245087ddb296163aefa451 (patch)
tree62affc74c7abfa7d3b57ebc53a8f47460a682c55
parent9156cbeb944db80245766c317f43434b4c1981e5 (diff)
downloadscala-async-232a0bb3c9b808ccd2245087ddb296163aefa451.tar.gz
scala-async-232a0bb3c9b808ccd2245087ddb296163aefa451.tar.bz2
scala-async-232a0bb3c9b808ccd2245087ddb296163aefa451.zip
Build maintainence
- Update to SBT 0.12.4 - Update to Scala 2.10.2 - Provide a means to disable test compilation (other then TreeInterrogation) This is handy when doing major renovations to the macro implementation. - Explicitly depend on scala-compiler (we'll need that in the next commit) - Declare the dependencies on scala-{reflect, compiler} as "provided" to avoid adding them the runtime classpath of upstream projects. They are only needed at compile time.
-rw-r--r--.gitignore1
-rw-r--r--build.sbt9
-rw-r--r--project/build.properties2
3 files changed, 8 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 0c4d130..6bf5f1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ target
.idea
.idea_modules
*.icode
+project/local.sbt \ No newline at end of file
diff --git a/build.sbt b/build.sbt
index c0e062e..f7de6c6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.10.1"
+scalaVersion := "2.10.2"
organization := "org.typesafe.async" // TODO new org name under scala-lang.
@@ -8,8 +8,8 @@ version := "1.0.0-SNAPSHOT"
libraryDependencies <++= (scalaVersion) {
sv => Seq(
- "org.scala-lang" % "scala-reflect" % sv,
- "org.scala-lang" % "scala-compiler" % sv % "test"
+ "org.scala-lang" % "scala-reflect" % sv % "provided",
+ "org.scala-lang" % "scala-compiler" % sv % "provided"
)
}
@@ -40,6 +40,9 @@ startYear := Some(2012)
licenses +=("Scala license", url("https://github.com/scala/async/blob/master/LICENSE"))
+// Uncomment to disable test compilation.
+// (sources in Test) ~= ((xs: Seq[File]) => xs.filter(f => Seq("TreeInterrogation", "package").exists(f.name.contains)))
+
pomExtra := (
<developers>
<developer>
diff --git a/project/build.properties b/project/build.properties
index 2b9d40c..5e96e96 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.1 \ No newline at end of file
+sbt.version=0.12.4