Skip to content

Commit ae13ac0

Browse files
committed
Release 1.4 which uses Scala 2.11.2 by default
1 parent d8a97c1 commit ae13ac0

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,18 @@ scalive-1.4/
2626

2727
scala-library, scala-compiler, and scala-reflect of the appropriate version
2828
will be loaded to your running JVM process, if they have not been loaded.
29+
The REPL console needs these libraries.
30+
31+
For example, your process has already loaded scala-library 2.10.4 by itself,
32+
but scala-compiler and scala-reflect haven't been loaded, Scalive will
33+
automatically load their version 2.10.4.
34+
35+
If none of them has been loaded, Scalive will load version 2.11.2.
2936

3037
For convenience, Scala 2.10.4 and 2.11.2 JARs are preincluded. If your
3138
process is using a different Scala version, you need to manually download the
32-
corresponding JARs and save them as above.
39+
corresponding JARs from the Internet and save them in the same directory as
40+
above.
3341

3442
## Usage
3543

dev/README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ This is the directory that will be zipped when Scalive is released.
2525
zip/
2626
scalive
2727
scalive.cmd
28-
scalive_2.11-1.3-SNAPSHOT.jar -> ../../target/scala-2.11/scalive_2.11-1.3-SNAPSHOT.jar
28+
scalive_2.11-1.4-SNAPSHOT.jar -> ../../target/scala-2.11/scalive_2.11-1.4-SNAPSHOT.jar
2929

3030
scala-library-2.10.4.jar
3131
scala-compiler-2.10.4.jar
@@ -37,9 +37,9 @@ This is the directory that will be zipped when Scalive is released.
3737

3838
While developing:
3939

40-
* Run ``sbt package`` to create/update scalive.jar
41-
* Add missing JARs as above
42-
* Run ``scalive`` to test
40+
* Run ``sbt package`` to create/update scalive.jar.
41+
* Add missing JARs as above.
42+
* Run ``scalive`` to attach to a certain JVM process to see if it works properly.
4343

4444
Release
4545
-------

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.2
1+
sbt.version=0.13.6

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Run sbt eclipse to create Eclipse project file
2-
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0")
2+
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.5.0")
33

44
// Run sbt gen-idea to create IntelliJ project file
5-
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.2")
5+
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")

0 commit comments

Comments
 (0)