Skip to content

Commit

Permalink
Merge pull request #89 from szeiger/prepare-0.2.7
Browse files Browse the repository at this point in the history
Update for release 0.2.7
  • Loading branch information
szeiger authored Aug 27, 2020
2 parents dd62b1d + 9eb232d commit 9fcbb36
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.sc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import mill._, scalalib._, publish._, scalajslib.ScalaJSModule
val sjsonnetVersion = "0.2.6"
val sjsonnetVersion = "0.2.7"

object sjsonnet extends Cross[SjsonnetModule]("2.12.12", "2.13.3")
class SjsonnetModule(val crossScalaVersion: String) extends Module {
Expand Down
18 changes: 12 additions & 6 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Sjsonnet can be used from Java:
<dependency>
<groupId>com.lihaoyi</groupId>
<artifactId>sjsonnet_2.13</artifactId>
<version>0.2.6</version>
<version>0.2.7</version>
</dependency>
```

Expand All @@ -30,8 +30,8 @@ sjsonnet.SjsonnetMain.main0(
From Scala:

```scala
"com.lihaoyi" %% "sjsonnet" % "0.2.6" // SBT
ivy"com.lihaoyi::sjsonnet:0.2.6" // Mill
"com.lihaoyi" %% "sjsonnet" % "0.2.7" // SBT
ivy"com.lihaoyi::sjsonnet:0.2.7" // Mill
```

```scala
Expand All @@ -48,10 +48,10 @@ sjsonnet.SjsonnetMain.main0(

As a standalone executable assembly:

- <https://github.com/lihaoyi/sjsonnet/releases/download/0.2.6/sjsonnet.jar>
- <https://github.com/lihaoyi/sjsonnet/releases/download/0.2.7/sjsonnet.jar>

```bash
$ curl -L https://github.com/lihaoyi/sjsonnet/releases/download/0.2.6/sjsonnet.jar > sjsonnet.jar
$ curl -L https://github.com/lihaoyi/sjsonnet/releases/download/0.2.7/sjsonnet.jar > sjsonnet.jar

$ chmod +x sjsonnet.jar

Expand All @@ -71,7 +71,7 @@ $ ./sjsonnet.jar foo.jsonnet
Or from Javascript:

```javascript
$ curl -L https://github.com/databricks/sjsonnet/releases/download/0.2.6/sjsonnet.js > sjsonnet.js
$ curl -L https://github.com/databricks/sjsonnet/releases/download/0.2.7/sjsonnet.js > sjsonnet.js

$ node

Expand Down Expand Up @@ -240,6 +240,12 @@ To publish, run the following commands:

## Changelog

### 0.2.7

- Streaming JSON output to disk for lower memory usage [#85](https://github.com/databricks/sjsonnet/pull/85)
- Static detection of duplicate fields [#86](https://github.com/databricks/sjsonnet/pull/86)
- Strict mode to disallow error-prone adjacent object literals [#88](https://github.com/databricks/sjsonnet/pull/88)

### 0.2.6

- Add `std.flatMap`, `std.repeat`, `std.clamp`, `std.member`, `std.stripChars`, `std.rstripChars`, `std.lstripChars`
Expand Down
2 changes: 1 addition & 1 deletion sjsonnet/src/sjsonnet/Interpreter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Interpreter(parseCache: collection.mutable.Map[String, fastparse.Parsed[(E
wd: Path,
importer: (Path, String) => Option[(Path, String)],
preserveOrder: Boolean = false,
strict: Boolean = true) {
strict: Boolean = false) {

val evaluator = new Evaluator(
parseCache,
Expand Down

0 comments on commit 9fcbb36

Please sign in to comment.