Merge branch 'dev'

Author: ngocdaothanh

README.md

@@ -15,23 +15,19 @@ scalive-1.2/
   scalive.cmd
   scalive-1.2.jar
 
-  scala-library-2.10.3.jar
-  scala-compiler-2.10.3.jar
-  scala-reflect-2.10.3.jar
-
   scala-library-2.10.4.jar
   scala-compiler-2.10.4.jar
   scala-reflect-2.10.4.jar
 
-  scala-library-2.11.0.jar
-  scala-compiler-2.11.0.jar
-  scala-reflect-2.11.0.jar
+  scala-library-2.11.1.jar
+  scala-compiler-2.11.1.jar
+  scala-reflect-2.11.1.jar
 ```
 
 scala-library, scala-compiler, and scala-reflect of the appropriate version
 will be loaded to your running JVM process, if they have not been loaded.
 
-For convenience, Scala 2.10.3, 2.10.4, and 2.11.0 JARs are preincluded. If your
+For convenience, Scala 2.10.4 and 2.11.1 JARs are preincluded. If your
 process is using a different Scala version, you need to manually download the
 corresponding JARs and save them as above.
 

build.sbt

@@ -2,9 +2,9 @@ organization := "tv.cntt"
 
 name         := "scalive"
 
-version      := "1.2-SNAPSHOT"
+version      := "1.3-SNAPSHOT"
 
-scalaVersion := "2.11.0"
+scalaVersion := "2.11.1"
 
 autoScalaLibrary := false
 
@@ -20,7 +20,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.0"
+libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.11.1"
 
 packageOptions in (Compile, packageBin) += Package.ManifestAttributes(
   "Main-Class"  -> "scalive.AgentLoader",

dev/README.rst

@@ -27,17 +27,13 @@ This is the directory that will be zipped when Scalive is released.
     scalive.cmd
     scalive_2.11-1.2-SNAPSHOT.jar -> ../../target/scala-2.11/scalive_2.11-1.2-SNAPSHOT.jar
 
-    scala-library-2.10.3.jar
-    scala-compiler-2.10.3.jar
-    scala-reflect-2.10.3.jar
-
     scala-library-2.10.4.jar
     scala-compiler-2.10.4.jar
     scala-reflect-2.10.4.jar
 
-    scala-library-2.11.0.jar
-    scala-compiler-2.11.0.jar
-    scala-reflect-2.11.0.jar
+    scala-library-2.11.1.jar
+    scala-compiler-2.11.1.jar
+    scala-reflect-2.11.1.jar
 
 While developing:
 
@@ -58,14 +54,14 @@ released (remember to remove uneccessary files, like .gitignore):
     scalive.cmd
     scalive-<version>.jar  <-- Doesn't depend on Scala, thus doesn't follow Scala JAR naming
 
-    scala-library-2.10.3.jar
-    scala-compiler-2.10.3.jar
-    scala-reflect-2.10.3.jar
-
     scala-library-2.10.4.jar
     scala-compiler-2.10.4.jar
     scala-reflect-2.10.4.jar
 
+    scala-library-2.11.1.jar
+    scala-compiler-2.11.1.jar
+    scala-reflect-2.11.1.jar
+
 Then zip it:
 
 ::

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.0";
+    private static final String DEFAULT_SCALA_VERSION = "2.11.1";
 
     public static void serve(Socket client, String[] jarpaths) throws Exception {
         InputStream  in  = client.getInputStream();