summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2017-04-03 22:16:38 -0400
committerSeth Tisue <seth@tisue.net>2017-04-03 22:16:38 -0400
commita4d230131638b4b26397515d98d058de4e3f4101 (patch)
treed15516f60ce28053f153f26c5c0774f64d297d4d
parent63df01966d3c73a9912b9918cbcbb95749835547 (diff)
downloadspray-json-a4d230131638b4b26397515d98d058de4e3f4101.tar.gz
spray-json-a4d230131638b4b26397515d98d058de4e3f4101.tar.bz2
spray-json-a4d230131638b4b26397515d98d058de4e3f4101.zip
be Scala 2.13 friendly
for now, for the 2.13 community build. and as a start at possible future real 2.13 support
-rw-r--r--build.sbt8
-rw-r--r--src/test/scala/spray/json/JsonParserSpec.scala5
2 files changed, 11 insertions, 2 deletions
diff --git a/build.sbt b/build.sbt
index b03643f..2e451e0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -26,6 +26,14 @@ libraryDependencies ++= Seq(
"org.scalacheck" %% "scalacheck" % "1.13.4" % "test"
)
+libraryDependencies ++=
+ (CrossVersion.partialVersion(scalaVersion.value) match {
+ case Some((2, n)) if n >= 13 =>
+ Seq("org.scala-lang.modules" %% "scala-parallel-collections" % "0.1.1")
+ case _ =>
+ Seq()
+ })
+
(scalacOptions in doc) ++= Seq("-doc-title", name.value + " " + version.value)
// generate boilerplate
diff --git a/src/test/scala/spray/json/JsonParserSpec.scala b/src/test/scala/spray/json/JsonParserSpec.scala
index 0f7ae7f..d7db026 100644
--- a/src/test/scala/spray/json/JsonParserSpec.scala
+++ b/src/test/scala/spray/json/JsonParserSpec.scala
@@ -74,7 +74,8 @@ class JsonParserSpec extends Specification {
}
"be reentrant" in {
val largeJsonSource = scala.io.Source.fromInputStream(getClass.getResourceAsStream("/test.json")).mkString
- List.fill(20)(largeJsonSource).par.map(JsonParser(_)).toList.map {
+ import scala.collection.parallel.immutable.ParSeq
+ ParSeq.fill(20)(largeJsonSource).map(JsonParser(_)).toList.map {
_.asInstanceOf[JsObject].fields("questions").asInstanceOf[JsArray].elements.size
} === List.fill(20)(100)
}
@@ -108,4 +109,4 @@ class JsonParserSpec extends Specification {
|""".stripMargin
}
}
-} \ No newline at end of file
+}