Skip to content

Commit 670e92c

Browse files
committed
Scala 2.13.0-M4
1 parent 9e25b92 commit 670e92c

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ lazy val commonSettings: Seq[Setting[_]] = Seq(
66
organization := "net.debasishg",
77
version := "3.7",
88
scalaVersion := "2.11.12",
9-
crossScalaVersions := Seq("2.12.6", "2.11.12", "2.10.7"),
9+
crossScalaVersions := Seq("2.12.6", "2.11.12", "2.10.7", "2.13.0-M4"),
1010

1111
scalacOptions in Compile ++= Seq( "-unchecked", "-feature", "-language:postfixOps", "-deprecation" ),
1212

@@ -20,10 +20,10 @@ lazy val coreSettings = commonSettings ++ Seq(
2020
libraryDependencies ++= Seq(
2121
"commons-pool" % "commons-pool" % "1.6",
2222
"org.slf4j" % "slf4j-api" % "1.7.25",
23-
"org.slf4j" % "slf4j-log4j12" % "1.7.25" % "provided",
24-
"log4j" % "log4j" % "1.2.17" % "provided",
25-
"junit" % "junit" % "4.12" % "test",
26-
"org.scalatest" %% "scalatest" % "3.0.4" % "test"),
23+
"org.slf4j" % "slf4j-log4j12" % "1.7.25" % "provided",
24+
"log4j" % "log4j" % "1.2.17" % "provided",
25+
"junit" % "junit" % "4.12" % "test",
26+
"org.scalatest" %% "scalatest" % "3.0.6-SNAP2" % "test"),
2727

2828
parallelExecution in Test := false,
2929
publishTo := version { (v: String) =>

src/test/scala/com/redis/cluster/RedisClusterSpec.scala

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import org.scalatest.junit.JUnitRunner
88
import org.junit.runner.RunWith
99
import com.redis.RedisClient
1010
import com.redis.serialization.Format
11+
1112
import collection.mutable.WrappedArray
13+
import scala.collection.mutable
1214

1315

1416
@RunWith(classOf[JUnitRunner])
@@ -18,7 +20,7 @@ class RedisClusterSpec extends FunSpec
1820
with BeforeAndAfterAll {
1921

2022
val nodes = Array(ClusterNode("node1", "localhost", 6379), ClusterNode("node2", "localhost", 6380), ClusterNode("node3", "localhost", 6381))
21-
val r = new RedisCluster(new WrappedArray.ofRef(nodes): _*) {
23+
val r = new RedisCluster(new mutable.WrappedArray.ofRef(nodes).toSeq: _*) {
2224
val keyTag = Some(RegexKeyTag)
2325
}
2426

@@ -104,7 +106,7 @@ class RedisClusterSpec extends FunSpec
104106
}
105107

106108
it("replace node should not change hash ring order"){
107-
val r = new RedisCluster(new WrappedArray.ofRef(nodes): _*) {
109+
val r = new RedisCluster(new WrappedArray.ofRef(nodes).toSeq: _*) {
108110
val keyTag = Some(RegexKeyTag)
109111
}
110112
r.set("testkey1", "testvalue2")
@@ -130,7 +132,7 @@ class RedisClusterSpec extends FunSpec
130132
}
131133

132134
it("remove failure node should change hash ring order so that key on failure node should be served by other running nodes"){
133-
val r = new RedisCluster(new WrappedArray.ofRef(nodes): _*) {
135+
val r = new RedisCluster(new WrappedArray.ofRef(nodes).toSeq: _*) {
134136
val keyTag = Some(RegexKeyTag)
135137
}
136138
r.set("testkey1", "testvalue2")
@@ -147,7 +149,7 @@ class RedisClusterSpec extends FunSpec
147149
}
148150

149151
it("list nodes should return the running nodes but not configured nodes"){
150-
val r = new RedisCluster(new WrappedArray.ofRef(nodes): _*) {
152+
val r = new RedisCluster(new WrappedArray.ofRef(nodes).toSeq: _*) {
151153
val keyTag = Some(RegexKeyTag)
152154
}
153155
r.listServers.toSet should equal (nodes.toSet)

0 commit comments

Comments
 (0)