Skip to content
Permalink
Browse files

Update ScalaTest 3.1.0

  • Loading branch information
kiroco12 committed Dec 4, 2019
1 parent 4dfe5ad commit 02c415d68cfedfd4a4aba15d4abd1ffc5a8b1f85
@@ -21,7 +21,8 @@ lazy val `circe` = (project in file("."))
%%("cats-core", V.cats),
%%("scalatest", V.scalatest),
%%("scalacheck", V.scalacheck),
"com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % V.scalacheckShapeless
"com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % V.scalacheckShapeless,
"org.scalatestplus" %% "scalatestplus-scalacheck" % V.scalatestplusScheck
),
addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)
)
@@ -1,4 +1,3 @@
import scala.language.reflectiveCalls
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
import de.heikoseeberger.sbtheader.License._
import sbt.Keys._
@@ -7,6 +6,8 @@ import sbtorgpolicies.OrgPoliciesPlugin.autoImport._
import sbtorgpolicies._
import sbtorgpolicies.model._

import scala.language.reflectiveCalls

object ProjectPlugin extends AutoPlugin {

override def trigger: PluginTrigger = allRequirements
@@ -22,7 +23,8 @@ object ProjectPlugin extends AutoPlugin {
val circeOptics: String = "0.12.0"
val circeGenericExtras: String = "0.12.2"
val shapeless: String = "2.3.3"
val scalatest: String = "3.0.8"
val scalatest: String = "3.1.0"
val scalatestplusScheck: String = "3.1.0.0-RC2"
val scalacheck: String = "1.14.2"
val scalacheckShapeless: String = "1.2.3"
}
@@ -8,7 +8,8 @@ package circelib

import io.circe.syntax._
import org.scalaexercises.definitions.Section
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

/**
* =ADTs encoding and decoding=
@@ -18,7 +19,7 @@ import org.scalatest.{FlatSpec, Matchers}
*
* @param name ADT (Algebraic Data Types)
*/
object ADTSection extends FlatSpec with Matchers with Section {
object ADTSection extends AnyFlatSpec with Matchers with Section {

import helpers.ADTHelpers._

@@ -9,7 +9,8 @@ package circelib
import io.circe.generic.extras._, io.circe.syntax._
import circelib.helpers.CustomCodecsHelpers.json
import org.scalaexercises.definitions.Section
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

/**
* =Custom encoders/decoders=
@@ -46,7 +47,7 @@ import org.scalatest.{FlatSpec, Matchers}
*
* @param name Custom codecs
*/
object CustomCodecsSection extends FlatSpec with Matchers with Section {
object CustomCodecsSection extends AnyFlatSpec with Matchers with Section {

/**
* =Custom key types=
@@ -6,15 +6,16 @@

package circelib

import org.scalatest._
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import io.circe.parser.decode
import io.circe.syntax._
import io.circe.generic.auto._

/** @param name Encoding and decoding
*/
object EncodingDecodingSection
extends FlatSpec
extends AnyFlatSpec
with Matchers
with org.scalaexercises.definitions.Section {

@@ -8,12 +8,13 @@ package circelib

import io.circe.Json
import org.scalaexercises.definitions
import org.scalatest._
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import circelib.helpers.JsonHelpers

/** @param name Json
*/
object JsonSection extends FlatSpec with Matchers with definitions.Section {
object JsonSection extends AnyFlatSpec with Matchers with definitions.Section {

import JsonHelpers._

@@ -7,12 +7,13 @@
package circelib

import io.circe._
import org.scalatest._
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import io.circe.optics.JsonPath._

/** @param name Optics
*/
object OpticsSection extends FlatSpec with Matchers with org.scalaexercises.definitions.Section {
object OpticsSection extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section {

import circelib.helpers.OpticsHelpers._

@@ -7,13 +7,14 @@
package circelib

import io.circe.Decoder.Result
import org.scalatest._
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import io.circe._

/** @param name Traversing and modifying
*/
object TraversingSection
extends FlatSpec
extends AnyFlatSpec
with Matchers
with org.scalaexercises.definitions.Section {

@@ -6,9 +6,9 @@

package circelib.utils

import io.circe.Json
import io.circe.syntax._
import io.circe.{Encoder, Json}
import org.scalacheck.{Arbitrary, Gen}
import org.scalacheck.Arbitrary
import org.scalacheck.Gen._

object JsonArbitraries {

0 comments on commit 02c415d

Please sign in to comment.
You can’t perform that action at this time.