diff options
| -rw-r--r-- | lib/jline.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | src/jline/build.sbt | 10 | ||||
| -rwxr-xr-x | src/jline/manual-test.sh | 5 | ||||
| -rw-r--r-- | src/jline/project/build.properties | 1 | ||||
| -rw-r--r-- | src/jline/project/plugins.sbt | 3 | ||||
| -rw-r--r-- | src/jline/project/plugins/build.sbt | 5 |
6 files changed, 13 insertions, 13 deletions
diff --git a/lib/jline.jar.desired.sha1 b/lib/jline.jar.desired.sha1 index b0426130ac..1eb994cf1b 100644 --- a/lib/jline.jar.desired.sha1 +++ b/lib/jline.jar.desired.sha1 @@ -1 +1 @@ -a5261e70728c1847639e2b47d953441d0b217bcb *jline.jar +e87ad04fdffb5cd9b7aa9293596d9fdde086eccd ?jline.jar diff --git a/src/jline/build.sbt b/src/jline/build.sbt index 4fc3bab28a..873f7574f1 100644 --- a/src/jline/build.sbt +++ b/src/jline/build.sbt @@ -4,9 +4,9 @@ name := "jline" organization := "org.scala-lang" -version := "2.10.0-SNAPSHOT" +version := "2.11.0-SNAPSHOT" -scalaVersion := "2.9.0-1" +scalaVersion := "2.10.1" // Only need these because of weird testing jline issues. retrieveManaged := true @@ -14,11 +14,11 @@ retrieveManaged := true parallelExecution in Test := false libraryDependencies ++= Seq( - "org.fusesource.jansi" % "jansi" % "1.4", - "com.novocode" % "junit-interface" % "0.7" % "test->default" + "org.fusesource.jansi" % "jansi" % "1.10", + "com.novocode" % "junit-interface" % "0.9" % "test->default" ) -javacOptions ++= Seq("-target", "1.5") +javacOptions ++= Seq("-source", "1.5", "-target", "1.5") proguardOptions ++= Seq( "-dontshrink", diff --git a/src/jline/manual-test.sh b/src/jline/manual-test.sh index aa5131c903..744e1756e8 100755 --- a/src/jline/manual-test.sh +++ b/src/jline/manual-test.sh @@ -3,6 +3,7 @@ # Apparently the jline bundled with sbt interferes with testing some # changes: for instance after changing the keybindings I kept seeing # failures until I realized what was happening and bypassed sbt, like this. +CP=lib_managed/jars/com.novocode/junit-interface/junit-interface-0.9.jar:lib_managed/jars/junit/junit-dep/junit-dep-4.8.2.jar:lib_managed/jars/org.fusesource.jansi/jansi/jansi-1.10.jar:lib_managed/jars/org.hamcrest/hamcrest-core/hamcrest-core-1.1.jar:lib_managed/jars/org.scala-tools.testing/test-interface/test-interface-0.5.jar:target/scala-2.10/test-classes:target/scala-2.10/jline_2.10-2.11.0-SNAPSHOT.min.jar -java -cp lib_managed/jar/com.novocode/junit-interface/junit-interface-0.5.jar:lib_managed/jar/junit/junit/junit-4.8.1.jar:lib_managed/jar/org.fusesource.jansi/jansi/jansi-1.4.jar:lib_managed/jar/org.scala-tools.testing/test-interface/test-interface-0.5.jar:target/scala-2.9.0.1/test-classes:target/scala-2.9.0.1/jline_2.9.0-1-2.10.0-SNAPSHOT.jar \ -org.junit.runner.JUnitCore scala.tools.jline.console.EditLineTest +sbt proguard +java -cp $CP org.junit.runner.JUnitCore scala.tools.jline.console.EditLineTest diff --git a/src/jline/project/build.properties b/src/jline/project/build.properties new file mode 100644 index 0000000000..9b860e23c5 --- /dev/null +++ b/src/jline/project/build.properties @@ -0,0 +1 @@ +sbt.version=0.12.3 diff --git a/src/jline/project/plugins.sbt b/src/jline/project/plugins.sbt new file mode 100644 index 0000000000..9c13de92d8 --- /dev/null +++ b/src/jline/project/plugins.sbt @@ -0,0 +1,3 @@ +resolvers += Resolver.url("sbt-plugin-releases-scalasbt", url("http://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns) + +addSbtPlugin("org.scala-sbt" % "xsbt-proguard-plugin" % "0.1.3") diff --git a/src/jline/project/plugins/build.sbt b/src/jline/project/plugins/build.sbt deleted file mode 100644 index 0e0f27b1eb..0000000000 --- a/src/jline/project/plugins/build.sbt +++ /dev/null @@ -1,5 +0,0 @@ -resolvers += "Proguard plugin repo" at "http://siasia.github.com/maven2" - -libraryDependencies <<= (libraryDependencies, appConfiguration) { (deps, app) => - deps :+ "com.github.siasia" %% "xsbt-proguard-plugin" % app.provider.id.version -} |