luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use java Pattern directly in launcher instead of Scala API 

This keeps the launch jar smaller
This commit is contained in:
Havoc Pennington 2014-08-15 15:34:11 -04:00
parent d7ca9c5637
commit 705b60dc11
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
launch/src/main/scala/xsbt/boot/ServerApplication.scala
View File

@ -222,12 +222,15 @@ object ServerLauncher {
val stderr = new java.io.LineNumberReader(new java.io.InputStreamReader(process.getErrorStream))
// Looking for the first line which is `java version "1.7.0_60"` or similar
val lineOption = try Option(stderr.readLine()) finally stderr.close()
val re = """java version "[0-9]+\.([0-9]+)\..*".*""".r
lineOption flatMap {
case re(v) => try Some(Integer.parseInt(v) > version) catch { case NonFatal(_) => None }
case other =>
System.err.println(s"Failed to parse version from 'java -version' output '$other'")
val pattern = java.util.regex.Pattern.compile("""java version "[0-9]+\.([0-9]+)\..*".*""")
lineOption flatMap { line =>
val matcher = pattern.matcher(line)
if (matcher.matches()) {
try Some(Integer.parseInt(matcher.group(1)) > version) catch { case NonFatal(_) => None }
} else {
System.err.println(s"Failed to parse version from 'java -version' output '$line'")
None
}
}
} finally {
process.destroy()