Merge branch 'master' into 'dev'

Author: ngocdaothanh

README.md

@@ -51,7 +51,8 @@ scalive <pid>
 
 Scalive only automatically adds `scala-library.jar`, `scala-compiler.jar`,
 `scala-reflect.jar`, and `scalive.jar` to the system classpath. If you want to
-load additional classes in other JARs, first add the JAR to the system class loader:
+load additional classes in other JARs, first run these in the REPL console to
+add the JAR to the system class loader:
 
 ```
 val cl         = ClassLoader.getSystemClassLoader.asInstanceOf[java.net.URLClassLoader]
@@ -60,8 +61,8 @@ val jarbase    = "mylib"  // Will match "mylibxxx.jar", convenient when there's
 scalive.Classpath.findAndAddJar(cl, searchDirs, jarbase)
 ```
 
-Now the trick is just quit the REPL console and open it again. You will be able
-to use your classes in the JAR as normal:
+Now the trick is just quit the REPL console and connect it to the target process
+again. You will be able to use your classes in the JAR as normal:
 
 ```
 import mylib.foo.Bar

build.sbt

@@ -8,6 +8,12 @@ autoScalaLibrary := false
 
 javacOptions ++= Seq("-Xlint:deprecation")
 
+// Ensure Scalive can run on Java 6
+scalacOptions += "-target:jvm-1.6"
+
+// Ensure Scalive can run on Java 6
+javacOptions ++= Seq("-source", "1.6", "-target", "1.6")
+
 // Add tools.jar to classpath
 // https://blogs.oracle.com/CoreJavaTechTips/entry/the_attach_api
 unmanagedJars in Compile := (file(System.getProperty("java.home")) / ".." / "lib" * "tools.jar").classpath
@@ -17,4 +23,4 @@ libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.10.3"
 packageOptions in (Compile, packageBin) += Package.ManifestAttributes(
   "Main-Class"  -> "scalive.AgentLoader",
   "Agent-Class" -> "scalive.Agent"
-)
+)