diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-07-15 14:48:03 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-07-15 14:48:03 +0200 |
| commit | 2429603c3fe9c2287907690ceda25c599270864b (patch) | |
| tree | d3b6c1e209b6844c2d1fb8b3befedd10eeba7938 | |
| parent | 87eda3ada3f2bab806500e95ee6d902bec57ff70 (diff) | |
| parent | 997647eb0dcf1d4028b50f1e30cbef7ead88784a (diff) | |
| download | scala-2429603c3fe9c2287907690ceda25c599270864b.tar.gz scala-2429603c3fe9c2287907690ceda25c599270864b.tar.bz2 scala-2429603c3fe9c2287907690ceda25c599270864b.zip | |
Merge pull request #3882 from adriaanm/jline-2.12
Bump jline version to 2.12 (Re: SI-8535)
| -rwxr-xr-x | build.xml | 2 | ||||
| -rw-r--r-- | versions.properties | 1 |
2 files changed, 1 insertions, 2 deletions
@@ -187,8 +187,6 @@ TODO: <property name="copyright.string" value="Copyright 2002-2013, LAMP/EPFL"/> - <property name="jline.version" value="2.11"/> - <!-- These are NOT the flags used to run SuperSabbus, but the ones written into the script runners created with scala.tools.ant.ScalaTool --> <property name="java.flags" value="-Xmx256M -Xms32M"/> diff --git a/versions.properties b/versions.properties index 1212734d22..c334629d20 100644 --- a/versions.properties +++ b/versions.properties @@ -24,6 +24,7 @@ scala-continuations-library.version.number=1.0.2 scala-swing.version.number=1.0.1 akka-actor.version.number=2.3.3 actors-migration.version.number=1.1.0 +jline.version=2.12 # external modules, used internally (not shipped) partest.version.number=1.0.0 |