Skip to content

Commit 769fdd4

Browse files
committed
Update Scala from 2.11.0 to 2.11.1
1 parent c2bb5a4 commit 769fdd4

File tree

4 files changed

+15
-23
lines changed

4 files changed

+15
-23
lines changed

README.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,19 @@ scalive-1.2/
1515
scalive.cmd
1616
scalive-1.2.jar
1717
18-
scala-library-2.10.3.jar
19-
scala-compiler-2.10.3.jar
20-
scala-reflect-2.10.3.jar
21-
2218
scala-library-2.10.4.jar
2319
scala-compiler-2.10.4.jar
2420
scala-reflect-2.10.4.jar
2521
26-
scala-library-2.11.0.jar
27-
scala-compiler-2.11.0.jar
28-
scala-reflect-2.11.0.jar
22+
scala-library-2.11.1.jar
23+
scala-compiler-2.11.1.jar
24+
scala-reflect-2.11.1.jar
2925
```
3026

3127
scala-library, scala-compiler, and scala-reflect of the appropriate version
3228
will be loaded to your running JVM process, if they have not been loaded.
3329

34-
For convenience, Scala 2.10.3, 2.10.4, and 2.11.0 JARs are preincluded. If your
30+
For convenience, Scala 2.10.4 and 2.11.1 JARs are preincluded. If your
3531
process is using a different Scala version, you need to manually download the
3632
corresponding JARs and save them as above.
3733

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.2-SNAPSHOT"
5+
version := "1.3-SNAPSHOT"
66

7-
scalaVersion := "2.11.0"
7+
scalaVersion := "2.11.1"
88

99
autoScalaLibrary := false
1010

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

23-
libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.11.0"
23+
libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.11.1"
2424

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

dev/README.rst

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,13 @@ This is the directory that will be zipped when Scalive is released.
2727
scalive.cmd
2828
scalive_2.11-1.2-SNAPSHOT.jar -> ../../target/scala-2.11/scalive_2.11-1.2-SNAPSHOT.jar
2929

30-
scala-library-2.10.3.jar
31-
scala-compiler-2.10.3.jar
32-
scala-reflect-2.10.3.jar
33-
3430
scala-library-2.10.4.jar
3531
scala-compiler-2.10.4.jar
3632
scala-reflect-2.10.4.jar
3733

38-
scala-library-2.11.0.jar
39-
scala-compiler-2.11.0.jar
40-
scala-reflect-2.11.0.jar
34+
scala-library-2.11.1.jar
35+
scala-compiler-2.11.1.jar
36+
scala-reflect-2.11.1.jar
4137

4238
While developing:
4339

@@ -58,14 +54,14 @@ released (remember to remove uneccessary files, like .gitignore):
5854
scalive.cmd
5955
scalive-<version>.jar <-- Doesn't depend on Scala, thus doesn't follow Scala JAR naming
6056

61-
scala-library-2.10.3.jar
62-
scala-compiler-2.10.3.jar
63-
scala-reflect-2.10.3.jar
64-
6557
scala-library-2.10.4.jar
6658
scala-compiler-2.10.4.jar
6759
scala-reflect-2.10.4.jar
6860

61+
scala-library-2.11.1.jar
62+
scala-compiler-2.11.1.jar
63+
scala-reflect-2.11.1.jar
64+
6965
Then zip it:
7066

7167
::

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.0";
12+
private static final String DEFAULT_SCALA_VERSION = "2.11.1";
1313

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

0 commit comments

Comments
 (0)