Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Akka 2.6 #234

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgrade to Akka 2.6 #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14ec837
Upgrade to Akka 2.6
reibitto Jan 28, 2020
20f075c
Upgrade dependencies
reibitto Jan 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 6 additions & 6 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.3"

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

Expand All @@ -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"

Expand All @@ -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:[email protected]:etaty/rediscala.git")),
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
3 changes: 2 additions & 1 deletion src/test/scala/redis/RedisClusterTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package redis

import java.util.Base64

import akka.util.ByteString
import org.specs2.execute.Result
Expand Down Expand Up @@ -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({
Expand Down