Play 2.8 merge master

.github/workflows/scala.yml

@@ -0,0 +1,29 @@
+name: Scala CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '*' ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+    - name: Sbt Plugin tests
+      run: 
+        sbt clean sbtPlaySwagger/scripted
+    - name: Core Lib tests
+      run: 
+        sbt ';project playSwagger;clean;+test'
+    - name: Example compile    
+      run: 
+        cd example && sbt clean compile

README.md

@@ -84,12 +84,12 @@ You can find the setup in the example project as well.
 
 For play 2.7, sbt 1.x please use
 ```scala
-addSbtPlugin("com.iheart" % "sbt-play-swagger" % "0.10.0")
+addSbtPlugin("com.iheart" % "sbt-play-swagger" % "0.10.2")
 ```
 
 For play 2.8, please use
 ```scala
-addSbtPlugin("com.iheart" % "sbt-play-swagger" % "0.10.0-PLAY2.8")
+addSbtPlugin("com.iheart" % "sbt-play-swagger" % "0.10.2-PLAY2.8")
 ```
 
 For play 2.6, sbt 1.x, Scala 2.12.x and 2.11.x please use (No Longer maintained after 0.10.0)
@@ -154,9 +154,9 @@ Deploy a swagger ui and point to the swagger spec end point at 'assets/swagger.j
 #### Step 3b
 Alternatively you can use swagger-ui webjar and have you play app serving the swagger ui:
 
-Add the following dependency
+Add the following dependency (check latest version swagger-ui [here](https://github.com/webjars/swagger-ui))
 ```scala
-libraryDependencies += "org.webjars" % "swagger-ui" % "2.2.0"
+libraryDependencies += "org.webjars" % "swagger-ui" % "3.43.0"
 ```
 
 Add the following to your route file

build.sbt

@@ -41,7 +41,7 @@ lazy val playSwagger = project.in(file("core"))
 
 lazy val sbtPlaySwagger = project.in(file("sbtPlugin"))
   .settings(
-    Publish.sbtPluginSettings,
+    Publish.coreSettings,
     Format.settings,
     addSbtPlugin("com.typesafe.sbt" %% "sbt-native-packager" % "1.3.17" % Provided),
     addSbtPlugin("com.typesafe.sbt" %% "sbt-web" % "1.4.3" % Provided))

example/project/plugins.sbt

@@ -3,6 +3,6 @@ addSbtPlugin("com.typesafe.play" %% "sbt-plugin" % "2.8.0")
 
 
 // play swagger plugin
-addSbtPlugin("com.iheart" % "sbt-play-swagger" % "0.10.3-SNAPSHOT")
+addSbtPlugin("com.iheart" % "sbt-play-swagger" % "0.10.4-SNAPSHOT")
 
 

project/Dependencies.scala

@@ -19,7 +19,7 @@ object Dependencies {
     "com.typesafe.play" %% "play-json" % Versions.playJson % "provided")
 
   val yaml = Seq(
-    "org.yaml" % "snakeyaml" % "1.27")
+    "org.yaml" % "snakeyaml" % "1.28")
 
   val enumeratum = Seq(
     "com.beachape" %% "enumeratum" % Versions.enumeratum % Test)

project/Publish.scala

@@ -1,36 +1,49 @@
+import com.typesafe.sbt.pgp.PgpKeys
 import sbt._, Keys._
-import bintray.BintrayKeys._
 import sbtrelease.ReleasePlugin.autoImport._
 import ReleaseTransformations._
+
 object Publish {
 
   val coreSettings = Seq(
-    bintrayOrganization := Some("iheartradio"),
-    bintrayPackageLabels := Seq("play-framework", "swagger", "rest-api", "API", "documentation"),
+    organization in ThisBuild := "com.iheart",
     publishMavenStyle := true,
     licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")),
     homepage := Some(url("http://iheartradio.github.io/play-swagger")),
     scmInfo := Some(ScmInfo(
       url("https://github.com/iheartradio/play-swagger"),
       "git@github.com:iheartradio/play-swagger.git")),
+    developers := List(
+      Developer(
+        "kailuowang",
+        "Kailuo Wang",
+        "kailuo.wang@gmail.com",
+        url("https://kailuowang.com")
+      )
+    ),
     pomIncludeRepository := { _ ⇒ false },
     publishArtifact in Test := false,
+    publishTo := {
+      val nexus = "https://oss.sonatype.org/"
+      if (isSnapshot.value)
+        Some("Snapshots" at nexus + "content/repositories/snapshots")
+      else
+        Some("Releases" at nexus + "service/local/staging/deploy/maven2")
+    },
+    releaseCrossBuild := true,
+    releasePublishArtifactsAction := PgpKeys.publishSigned.value,
     releaseProcess := Seq[ReleaseStep](
       checkSnapshotDependencies,
       inquireVersions,
-      releaseStepCommandAndRemaining("+clean"),
-      releaseStepCommandAndRemaining("+test"),
+      runClean,
+      runTest,
       setReleaseVersion,
       commitReleaseVersion,
       tagRelease,
-      releaseStepCommandAndRemaining("+publish"),
+      publishArtifacts,
       setNextVersion,
       commitNextVersion,
+      ReleaseStep(action = Command.process("sonatypeReleaseAll", _)),
       pushChanges))
 
-
-  val sbtPluginSettings = Seq(
-    licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")),
-    publishMavenStyle := false,
-    bintrayOrganization := Some("iheartradio"))
 }

project/plugins.sbt

@@ -1,4 +1,6 @@
-addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")
+
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")
 
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.10")