Skip to content
This repository was archived by the owner on Jun 6, 2025. It is now read-only.

Commit 9d1bc70

Browse files
authored
ENG-14940: Add Play 2.8
ENG-14940: Add Play 2.8 support from swagger-api#220
2 parents 47ef419 + 942b7de commit 9d1bc70

5 files changed

Lines changed: 18 additions & 13 deletions

File tree

README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22

33
# Swagger Play2 Module
44

5-
## Note
5+
## Compatibility
66

7-
This branch (`master`) holds the latest version (major version `2.x`) for latest play version supported (`2.7`); branch [play-2.6](https://github.com/swagger-api/swagger-play/tree/play-2.6) holds the swagger-play version for play `2.6` version (major.minor version `1.6.x`).
7+
8+
Swagger Play Version | Play Version | Branch
9+
---------------------| ------------ | ------
10+
3.0.0 | 2.8 | [master](https://github.com/swagger-api/swagger-play/tree/master)
11+
2.0.0 | 2.7 | [play27](https://github.com/swagger-api/swagger-play/tree/play-2.7)
12+
1.6.x | 2.6 | [play26](https://github.com/swagger-api/swagger-play/tree/play-2.6)
813

914
Older versions are available though not anymore supported in the [archive](https://github.com/swagger-api/swagger-play/tree/archive) branch.
1015

@@ -33,7 +38,7 @@ You can depend on pre-built libraries in maven central by adding the following d
3338

3439
```
3540
libraryDependencies ++= Seq(
36-
"io.swagger" %% "swagger-play2" % "2.0.1-SNAPSHOT"
41+
"io.swagger" %% "swagger-play2" % "3.0.1-SNAPSHOT"
3742
)
3843
```
3944

build.sbt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ scalaVersion := "2.13.1"
55

66
crossScalaVersions := Seq(scalaVersion.value, "2.12.10")
77

8-
val PlayVersion = "2.7.3"
9-
val SwaggerVersion = "1.5.24"
10-
val Specs2Version = "4.6.0"
8+
val PlayVersion = "2.8.1"
9+
val SwaggerVersion = "1.6.0"
10+
val Specs2Version = "4.8.3"
1111

1212
libraryDependencies ++= Seq(
1313
"com.typesafe.play" %% "play" % PlayVersion,
1414
"com.typesafe.play" %% "routes-compiler" % PlayVersion,
1515
"io.swagger" % "swagger-core" % SwaggerVersion,
1616
"io.swagger" %% "swagger-scala-module" % "1.0.6",
17-
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.9",
18-
"org.scala-lang.modules" %% "scala-collection-compat" % "2.1.2",
19-
"org.slf4j" % "slf4j-api" % "1.7.21",
17+
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.10.2",
18+
"org.scala-lang.modules" %% "scala-collection-compat" % "2.1.3",
19+
"org.slf4j" % "slf4j-api" % "1.7.30",
2020

2121
"com.typesafe.play" %% "play-ebean" % "5.0.2" % "test",
2222
"org.specs2" %% "specs2-core" % Specs2Version % "test",
2323
"org.specs2" %% "specs2-mock" % Specs2Version % "test",
2424
"org.specs2" %% "specs2-junit" % Specs2Version % "test",
25-
"org.mockito" % "mockito-core" % "2.21.0" % "test"
25+
"org.mockito" % "mockito-core" % "3.2.0" % "test"
2626
)
2727

2828
// see https://github.com/scala/bug/issues/11813

src/main/scala/play/modules/swagger/SwaggerPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class SwaggerPluginImpl @Inject()(environment: Environment, configuration: Confi
6868
lazy val swaggerSpecFilter: Option[SwaggerSpecFilter] = config.filterClass match {
6969
case Some(e) if e.nonEmpty =>
7070
try {
71-
val filter = environment.classLoader.loadClass(e).newInstance.asInstanceOf[SwaggerSpecFilter]
71+
val filter = environment.classLoader.loadClass(e).getDeclaredConstructor().asInstanceOf[SwaggerSpecFilter]
7272
logger.debug("Setting swagger.filter to %s".format(e))
7373
Some(filter)
7474
} catch {

src/test/scala/PlayApiListingCacheSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ PUT /api/dog/api/:id testdata.DogController.add0(id:String)
7979
swagger.getSwagger must beEqualTo("2.0")
8080
swagger.getBasePath must beEqualTo(basePath)
8181
swagger.getPaths.size must beEqualTo(7)
82-
swagger.getDefinitions.size must beEqualTo(8)
82+
swagger.getDefinitions.size must beEqualTo(10)
8383
swagger.getHost must beEqualTo(swaggerConfig.host)
8484
swagger.getInfo.getContact.getName must beEqualTo(swaggerConfig.contact)
8585
swagger.getInfo.getVersion must beEqualTo(swaggerConfig.version)

version.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version in ThisBuild := "2.0.1-SNAPSHOT"
1+
version in ThisBuild := "3.0.0-avaya"

0 commit comments

Comments
 (0)