From dac4567ad3f50e1ecc0f81b1f4ad3266896065be Mon Sep 17 00:00:00 2001 From: Thomas Rawyler Date: Wed, 14 Aug 2019 07:30:46 +0200 Subject: [PATCH] Upgrade versions --- build.sbt | 6 +++--- project/build.properties | 2 +- project/plugins.sbt | 2 +- test/com/tegonal/play/json/TypedIdFormatSpec.scala | 11 +++-------- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/build.sbt b/build.sbt index baaecbb..00a6317 100644 --- a/build.sbt +++ b/build.sbt @@ -2,9 +2,9 @@ name := "play-json-typedid" organization := "com.tegonal" -version := "1.0.1" +version := "1.0.2" -scalaVersion := "2.11.1" +scalaVersion := "2.12.8" lazy val root = (project in file(".")).enablePlugins(PlayScala) @@ -13,7 +13,7 @@ resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/release resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/" libraryDependencies ++= Seq( - "org.scalatestplus" %% "play" % "1.1.0" % "test" + "org.scalatestplus.play" %% "scalatestplus-play" % "4.0.3" % "test" ) resolvers ++= Seq( diff --git a/project/build.properties b/project/build.properties index 5075289..c0bab04 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.5 \ No newline at end of file +sbt.version=1.2.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index da0a9e5..5616128 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,4 +4,4 @@ resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releas resolvers += Classpaths.sbtPluginReleases // Use the Play sbt plugin for Play projects -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.3") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.3") diff --git a/test/com/tegonal/play/json/TypedIdFormatSpec.scala b/test/com/tegonal/play/json/TypedIdFormatSpec.scala index 481c730..ccea32a 100644 --- a/test/com/tegonal/play/json/TypedIdFormatSpec.scala +++ b/test/com/tegonal/play/json/TypedIdFormatSpec.scala @@ -20,16 +20,11 @@ \* */ package com.tegonal.play.genericid -import play.api.mvc._ -import play.api.test._ -import play.api.test.Helpers._ -import play.api.libs.json._ -import play.api.libs.json.Reads._ -import play.api.libs.functional.syntax._ -import com.tegonal.play.json._ import com.tegonal.play.json.TypedId._ +import org.scalatestplus.play.PlaySpec +import play.api.libs.json._ -object TypedIdFormatSpec extends PlaySpecification { +object TypedIdFormatSpec extends PlaySpec { //Provide some helper classes case class TestId1(value: String) extends StringBaseId case class TestId2(value: BigDecimal) extends NumberBaseId