bump sbt version to 1.1.2, restoring incremental compilation

removed sbt-onejar plugin as it isn't yet compatible
https://github.com/sbt/sbt-onejar/issues/35

and updated development.markdown
This commit is contained in:
Arya Irani 2018-06-25 19:13:05 -04:00
parent 7b634bac54
commit dc4b8054ad
4 changed files with 13 additions and 6 deletions

View File

@ -9,14 +9,23 @@ Launch `sbt` in `runtime-jvm` directory, then here are various useful commands:
* `main/test:run 102932 compilation.let3` - runs tests prefixed by `"compilation.let3"` with the random seed 102932
* `benchmark/run` - presents menu of benchmarks to run
* `;clean;coverage;main/test:run;coverageReport` followed optionally by `;coverageOff` - generates test coverage report
* `one-jar` - builds a single jar for a project
* Then `java -jar runtime-jvm/main/target/scala-2.12/unison-runtime_2.12-0.1-SNAPSHOT-one-jar.jar` to run the interpreter.
* `main/compile` - builds the interpreter
* `main/run` - builds and runs the interpreter
The runtime doesn't build with JDK 10 at the moment, but this will work:
```bash
JAVA_HOME=`/usr/libexec/java_home -v 9` sbt <commands ...>
```
To run the built interpreter without booting sbt:
```bash
scala -cp main/target/scala-2.12/classes org.unisonweb.Bootstrap test.ub
```
or from the project root directory:
```bash
scala -cp runtime-jvm/main/target/scala-2.12/classes org.unisonweb.Bootstrap test.ub
```
## Haskell
For doing compilation you can do:

View File

@ -14,7 +14,7 @@ lazy val commonSettings = Seq(
//"-XX:LiveNodeCountInliningCutoff"
),
organization := "org.unisonweb",
scalaVersion := "2.12.4",
scalaVersion := "2.12.6",
scalacOptions ++= Seq(
"-feature",
"-deprecation",
@ -57,7 +57,6 @@ lazy val root = project.in(file(".")).
lazy val main = project.in(file("main"))
.settings(commonSettings)
.settings(name := "unison-runtime")
.settings(com.github.retronym.SbtOneJar.oneJarSettings)
lazy val benchmark = project.in(file("benchmark"))
.settings(commonSettings)

View File

@ -1 +1 @@
sbt.version=0.13.17
sbt.version=1.1.2

View File

@ -4,4 +4,3 @@ scalacOptions ++= Seq(
)
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
addSbtPlugin("org.scala-sbt.plugins" % "sbt-onejar" % "0.8")