From d418015f8afc620c05e0ac099e3f37086daa9499 Mon Sep 17 00:00:00 2001
From: Ngoc Dao <ngocdaothanh@gmail.com>
Date: Wed, 31 Dec 2014 06:24:13 +0700
Subject: [PATCH] Fix #12 Update default Scala from 2.11.2 to 2.11.4

---
 README.md                         | 16 ++++++++--------
 build.sbt                         |  6 +++---
 dev/README.rst                    | 12 ++++++------
 src/main/java/scalive/Server.java |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 566d47d..2974874 100644
--- a/README.md
+++ b/README.md
@@ -6,22 +6,22 @@ JVM processes without any prior setup at the target process.
 ## Download
 
 Download and extract
-[scalive-1.4.zip](https://github.com/xitrum-framework/scalive/releases/download/1.4/scalive-1.4.zip),
+[scalive-1.5.zip](https://github.com/xitrum-framework/scalive/releases/download/1.5/scalive-1.5.zip),
 you will see:
 
 ```
-scalive-1.4/
+scalive-1.5/
   scalive
   scalive.cmd
-  scalive-1.4.jar
+  scalive-1.5.jar
 
   scala-library-2.10.4.jar
   scala-compiler-2.10.4.jar
   scala-reflect-2.10.4.jar
 
-  scala-library-2.11.2.jar
-  scala-compiler-2.11.2.jar
-  scala-reflect-2.11.2.jar
+  scala-library-2.11.4.jar
+  scala-compiler-2.11.4.jar
+  scala-reflect-2.11.4.jar
 ```
 
 scala-library, scala-compiler, and scala-reflect of the appropriate version
@@ -32,9 +32,9 @@ For example, your process has already loaded scala-library 2.10.4 by itself,
 but scala-compiler and scala-reflect haven't been loaded, Scalive will
 automatically load their version 2.10.4.
 
-If none of them has been loaded, Scalive will load version 2.11.2.
+If none of them has been loaded, Scalive will load version 2.11.4.
 
-For convenience, Scala 2.10.4 and 2.11.2 JARs are preincluded. If your
+For convenience, Scala 2.10.4 and 2.11.4 JARs are preincluded. If your
 process is using a different Scala version, you need to manually download the
 corresponding JARs from the Internet and save them in the same directory as
 above.
diff --git a/build.sbt b/build.sbt
index a7bc268..479177d 100755
--- a/build.sbt
+++ b/build.sbt
@@ -2,9 +2,9 @@ organization := "tv.cntt"
 
 name         := "scalive"
 
-version      := "1.4-SNAPSHOT"
+version      := "1.5-SNAPSHOT"
 
-scalaVersion := "2.11.2"
+scalaVersion := "2.11.4"
 
 autoScalaLibrary := false
 
@@ -23,7 +23,7 @@ javacOptions ++= Seq("-source", "1.6", "-target", "1.6")
 // https://blogs.oracle.com/CoreJavaTechTips/entry/the_attach_api
 unmanagedJars in Compile := (file(System.getProperty("java.home")) / ".." / "lib" * "tools.jar").classpath
 
-libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.11.2"
+libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.11.4" % "provided"
 
 packageOptions in (Compile, packageBin) += Package.ManifestAttributes(
   "Main-Class"  -> "scalive.AgentLoader",
diff --git a/dev/README.rst b/dev/README.rst
index c23f26d..65120d9 100644
--- a/dev/README.rst
+++ b/dev/README.rst
@@ -31,9 +31,9 @@ This is the directory that will be zipped when Scalive is released.
     scala-compiler-2.10.4.jar
     scala-reflect-2.10.4.jar
 
-    scala-library-2.11.2.jar
-    scala-compiler-2.11.2.jar
-    scala-reflect-2.11.2.jar
+    scala-library-2.11.4.jar
+    scala-compiler-2.11.4.jar
+    scala-reflect-2.11.4.jar
 
 While developing:
 
@@ -58,9 +58,9 @@ released (remember to remove uneccessary files, like .gitignore):
     scala-compiler-2.10.4.jar
     scala-reflect-2.10.4.jar
 
-    scala-library-2.11.2.jar
-    scala-compiler-2.11.2.jar
-    scala-reflect-2.11.2.jar
+    scala-library-2.11.4.jar
+    scala-compiler-2.11.4.jar
+    scala-reflect-2.11.4.jar
 
 Then zip it:
 
diff --git a/src/main/java/scalive/Server.java b/src/main/java/scalive/Server.java
index 34c1c0f..679b05e 100644
--- a/src/main/java/scalive/Server.java
+++ b/src/main/java/scalive/Server.java
@@ -9,7 +9,7 @@
 
 public class Server {
     // Load this Scala version if Scala has not been loaded in the target process
-    private static final String DEFAULT_SCALA_VERSION = "2.11.2";
+    private static final String DEFAULT_SCALA_VERSION = "2.11.4";
 
     public static void serve(Socket client, String[] jarpaths) throws Exception {
         InputStream  in  = client.getInputStream();