Verified Commit d1d5b802 authored by 35V LG84's avatar 35V LG84

WIP: update circe and cats, and other deps

 * Dependencies
 ** cats: 0.12.0-M3
 ** circe: 0.12.0-M4
 ** jgit: 5.4.0.201906121030-r
 ** scallop: 3.3.1
 * Tests
 ** dirsuite: 0.30.1
 ** scalatest: 3.0.8
 ** sbt-scoverage: 1.6.0
Signed-off-by: 35V LG84's avatar35V LG84 <35vlg84-x4e6b92@e257.fi>
parent 05d0dadb
Pipeline #66350787 passed with stage
in 8 minutes and 43 seconds
......@@ -34,15 +34,19 @@ Updated deps and tools:
* Dependencies
** better-files: 3.8.0
** scallop: 3.3.0
** cats: 0.12.0-M3
** circe: 0.12.0-M4
** jgit: 5.4.0.201906121030-r
** scallop: 3.3.1
* Build
** sbt-git: 1.0.0 (new)
** sbt-scalajs: 0.6.28
** sbt-wartremover: 2.4.2
* Tests
** dirsuite: 0.30.0
** dirsuite: 0.30.1
** scalatest: 3.0.8
** sbt-coveralls: drop
** sbt-scoverage: 1.6.0-RC3
** sbt-scoverage: 1.6.0
......
......@@ -22,10 +22,6 @@ import java.util.UUID
import io.circe.{Decoder, Encoder}
import io.circe.generic.semiauto.{deriveDecoder, deriveEncoder}
// Circe with java8 time: https://github.com/circe/circe/issues/378
import io.circe.java8.time.decodeZonedDateTime
import io.circe.java8.time.encodeZonedDateTime
sealed trait TxnFilter {
def text(indent: String): Seq[String]
}
......@@ -121,7 +117,6 @@ sealed case class TxnFilterNOT(txnFilter: TxnFilter) extends TxnFilter {
}
sealed abstract class TxnFilterTxnTS(ts: ZonedDateTime) extends TxnFilter {
// Circe with java8 time: https://github.com/circe/circe/issues/378
val opTxt: String
override def text(indent: String): Seq[String] = {
......@@ -135,7 +130,6 @@ sealed abstract class TxnFilterTxnTS(ts: ZonedDateTime) extends TxnFilter {
* @param begin txn timestamp must be on or after this
*/
final case class TxnFilterTxnTSBegin(begin: ZonedDateTime) extends TxnFilterTxnTS(begin) {
// Circe with java8 time: https://github.com/circe/circe/issues/378
val opTxt = "begin"
}
......@@ -145,7 +139,6 @@ final case class TxnFilterTxnTSBegin(begin: ZonedDateTime) extends TxnFilterTxnT
* @param end txn timestamp is before of specified time.
*/
final case class TxnFilterTxnTSEnd(end: ZonedDateTime) extends TxnFilterTxnTS(end) {
// Circe with java8 time: https://github.com/circe/circe/issues/378
val opTxt = "end "
}
......
......@@ -21,7 +21,6 @@ import java.util.UUID
import cats.implicits._
import io.circe.java8.time._
import io.circe.{Decoder, Encoder}
import io.circe.generic.semiauto.{deriveDecoder, deriveEncoder}
......
......@@ -39,14 +39,8 @@ lazy val commonSettings = Seq(
"-Xcheckinit",
"-Xfatal-warnings",
"-Xlint",
"-Yno-adapted-args",
"-Ypartial-unification",
"-Ywarn-dead-code",
"-Ywarn-extra-implicit",
"-Ywarn-inaccessible",
"-Ywarn-infer-any",
"-Ywarn-nullary-override",
"-Ywarn-nullary-unit",
"-Ywarn-numeric-widen",
"-Ywarn-unused:implicits",
"-Ywarn-unused:imports",
......@@ -89,7 +83,6 @@ lazy val api = crossProject(JSPlatform, JVMPlatform).
name := "tackler-api",
libraryDependencies += "io.circe" %%% "circe-core" % circeVersion,
libraryDependencies += "io.circe" %%% "circe-generic" % circeVersion,
libraryDependencies += "io.circe" %%% "circe-java8" % circeVersion,
libraryDependencies += "io.circe" %%% "circe-parser" % circeVersion,
libraryDependencies += "org.scalatest" %%% "scalatest" % scalatestVersion % Test
).
......
......@@ -22,14 +22,14 @@ object Dependencies {
* Versions
*/
val betterFilesVersion = "3.8.0"
val catsVersion = "1.6.0"
val circeVersion = "0.11.1"
val catsVersion = "2.0.0-M4"
val circeVersion = "0.12.0-M3"
val circeOpticsVersion = "0.11.0"
val scalatestVersion = "3.0.7"
val scallopVersion = "3.3.0"
val scalatestVersion = "3.0.8"
val scallopVersion = "3.3.1"
val configVersion = "1.3.4"
val dirsuiteVersion = "0.30.0"
val jgitVersion = "5.3.1.201904271842-r"
val dirsuiteVersion = "0.30.1"
val jgitVersion = "5.4.0.201906121030-r"
val logbackVersion = "1.2.3"
......@@ -43,7 +43,6 @@ object Dependencies {
"io.circe" %% "circe-core",
"io.circe" %% "circe-generic",
"io.circe" %% "circe-parser",
"io.circe" %% "circe-java8"
).map(_ % circeVersion)
val circe_deps_test = Seq(
......
......@@ -12,7 +12,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
// QA tools
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0-RC3")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.4.2")
// Publishing
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment