diff --git a/README.md b/README.md index f7f50f88..f641bfb9 100644 --- a/README.md +++ b/README.md @@ -23,12 +23,12 @@ If you're interested in helping out, just [open an issue](https://github.com/Ma2 If you use SBT, you just have to edit `build.sbt` and add the following: -From version 1.8.0: - * use Akka 2.5 (Java 1.8) +From version 1.10.0: + * use Akka 2.6 (Java 1.8) * released for Scala 2.12, 2.13 ```scala -libraryDependencies += "com.github.Ma27" %% "rediscala" % "1.9.1" +libraryDependencies += "com.github.Ma27" %% "rediscala" % "1.10.0" ``` ### Connect to the database diff --git a/build.sbt b/build.sbt index 582208dc..16f6fd6f 100644 --- a/build.sbt +++ b/build.sbt @@ -3,8 +3,8 @@ Global / onChangedBuildSource := ReloadOnSourceChanges lazy val common = Seq( organization := "com.github.Ma27", publishTo := sonatypePublishTo.value, - scalaVersion := "2.12.11", - crossScalaVersions := Seq(scalaVersion.value, "2.13.4"), + scalaVersion := "2.12.17", + crossScalaVersions := Seq(scalaVersion.value, "2.13.10"), licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0.html")), homepage := Some(url("https://github.com/Ma27/rediscala")), scmInfo := Some(ScmInfo(url("https://github.com/Ma27/rediscala"), "scm:git:git@github.com:Ma27/rediscala.git")), @@ -34,17 +34,17 @@ lazy val common = Seq( ), libraryDependencies ++= { - val akkaVersion = "2.6.12" - val log4jVersion = "2.14.0" + val akkaVersion = "2.6.20" + val log4jVersion = "2.19.0" Seq( "com.typesafe.akka" %% "akka-actor" % akkaVersion, "com.typesafe.akka" %% "akka-testkit" % akkaVersion % Test, - "org.scalatest" %% "scalatest" % "3.2.3" % Test, - "org.scalacheck" %% "scalacheck" % "1.14.0" % Test, + "org.scalatest" %% "scalatest" % "3.2.14" % Test, + "org.scalacheck" %% "scalacheck" % "1.17.0" % Test, "org.apache.logging.log4j" % "log4j-api" % log4jVersion % Test, "org.apache.logging.log4j" % "log4j-core" % log4jVersion % Test, "org.apache.logging.log4j" % "log4j-slf4j-impl" % log4jVersion % Test, - "org.scala-stm" %% "scala-stm" % "0.9.1" + "org.scala-stm" %% "scala-stm" % "0.11.1" ) }, @@ -57,7 +57,7 @@ lazy val common = Seq( lazy val root = (project in file(".")).settings( common, name := "rediscala", - logBuffered in Test := true, + Test / logBuffered := true, libraryDependencies ++= Seq( // log4j-api-scala brings in scalatest 3.2.0-M1 "org.apache.logging.log4j" %% "log4j-api-scala" % "12.0" % "test->test" @@ -68,7 +68,7 @@ lazy val bench = (project in file("src/bench")) .settings( name := "rediscala-bench", testFrameworks += new TestFramework("org.scalameter.ScalaMeterFramework"), - parallelExecution in Test := false, + Test / parallelExecution := false, logBuffered := false, libraryDependencies ++= Seq( "com.storm-enroute" %% "scalameter" % "0.9" diff --git a/project/build.properties b/project/build.properties index 0b2e09c5..c8fcab54 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.7 +sbt.version=1.6.2 diff --git a/src/test/scala/redis/RedisProcess.scala b/src/test/scala/redis/RedisProcess.scala index 4d6de88f..871eaa37 100644 --- a/src/test/scala/redis/RedisProcess.scala +++ b/src/test/scala/redis/RedisProcess.scala @@ -9,7 +9,6 @@ import scala.reflect.io.File import scala.sys.process.{Process, ProcessLogger} import scala.util.control.NonFatal -import RedisProcess._ object RedisProcess { //scala 2.11 doesn't have Process.isAlive diff --git a/version.sbt b/version.sbt index dcaea302..17712c2c 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version := "1.9.2" +version := "1.10.0"