Permalink
Browse files

Use sbt 0.12.0

  • Loading branch information...
1 parent 84d9e1b commit a8aba7858186c052291deb3a4b23f6466c9b9cc1 @jberkel committed Aug 14, 2012
View
@@ -2,7 +2,7 @@ name := "sbt-android-plugin"
organization := "org.scala-sbt"
-version := "0.6.2-SNAPSHOT"
+version := "0.6.2"
scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-Xfatal-warnings")
View
@@ -10,6 +10,8 @@
* Add ability to predex external libraries ([PR-107][], [ezh][ezh])
+* Added support for sbt 0.12.x
+
[jberkel]: https://github.com/jberkel
[appamatto]: https://github.com/appamatto
[ezh]: https://github.com/ezh
View
@@ -1 +1 @@
-sbt.version=0.11.3
+sbt.version=0.12.0
@@ -40,7 +40,8 @@ object AndroidHelpers {
val out = new StringBuffer
val exit = adb.run(new ProcessIO(input => (),
output => out.append(IO.readStream(output)),
- error => out.append(IO.readStream(error)))
+ error => out.append(IO.readStream(error)),
+ inheritedInput => false)
).exitValue()
(exit, out.toString)
}
@@ -32,7 +32,8 @@ object AndroidMarketPublish {
val out = new StringBuffer
val exit = jarsigner.run(new ProcessIO(input => (),
output => out.append(IO.readStream(output)),
- error => out.append(IO.readStream(error)))
+ error => out.append(IO.readStream(error)),
+ inheritedInput => false)
).exitValue()
if (exit != 0) sys.error("Error signing: "+out)
s.log.debug(out.toString)
@@ -53,7 +53,9 @@ object OSXPasswordManager extends PWManager {
"-a", account,
"-s", service, "-g").run(new ProcessIO(input => (),
output => (),
- error => buffer.append(IO.readStream(error)))).exitValue() match {
+ error => buffer.append(IO.readStream(error)),
+ inheritedInput => false)
+ ).exitValue() match {
case 0 =>
(for (line <- buffer.toString.split("\r\n");
if (line.startsWith("password: ")))
@@ -88,7 +90,7 @@ object OSXPasswordManager extends PWManager {
if (Seq("security",
"delete-generic-password",
"-l", Label
- ).run(new ProcessIO(input => (), output => (), error => ()))
+ ).run(new ProcessIO(input => (), output => (), error => (), inheritedInput => false))
.exitValue() == 0) clear()
}
}

0 comments on commit a8aba78

Please sign in to comment.