Skip to content

Commit d418015

Browse files
committed
Fix #12 Update default Scala from 2.11.2 to 2.11.4
1 parent b1e7564 commit d418015

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ JVM processes without any prior setup at the target process.
66
## Download
77

88
Download and extract
9-
[scalive-1.4.zip](https://github.com/xitrum-framework/scalive/releases/download/1.4/scalive-1.4.zip),
9+
[scalive-1.5.zip](https://github.com/xitrum-framework/scalive/releases/download/1.5/scalive-1.5.zip),
1010
you will see:
1111

1212
```
13-
scalive-1.4/
13+
scalive-1.5/
1414
scalive
1515
scalive.cmd
16-
scalive-1.4.jar
16+
scalive-1.5.jar
1717
1818
scala-library-2.10.4.jar
1919
scala-compiler-2.10.4.jar
2020
scala-reflect-2.10.4.jar
2121
22-
scala-library-2.11.2.jar
23-
scala-compiler-2.11.2.jar
24-
scala-reflect-2.11.2.jar
22+
scala-library-2.11.4.jar
23+
scala-compiler-2.11.4.jar
24+
scala-reflect-2.11.4.jar
2525
```
2626

2727
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,
3232
but scala-compiler and scala-reflect haven't been loaded, Scalive will
3333
automatically load their version 2.10.4.
3434

35-
If none of them has been loaded, Scalive will load version 2.11.2.
35+
If none of them has been loaded, Scalive will load version 2.11.4.
3636

37-
For convenience, Scala 2.10.4 and 2.11.2 JARs are preincluded. If your
37+
For convenience, Scala 2.10.4 and 2.11.4 JARs are preincluded. If your
3838
process is using a different Scala version, you need to manually download the
3939
corresponding JARs from the Internet and save them in the same directory as
4040
above.

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ organization := "tv.cntt"
22

33
name := "scalive"
44

5-
version := "1.4-SNAPSHOT"
5+
version := "1.5-SNAPSHOT"
66

7-
scalaVersion := "2.11.2"
7+
scalaVersion := "2.11.4"
88

99
autoScalaLibrary := false
1010

@@ -23,7 +23,7 @@ javacOptions ++= Seq("-source", "1.6", "-target", "1.6")
2323
// https://blogs.oracle.com/CoreJavaTechTips/entry/the_attach_api
2424
unmanagedJars in Compile := (file(System.getProperty("java.home")) / ".." / "lib" * "tools.jar").classpath
2525

26-
libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.11.2"
26+
libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.11.4" % "provided"
2727

2828
packageOptions in (Compile, packageBin) += Package.ManifestAttributes(
2929
"Main-Class" -> "scalive.AgentLoader",

dev/README.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ This is the directory that will be zipped when Scalive is released.
3131
scala-compiler-2.10.4.jar
3232
scala-reflect-2.10.4.jar
3333

34-
scala-library-2.11.2.jar
35-
scala-compiler-2.11.2.jar
36-
scala-reflect-2.11.2.jar
34+
scala-library-2.11.4.jar
35+
scala-compiler-2.11.4.jar
36+
scala-reflect-2.11.4.jar
3737

3838
While developing:
3939

@@ -58,9 +58,9 @@ released (remember to remove uneccessary files, like .gitignore):
5858
scala-compiler-2.10.4.jar
5959
scala-reflect-2.10.4.jar
6060

61-
scala-library-2.11.2.jar
62-
scala-compiler-2.11.2.jar
63-
scala-reflect-2.11.2.jar
61+
scala-library-2.11.4.jar
62+
scala-compiler-2.11.4.jar
63+
scala-reflect-2.11.4.jar
6464

6565
Then zip it:
6666

src/main/java/scalive/Server.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
public class Server {
1111
// Load this Scala version if Scala has not been loaded in the target process
12-
private static final String DEFAULT_SCALA_VERSION = "2.11.2";
12+
private static final String DEFAULT_SCALA_VERSION = "2.11.4";
1313

1414
public static void serve(Socket client, String[] jarpaths) throws Exception {
1515
InputStream in = client.getInputStream();

0 commit comments

Comments
 (0)