From 9b59d81d201e9b99ea5bc1cc6bccfaf646f9abdc Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Sat, 15 Jun 2019 18:06:38 +0200 Subject: Add support for Scala 2.13.0 --- CHANGELOG.md | 3 +++ build.sbt | 2 +- project/Dependencies.scala | 8 ++++---- project/plugins.sbt | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1bd28b..4fa4fc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Version 4.1.4 +- Add support Scala 2.13.0 + # Version 4.1.3 - Upgrade Scala and library patch versions - Build: upgrade sbt, move from sbt-pgp to sbt-gpg for signing of diff --git a/build.sbt b/build.sbt index 0f9fe9d..c20f294 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ version in ThisBuild := { import scala.sys.process._ ("git describe --always --dirty=-SNAPSHOT --match v[0-9].*" !!).tail.trim } -crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12") +crossScalaVersions in ThisBuild := List("2.13.0", "2.12.8", "2.11.12") scalaVersion in ThisBuild := crossScalaVersions.value.head scalacOptions in ThisBuild ++= Seq( "-deprecation", diff --git a/project/Dependencies.scala b/project/Dependencies.scala index fca310b..ca2687b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,10 +4,10 @@ import sbt._ object Dependencies { - val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.21" - val akkaStream ="com.typesafe.akka" %% "akka-stream" % "2.5.21" + val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.23" + val akkaStream ="com.typesafe.akka" %% "akka-stream" % "2.5.23" - val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % "2.5.21" - val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" + val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % "2.5.23" + val scalatest = "org.scalatest" %% "scalatest" % "3.0.8" } diff --git a/project/plugins.sbt b/project/plugins.sbt index 581816f..f711a3c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ */ // Build, package and load native libraries -addSbtPlugin("ch.jodersky" % "sbt-jni" % "1.3.2") +addSbtPlugin("ch.jodersky" % "sbt-jni" % "1.3.4") /* * Utility plugins, can be disabled during plain build -- cgit v1.2.3