From 14ec837d4c806f1ccd17f37e82d1883e1b461ed8 Mon Sep 17 00:00:00 2001 From: reibitto Date: Tue, 28 Jan 2020 18:48:49 +0900 Subject: [PATCH 1/2] Upgrade to Akka 2.6 --- .travis.yml | 3 +-- build.sbt | 10 +++++----- src/test/scala/redis/RedisClusterTest.scala | 3 ++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 792a408c..481a3b84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,8 @@ after_success: - "sbt coverageReport coverageAggregate" - "sbt coveralls" scala: - - "2.11.12" - "2.12.10" - - "2.13.0" + - "2.13.1" jdk: - openjdk8 diff --git a/build.sbt b/build.sbt index fad4d7e6..c5b48c94 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import com.typesafe.sbt.SbtGit.{GitKeys => git} import sbt.Tests.{InProcess, Group} -val akkaVersion = "2.5.25" +val akkaVersion = "2.6.2" val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion @@ -27,13 +27,13 @@ val rediscalaDependencies = Seq( val baseSourceUrl = "https://github.com/etaty/rediscala/tree/" -val Scala211 = "2.11.12" +val Scala213 = "2.13.1" lazy val standardSettings = Def.settings( name := "rediscala", organization := "com.github.etaty", - scalaVersion := Scala211, - crossScalaVersions := Seq(Scala211, "2.12.10", "2.13.0"), + scalaVersion := Scala213, + crossScalaVersions := Seq("2.12.10", Scala213), 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")), @@ -133,7 +133,7 @@ lazy val benchmark = { id = "benchmark", base = file("benchmark") ).settings(Seq( - scalaVersion := Scala211, + scalaVersion := Scala213, libraryDependencies += "net.debasishg" %% "redisclient" % "3.0" )) .enablePlugins(JmhPlugin) diff --git a/src/test/scala/redis/RedisClusterTest.scala b/src/test/scala/redis/RedisClusterTest.scala index 6b1ee11f..fff9a8b0 100644 --- a/src/test/scala/redis/RedisClusterTest.scala +++ b/src/test/scala/redis/RedisClusterTest.scala @@ -1,5 +1,6 @@ package redis +import java.util.Base64 import akka.util.ByteString import org.specs2.execute.Result @@ -36,7 +37,7 @@ class RedisClusterTest extends RedisClusterClients { "clusterSlots" should { "encoding" in { - val clusterSlotsAsByteString = ByteString(new sun.misc.BASE64Decoder().decodeBuffer("KjMNCio0DQo6MA0KOjU0NjANCiozDQokOQ0KMTI3LjAuMC4xDQo6NzAwMA0KJDQwDQplNDM1OTlkZmY2ZTNhN2I5ZWQ1M2IxY2EwZGI0YmQwMDlhODUwYmE1DQoqMw0KJDkNCjEyNy4wLjAuMQ0KOjcwMDMNCiQ0MA0KYzBmNmYzOWI2NDg4MTVhMTllNDlkYzQ1MzZkMmExM2IxNDdhOWY1MA0KKjQNCjoxMDkyMw0KOjE2MzgzDQoqMw0KJDkNCjEyNy4wLjAuMQ0KOjcwMDINCiQ0MA0KNDhkMzcxMjBmMjEzNTc4Y2IxZWFjMzhlNWYyYmY1ODlkY2RhNGEwYg0KKjMNCiQ5DQoxMjcuMC4wLjENCjo3MDA1DQokNDANCjE0Zjc2OWVlNmU1YWY2MmZiMTc5NjZlZDRlZWRmMTIxOWNjYjE1OTINCio0DQo6NTQ2MQ0KOjEwOTIyDQoqMw0KJDkNCjEyNy4wLjAuMQ0KOjcwMDENCiQ0MA0KYzhlYzM5MmMyMjY5NGQ1ODlhNjRhMjA5OTliNGRkNWNiNDBlNDIwMQ0KKjMNCiQ5DQoxMjcuMC4wLjENCjo3MDA0DQokNDANCmVmYThmZDc0MDQxYTNhOGQ3YWYyNWY3MDkwM2I5ZTFmNGMwNjRhMjENCg==")) + val clusterSlotsAsByteString = ByteString(Base64.getDecoder.decode("KjMNCio0DQo6MA0KOjU0NjANCiozDQokOQ0KMTI3LjAuMC4xDQo6NzAwMA0KJDQwDQplNDM1OTlkZmY2ZTNhN2I5ZWQ1M2IxY2EwZGI0YmQwMDlhODUwYmE1DQoqMw0KJDkNCjEyNy4wLjAuMQ0KOjcwMDMNCiQ0MA0KYzBmNmYzOWI2NDg4MTVhMTllNDlkYzQ1MzZkMmExM2IxNDdhOWY1MA0KKjQNCjoxMDkyMw0KOjE2MzgzDQoqMw0KJDkNCjEyNy4wLjAuMQ0KOjcwMDINCiQ0MA0KNDhkMzcxMjBmMjEzNTc4Y2IxZWFjMzhlNWYyYmY1ODlkY2RhNGEwYg0KKjMNCiQ5DQoxMjcuMC4wLjENCjo3MDA1DQokNDANCjE0Zjc2OWVlNmU1YWY2MmZiMTc5NjZlZDRlZWRmMTIxOWNjYjE1OTINCio0DQo6NTQ2MQ0KOjEwOTIyDQoqMw0KJDkNCjEyNy4wLjAuMQ0KOjcwMDENCiQ0MA0KYzhlYzM5MmMyMjY5NGQ1ODlhNjRhMjA5OTliNGRkNWNiNDBlNDIwMQ0KKjMNCiQ5DQoxMjcuMC4wLjENCjo3MDA0DQokNDANCmVmYThmZDc0MDQxYTNhOGQ3YWYyNWY3MDkwM2I5ZTFmNGMwNjRhMjENCg==")) val clusterSlotsAsBulk: DecodeResult[RedisReply] = RedisProtocolReply.decodeReply(clusterSlotsAsByteString) var decodeValue = "" val dr: DecodeResult[String] = clusterSlotsAsBulk.map({ From 20f075c2a7ede6e36e14968ea4f0d78cd4b88c5a Mon Sep 17 00:00:00 2001 From: reibitto Date: Tue, 28 Jan 2020 23:05:36 +0900 Subject: [PATCH 2/2] Upgrade dependencies --- build.sbt | 4 ++-- project/plugins.sbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index c5b48c94..6bd6113b 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import com.typesafe.sbt.SbtGit.{GitKeys => git} import sbt.Tests.{InProcess, Group} -val akkaVersion = "2.6.2" +val akkaVersion = "2.6.3" val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion @@ -11,7 +11,7 @@ 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.2" +val scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.3" //val scalameter = "com.github.axel22" %% "scalameter" % "0.4" diff --git a/project/plugins.sbt b/project/plugins.sbt index 68b4a71c..747ac3f2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2") resolvers += Classpaths.sbtPluginReleases -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")