From 77e791b543c907facb782a719b6992d84ada9873 Mon Sep 17 00:00:00 2001 From: Ngoc Dao Date: Thu, 17 Apr 2014 16:01:03 +0900 Subject: [PATCH 1/5] Update SBT from 0.13.1 to 0.13.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 37b489c..8ac605a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.1 +sbt.version=0.13.2 From 91666daeee8166cb181bb758b1709a50406647a5 Mon Sep 17 00:00:00 2001 From: Ngoc Dao Date: Wed, 23 Apr 2014 18:43:49 +0900 Subject: [PATCH 2/5] Use Scala 2.11.0 by default --- README.md | 8 ++++++-- build.sbt | 4 +++- dev/README.rst | 4 ++++ src/main/java/scalive/Agent.java | 6 +++--- src/main/java/scalive/AgentLoader.java | 10 ++++------ src/main/java/scalive/Server.java | 2 +- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 856fb17..fc6ae6f 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,17 @@ scalive-1.1/ 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, 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 and 2.10.4 JARs are preincluded. If your process -is using a different Scala version, you need to manually download the +For convenience, Scala 2.10.3, 2.10.4, and 2.11.0 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. ## Usage diff --git a/build.sbt b/build.sbt index 4ec76d7..2304ce9 100755 --- a/build.sbt +++ b/build.sbt @@ -4,6 +4,8 @@ name := "scalive" version := "1.1-SNAPSHOT" +scalaVersion := "2.11.0" + autoScalaLibrary := false javacOptions ++= Seq("-Xlint:deprecation") @@ -18,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.10.3" +libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.11.0" packageOptions in (Compile, packageBin) += Package.ManifestAttributes( "Main-Class" -> "scalive.AgentLoader", diff --git a/dev/README.rst b/dev/README.rst index d153c4d..f2aa1e8 100644 --- a/dev/README.rst +++ b/dev/README.rst @@ -35,6 +35,10 @@ 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.0.jar + scala-compiler-2.11.0.jar + scala-reflect-2.11.0.jar + While developing: * Run ``sbt package`` to create/update scalive.jar diff --git a/src/main/java/scalive/Agent.java b/src/main/java/scalive/Agent.java index c5fc27a..2702567 100644 --- a/src/main/java/scalive/Agent.java +++ b/src/main/java/scalive/Agent.java @@ -15,9 +15,9 @@ public class Agent { * jarpath/ * scalive.jar * - * scala-library-2.10.3.jar - * scala-compiler-2.10.3.jar - * scala-reflect-2.10.3.jar + * scala-library-2.11.0.jar + * scala-compiler-2.11.0.jar + * scala-reflect-2.11.0.jar * * [Other Scala versions] * }}} diff --git a/src/main/java/scalive/AgentLoader.java b/src/main/java/scalive/AgentLoader.java index 14b80d7..a5af9ba 100644 --- a/src/main/java/scalive/AgentLoader.java +++ b/src/main/java/scalive/AgentLoader.java @@ -16,13 +16,11 @@ public class AgentLoader { * * {{{ * jarpath/ - * scalive-agent.jar - * scalive-client.jar - * scalive-repl.jar + * scalive.jar * - * scala-library-2.10.3.jar - * scala-compiler-2.10.3.jar - * scala-reflect-2.10.3.jar + * scala-library-2.11.0.jar + * scala-compiler-2.11.0.jar + * scala-reflect-2.11.0.jar * * [Other Scala versions] * }}} diff --git a/src/main/java/scalive/Server.java b/src/main/java/scalive/Server.java index 58e2286..0ef73b9 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.10.3"; + private static final String DEFAULT_SCALA_VERSION = "2.11.0"; public static void serve(Socket client, String[] jarpaths) throws Exception { InputStream in = client.getInputStream(); From 1356719098ec474b16848e520a3fd0bbd8f32cbc Mon Sep 17 00:00:00 2001 From: Ngoc Dao Date: Wed, 23 Apr 2014 18:45:17 +0900 Subject: [PATCH 3/5] Use Scala 2.11.0 by default --- dev/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/README.rst b/dev/README.rst index f2aa1e8..8135eeb 100644 --- a/dev/README.rst +++ b/dev/README.rst @@ -25,7 +25,7 @@ This is the directory that will be zipped when Scalive is released. zip/ scalive scalive.cmd - scalive_2.10-1.1-SNAPSHOT.jar -> ../../target/scala-2.10/scalive_2.10-1.1-SNAPSHOT.jar + scalive_2.11-1.1-SNAPSHOT.jar -> ../../target/scala-2.11/scalive_2.11-1.1-SNAPSHOT.jar scala-library-2.10.3.jar scala-compiler-2.10.3.jar From 0fda7baabb753b0fb1866f8e706fff1122f21ed6 Mon Sep 17 00:00:00 2001 From: Ngoc Dao Date: Wed, 23 Apr 2014 18:50:07 +0900 Subject: [PATCH 4/5] Release 1.2 --- README.md | 6 +++--- build.sbt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fc6ae6f..a96fc2a 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,14 @@ JVM processes without any prior setup at the target process. ## Download Download and extract -[scalive-1.1.zip](https://github.com/ngocdaothanh/scalive/releases/download/v1.1/scalive-1.1.zip), +[scalive-1.2.zip](https://github.com/ngocdaothanh/scalive/releases/download/v1.2/scalive-1.2.zip), you will see: ``` -scalive-1.1/ +scalive-1.2/ scalive scalive.cmd - scalive-1.1.jar + scalive-1.2.jar scala-library-2.10.3.jar scala-compiler-2.10.3.jar diff --git a/build.sbt b/build.sbt index 2304ce9..cf095b2 100755 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "tv.cntt" name := "scalive" -version := "1.1-SNAPSHOT" +version := "1.2-SNAPSHOT" scalaVersion := "2.11.0" From 39db90456ba8dcdf0b83e1538a3a0b1d6373c343 Mon Sep 17 00:00:00 2001 From: Ngoc Dao Date: Wed, 23 Apr 2014 18:51:02 +0900 Subject: [PATCH 5/5] Release 1.2 which uses Scala 2.11.0 by default --- dev/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/README.rst b/dev/README.rst index 8135eeb..42525b2 100644 --- a/dev/README.rst +++ b/dev/README.rst @@ -25,7 +25,7 @@ This is the directory that will be zipped when Scalive is released. zip/ scalive scalive.cmd - scalive_2.11-1.1-SNAPSHOT.jar -> ../../target/scala-2.11/scalive_2.11-1.1-SNAPSHOT.jar + 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