Skip to content

Commit

Permalink
bump dependency versions, 0.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
lihaoyi committed Mar 15, 2020
1 parent 12fe9ed commit 89b6d13
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
18 changes: 9 additions & 9 deletions 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.3"
val sjsonnetVersion = "0.2.4"

object sjsonnet extends Cross[SjsonnetModule]("2.12.8", "2.13.0")
class SjsonnetModule(val crossScalaVersion: String) extends Module {
Expand All @@ -15,11 +15,11 @@ class SjsonnetModule(val crossScalaVersion: String) extends Module {
def crossScalaVersion = SjsonnetModule.this.crossScalaVersion

def ivyDeps = Agg(
ivy"com.lihaoyi::fastparse::2.2.3",
ivy"com.lihaoyi::pprint::0.5.8",
ivy"com.lihaoyi::ujson::0.9.7",
ivy"com.lihaoyi::scalatags::0.8.4",
ivy"org.scala-lang.modules::scala-collection-compat::2.1.3"
ivy"com.lihaoyi::fastparse::2.2.4",
ivy"com.lihaoyi::pprint::0.5.9",
ivy"com.lihaoyi::ujson::1.0.0",
ivy"com.lihaoyi::scalatags::0.8.6",
ivy"org.scala-lang.modules::scala-collection-compat::2.1.4"
)
def publishVersion = sjsonnetVersion

Expand All @@ -46,7 +46,7 @@ class SjsonnetModule(val crossScalaVersion: String) extends Module {
)
trait CrossTests extends ScalaModule with TestModule {
def platformSegment = SjsonnetCrossModule.this.platformSegment
def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.7.3")
def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.7.4")
def testFrameworks = Seq("utest.runner.Framework")
def sources = T.sources(
millSourcePath / "src",
Expand All @@ -55,15 +55,15 @@ class SjsonnetModule(val crossScalaVersion: String) extends Module {
}
}
object js extends SjsonnetCrossModule with ScalaJSModule{
def scalaJSVersion = "0.6.31"
def scalaJSVersion = "1.0.0"
def platformSegment = "js"
object test extends Tests with CrossTests
}
object jvm extends SjsonnetCrossModule {
def mainClass = Some("sjsonnet.SjsonnetMain")
def platformSegment = "jvm"
def ivyDeps = super.ivyDeps() ++ Agg(
ivy"com.lihaoyi::os-lib:0.6.2",
ivy"com.lihaoyi::os-lib:0.6.3",
ivy"com.github.scopt::scopt::3.7.1",
)
def compileIvyDeps = Agg( ivy"com.lihaoyi::acyclic:0.2.0")
Expand Down
2 changes: 1 addition & 1 deletion mill
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This is a wrapper script, that automatically download mill from GitHub release pages
# You can give the required mill version with MILL_VERSION env variable
# If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
DEFAULT_MILL_VERSION=0.5.7
DEFAULT_MILL_VERSION=0.6.1

set -e

Expand Down
5 changes: 5 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,11 @@ To publish, run the following commands:
## Changelog


### 0.2.4

- Add support for syntactical key ordering [#53](https://github.com/databricks/sjsonnet/pull/53)
- Bump dependency versions

### 0.2.2

- Bump verion of Scalatags, uPickle
Expand Down

0 comments on commit 89b6d13

Please sign in to comment.