Skip to content

Commit

Permalink
Merge d0865a0 into 8913661
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k committed Oct 17, 2019
2 parents 8913661 + d0865a0 commit 6c80cf7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -7,7 +7,7 @@ after_success:
- "sbt coveralls"
scala:
- "2.11.12"
- "2.12.8"
- "2.12.10"
- "2.13.0"
jdk:
- openjdk8
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
@@ -1,17 +1,17 @@
import com.typesafe.sbt.SbtGit.{GitKeys => git}
import sbt.Tests.{InProcess, Group}

val akkaVersion = "2.5.23"
val akkaVersion = "2.5.25"

val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion

val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion

val specs2 = "org.specs2" %% "specs2-core" % "4.5.1"
val specs2 = "org.specs2" %% "specs2-core" % "4.8.0"

val stm = "org.scala-stm" %% "scala-stm" % "0.9.1"

val scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
val scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.2"

//val scalameter = "com.github.axel22" %% "scalameter" % "0.4"

Expand All @@ -33,7 +33,7 @@ lazy val standardSettings = Def.settings(
name := "rediscala",
organization := "com.github.etaty",
scalaVersion := Scala211,
crossScalaVersions := Seq(Scala211, "2.12.8", "2.13.0"),
crossScalaVersions := Seq(Scala211, "2.12.10", "2.13.0"),
licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0.html")),
homepage := Some(url("https://github.com/etaty/rediscala")),
scmInfo := Some(ScmInfo(url("https://github.com/etaty/rediscala"), "scm:git:git@github.com:etaty/rediscala.git")),
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
@@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.3.3
2 changes: 1 addition & 1 deletion project/plugins.sbt
Expand Up @@ -10,7 +10,7 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")

addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")

addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")

Expand Down

0 comments on commit 6c80cf7

Please sign in to comment.