diff options
| author | Paul Phillips <paulp@improving.org> | 2011-03-17 15:32:13 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-03-17 15:32:13 +0000 |
| commit | d6f3184fc8a9eae1bb0dff86ed13b4946f0d4170 (patch) | |
| tree | 0364e55860814cbf2a11748c14f3ad3837d93a88 | |
| parent | 32b05da169e343e787bff45e4eb3da020240a88e (diff) | |
| download | scala-2.9-diverged.tar.gz scala-2.9-diverged.tar.bz2 scala-2.9-diverged.zip | |
Rebuilt jline for java 1.5. No review.v2.9-diverged
| -rw-r--r-- | lib/jline.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | src/jline/project/build/JlineProject.scala | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/jline.jar.desired.sha1 b/lib/jline.jar.desired.sha1 index d672b233ac..9ebe692da4 100644 --- a/lib/jline.jar.desired.sha1 +++ b/lib/jline.jar.desired.sha1 @@ -1 +1 @@ -80aedc428de3beae3608772523a8d29ffcef0e5b ?jline.jar +d656dfd00fc89078cbd5a1084a714b856253d93b ?jline.jar diff --git a/src/jline/project/build/JlineProject.scala b/src/jline/project/build/JlineProject.scala index 721cf607d3..ef1b30c008 100644 --- a/src/jline/project/build/JlineProject.scala +++ b/src/jline/project/build/JlineProject.scala @@ -10,6 +10,8 @@ class JlineProject(info: ProjectInfo) extends DefaultProject(info) with Proguard // val junit = "junit" % "junit" % "4.8.1" % "test" // lazy val jansiPath = (managedDependencyPath / "compile" ** "jansi*").get.toList.head.absolutePath + override def javaCompileOptions = super.javaCompileOptions ++ javaCompileOptions("-target", "1.5") + override def makeInJarFilter(file: String) = { if (!file.startsWith("jansi")) super.makeInJarFilter(file) else List( |