Skip to content

Commit 31bc4f0

Browse files
committed
Support for Play 3
1 parent c27ef14 commit 31bc4f0

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

Diff for: .github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: Build and Test
1515
strategy:
1616
matrix:
17-
scala: [2.12.13, 2.13.5]
17+
scala: [2.13.14]
1818

1919
runs-on: ubuntu-latest
2020
steps:
@@ -26,7 +26,7 @@ jobs:
2626
- name: Setup Java and Scala
2727
uses: olafurpg/setup-scala@v10
2828
with:
29-
java-version: adopt@1.8
29+
java-version: adopt@1.11
3030

3131
- name: Cache sbt
3232
uses: actions/cache@v2

Diff for: build.sbt

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ developers := List(
1010
Developer(id = "Iterable", name = "Iterable", email = "[email protected]", url = url("https://iterable.com"))
1111
)
1212

13-
scalaVersion := "2.13.5"
14-
crossScalaVersions := Seq(scalaVersion.value, "2.12.13")
13+
scalaVersion := "2.13.14"
14+
crossScalaVersions := Seq(scalaVersion.value)
1515

16-
val PlayVersion = "2.8.6"
16+
val PlayVersion = "3.0.1"
1717

1818
libraryDependencies ++= Seq(
1919
// Play! framework
20-
"com.typesafe.play" %% "play" % PlayVersion,
21-
"com.typesafe.play" %% "play-joda-forms" % PlayVersion,
20+
"org.playframework" %% "play" % PlayVersion,
21+
"org.playframework" %% "play-joda-forms" % PlayVersion,
2222
// dependencies for tests
23-
"org.scalatest" %% "scalatest" % "3.2.5" % Test
23+
"org.scalatest" %% "scalatest" % "3.2.18" % Test
2424
)
2525

2626
parallelExecution in Test := false

Diff for: src/main/scala/com/iterable/play/utils/CaseClassMapping.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ object CaseClassMapping extends Logging {
6464
}
6565

6666
private def generateWrappedMappingForFormatter(fieldName: String, tpe: Type, formatter: Formatter[_]): Mapping[_] = {
67-
val mapping = FieldMapping("")(formatter.asInstanceOf[Formatter[Any]])
67+
@annotation.nowarn val mapping = FieldMapping("")(formatter.asInstanceOf[Formatter[Any]])
6868
generateWrappedMappingForMapping(fieldName, tpe, mapping)
6969
}
7070

Diff for: src/test/scala/com/iterable/play/utils/CaseClassMappingSpec.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ import play.api.data.{Form, FormError, Mapping}
77

88
case class Baz(pls: String, work: Option[Long])
99
object Baz {
10-
implicit val mapping = CaseClassMapping.mapping[Baz]
10+
implicit val mapping: CaseClassMapping[Baz] = CaseClassMapping.mapping
1111
}
1212

1313
case class Foo(a: String, omg: Option[Seq[Baz]])
1414
object Foo {
15-
implicit def mapping = CaseClassMapping.mapping[Foo]
15+
implicit def mapping: CaseClassMapping[Foo] = CaseClassMapping.mapping
1616
}
1717

1818
case class Bar(firstOne: Option[List[Long]], secondOne: String, third: Option[Foo], fourth: Option[Int]) extends UnbindableToWsRequest[Bar]
1919
object Bar {
20-
implicit val mapping = CaseClassMapping.mapping[Bar]
20+
implicit val mapping: CaseClassMapping[Bar] = CaseClassMapping.mapping
2121
}
2222

2323
class CaseClassMappingSpec extends AnyWordSpec with Matchers {
2424
// TODO - it breaks on this, because
2525
// scala.ScalaReflectionException: class Bar2 is an inner class, use reflectClass on an InstanceMirror to obtain its ClassMirror
2626
case class Bar2(firstOne: Int)
2727
object Bar2 {
28-
implicit lazy val mapping = CaseClassMapping.mapping[Bar2]
28+
implicit lazy val mapping: CaseClassMapping[Bar2] = CaseClassMapping.mapping
2929
}
3030

3131
"CaseClassMapping" should {

Diff for: src/test/scala/com/iterable/play/utils/UnbindableToWsRequestSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.scalatest.wordspec.AnyWordSpec
55

66
case class User(name: String, age: Int, email: String, favoriteBands: Seq[String]) extends UnbindableToWsRequest[User]
77
object User {
8-
implicit val mapping = CaseClassMapping.mapping[User]
8+
implicit val mapping: CaseClassMapping[User] = CaseClassMapping.mapping
99
}
1010

1111
class UnbindableToWsRequestSpec extends AnyWordSpec with Matchers {

0 commit comments

Comments
 (0)