summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2015-10-08 11:10:50 -0400
committerSeth Tisue <seth@tisue.net>2015-10-08 11:12:00 -0400
commit37f571355d8516b6391a6f92d644f3753f8b25c3 (patch)
tree9729372c656494ff11de53ce199fac86a50c9823 /README.md
parent5d2c92936ffdab259b71f1adb447602d98222ab2 (diff)
downloadscala-37f571355d8516b6391a6f92d644f3753f8b25c3.tar.gz
scala-37f571355d8516b6391a6f92d644f3753f8b25c3.tar.bz2
scala-37f571355d8516b6391a6f92d644f3753f8b25c3.zip
more readme improvements
* be clearer about required JDK versions * eliminate redundancy with existing src/eclipse and src/intellij readmes * give IntelliJ readme a .md extension
Diffstat (limited to 'README.md')
-rw-r--r--README.md25
1 files changed, 7 insertions, 18 deletions
diff --git a/README.md b/README.md
index c166873514..c015169322 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,11 @@ scala/
## Requirements
-You'll need a Java SDK (6 for 2.11.x, 8 for 2.12.x), Apache Ant (version 1.9.0 or above), and curl (for `./pull-binary-libs.sh`).
+You'll need a Java SDK. The baseline version is 6 for 2.11.x, 8 for
+2.12.x. (It's also possible to use a later SDK for local development,
+but the CI will verify against the baseline version.)
+
+You'll also need Apache Ant (version 1.9.0 or above) and curl (for `./pull-binary-libs.sh`).
## Git Hygiene
@@ -116,25 +120,10 @@ Here, `<milestone>` is the milestone targeted by the PR (e.g., 2.11.6), and `<sh
## IDE Setup
### Eclipse
-Download the [Scala IDE bundle](http://scala-ide.org/download/sdk.html). It comes preconfigured for optimal performance.
-
- - Run `ant init` to download some necessary jars.
- - Import the project (in `src/eclipse`) via `File` → `Import Existing Projects into Workspace`. Check all projects and click ok.
-
-For important details on building, debugging and file encodings, please see [the excellent tutorial on scala-ide.org](http://scala-ide.org/docs/tutorials/scalac-trunk/index.html) and the included README.md in src/eclipse.
+See `src/eclipse/README.md`.
### IntelliJ 14
-Use the latest IntelliJ IDEA release and install the Scala plugin from within the IDE.
-
-The following steps are required to use IntelliJ IDEA on Scala trunk
- - Run `ant init`. This will download some JARs to `./build/deps`, which are included in IntelliJ's classpath.
- - Run `./src/intellij/setup.sh`.
- - Open `./src/intellij/scala.ipr` in IntelliJ.
- - `File` → `Project Structure` → `Project` → `Project SDK`. Create an SDK entry named "1.6" containing the Java 1.6 SDK.
- (You may use a later SDK for local development, but the CI will verify against Java 6.)
-
-Compilation within IDEA is performed in `-Dlocker.skip=1` mode: the sources are built
-directly using the STARR compiler (which is downloaded from [the Central Repository](http://central.sonatype.org/), according to `starr.version` in `versions.properties`).
+See `src/intellij/README.md`.
## Building with sbt (EXPERIMENTAL)