summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnolia K <magnolia.k@icloud.com>2017-01-22 18:03:09 +0900
committerMagnolia K <magnolia.k@icloud.com>2017-01-22 18:03:09 +0900
commit1f3c5bbc118b09ec62e926a7db44b7373916c784 (patch)
tree438e351667fa7ebd2f7c38f665688874559d6fda
parent537cb5bca7eb73750fc2e86e4a2ea6605714482b (diff)
downloadspray-json-1f3c5bbc118b09ec62e926a7db44b7373916c784.tar.gz
spray-json-1f3c5bbc118b09ec62e926a7db44b7373916c784.tar.bz2
spray-json-1f3c5bbc118b09ec62e926a7db44b7373916c784.zip
Enabled Xlint scala option
and in addition, the cause of the newly outputted warning message was removed.
-rw-r--r--build.sbt6
-rw-r--r--src/test/scala/spray/json/StandardFormatsSpec.scala12
2 files changed, 9 insertions, 9 deletions
diff --git a/build.sbt b/build.sbt
index de28193..5352165 100644
--- a/build.sbt
+++ b/build.sbt
@@ -16,7 +16,7 @@ licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.
scalaVersion := "2.11.8"
-scalacOptions ++= Seq("-feature", "-language:_", "-unchecked", "-deprecation", "-encoding", "utf8")
+scalacOptions ++= Seq("-feature", "-language:_", "-unchecked", "-deprecation", "-Xlint", "-encoding", "utf8")
resolvers += Opts.resolver.sonatypeReleases
@@ -46,7 +46,7 @@ OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-
// publishing
///////////////
-crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0")
+crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.1")
scalaBinaryVersion <<= scalaVersion(sV => if (CrossVersion.isStable(sV)) CrossVersion.binaryScalaVersion(sV) else sV)
@@ -70,4 +70,4 @@ pomExtra :=
<developers>
<developer><id>sirthias</id><name>Mathias Doenitz</name></developer>
<developer><id>jrudolph</id><name>Johannes Rudolph</name></developer>
- </developers> \ No newline at end of file
+ </developers>
diff --git a/src/test/scala/spray/json/StandardFormatsSpec.scala b/src/test/scala/spray/json/StandardFormatsSpec.scala
index 89f01ac..cd5afec 100644
--- a/src/test/scala/spray/json/StandardFormatsSpec.scala
+++ b/src/test/scala/spray/json/StandardFormatsSpec.scala
@@ -69,7 +69,7 @@ class StandardFormatsSpec extends Specification with DefaultJsonProtocol {
(42, 4.2).toJson mustEqual json
}
"be able to convert a JsArray to a (Int, Double)]" in {
- json.convertTo[(Int, Double)] mustEqual (42, 4.2)
+ json.convertTo[(Int, Double)] mustEqual Tuple2(42, 4.2)
}
}
@@ -79,7 +79,7 @@ class StandardFormatsSpec extends Specification with DefaultJsonProtocol {
(42, 4.2, 3).toJson mustEqual json
}
"be able to convert a JsArray to a (Int, Double, Int)]" in {
- json.convertTo[(Int, Double, Int)] mustEqual (42, 4.2, 3)
+ json.convertTo[(Int, Double, Int)] mustEqual Tuple3(42, 4.2, 3)
}
}
"The tuple4Format" should {
@@ -88,7 +88,7 @@ class StandardFormatsSpec extends Specification with DefaultJsonProtocol {
(42, 4.2, 3, 4).toJson mustEqual json
}
"be able to convert a JsArray to a (Int, Double, Int, Int)]" in {
- json.convertTo[(Int, Double, Int, Int)] mustEqual (42, 4.2, 3, 4)
+ json.convertTo[(Int, Double, Int, Int)] mustEqual Tuple4(42, 4.2, 3, 4)
}
}
"The tuple5Format" should {
@@ -97,7 +97,7 @@ class StandardFormatsSpec extends Specification with DefaultJsonProtocol {
(42, 4.2, 3, 4, 5).toJson mustEqual json
}
"be able to convert a JsArray to a (Int, Double, Int, Int, Int)]" in {
- json.convertTo[(Int, Double, Int, Int, Int)] mustEqual (42, 4.2, 3, 4, 5)
+ json.convertTo[(Int, Double, Int, Int, Int)] mustEqual Tuple5(42, 4.2, 3, 4, 5)
}
}
"The tuple6Format" should {
@@ -106,7 +106,7 @@ class StandardFormatsSpec extends Specification with DefaultJsonProtocol {
(42, 4.2, 3, 4, 5, 6).toJson mustEqual json
}
"be able to convert a JsArray to a (Int, Double, Int, Int, Int, Int)]" in {
- json.convertTo[(Int, Double, Int, Int, Int, Int)] mustEqual (42, 4.2, 3, 4, 5, 6)
+ json.convertTo[(Int, Double, Int, Int, Int, Int)] mustEqual Tuple6(42, 4.2, 3, 4, 5, 6)
}
}
"The tuple7Format" should {
@@ -115,7 +115,7 @@ class StandardFormatsSpec extends Specification with DefaultJsonProtocol {
(42, 4.2, 3, 4, 5, 6, 7).toJson mustEqual json
}
"be able to convert a JsArray to a (Int, Double, Int, Int, Int, Int, Int)]" in {
- json.convertTo[(Int, Double, Int, Int, Int, Int, Int)] mustEqual (42, 4.2, 3, 4, 5, 6, 7)
+ json.convertTo[(Int, Double, Int, Int, Int, Int, Int)] mustEqual Tuple7(42, 4.2, 3, 4, 5, 6, 7)
}
}
}