From 5db4ee26ec1be4a213652ab10dfafc42bb4e93e2 Mon Sep 17 00:00:00 2001 From: hhandoko Date: Sun, 4 Mar 2018 18:38:55 +0800 Subject: [PATCH 1/7] Update to latest 0.13.x SBT version (incl. plugins) --- examples/play24-example/project/build.properties | 2 +- examples/play25-example/project/build.properties | 2 +- examples/play26-example/project/build.properties | 2 +- modules/play24/project/build.properties | 2 +- modules/play24/project/plugins.sbt | 2 +- modules/play25/project/build.properties | 2 +- modules/play25/project/plugins.sbt | 2 +- modules/play26/project/build.properties | 2 +- modules/play26/project/plugins.sbt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/play24-example/project/build.properties b/examples/play24-example/project/build.properties index 64317fd..133a8f1 100644 --- a/examples/play24-example/project/build.properties +++ b/examples/play24-example/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=0.13.17 diff --git a/examples/play25-example/project/build.properties b/examples/play25-example/project/build.properties index 64317fd..133a8f1 100644 --- a/examples/play25-example/project/build.properties +++ b/examples/play25-example/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=0.13.17 diff --git a/examples/play26-example/project/build.properties b/examples/play26-example/project/build.properties index 64317fd..133a8f1 100644 --- a/examples/play26-example/project/build.properties +++ b/examples/play26-example/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=0.13.17 diff --git a/modules/play24/project/build.properties b/modules/play24/project/build.properties index 64317fd..133a8f1 100644 --- a/modules/play24/project/build.properties +++ b/modules/play24/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=0.13.17 diff --git a/modules/play24/project/plugins.sbt b/modules/play24/project/plugins.sbt index 49ce873..4c26eee 100644 --- a/modules/play24/project/plugins.sbt +++ b/modules/play24/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.11") // Maven publishing-specific // ~~~~~ // Sonatype publishing SBT plugin -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3") // GnuPG SBT plugin addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") diff --git a/modules/play25/project/build.properties b/modules/play25/project/build.properties index 64317fd..133a8f1 100644 --- a/modules/play25/project/build.properties +++ b/modules/play25/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=0.13.17 diff --git a/modules/play25/project/plugins.sbt b/modules/play25/project/plugins.sbt index 94e72a1..5223366 100644 --- a/modules/play25/project/plugins.sbt +++ b/modules/play25/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.15") // Maven publishing-specific // ~~~~~ // Sonatype publishing SBT plugin -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3") // GnuPG SBT plugin addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") diff --git a/modules/play26/project/build.properties b/modules/play26/project/build.properties index 64317fd..133a8f1 100644 --- a/modules/play26/project/build.properties +++ b/modules/play26/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=0.13.17 diff --git a/modules/play26/project/plugins.sbt b/modules/play26/project/plugins.sbt index e34aaf7..73aaa6c 100644 --- a/modules/play26/project/plugins.sbt +++ b/modules/play26/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.1") // Maven publishing-specific // ~~~~~ // Sonatype publishing SBT plugin -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3") // GnuPG SBT plugin addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") From d2f8f9ba1279fb671ae48986533a4d72b8f5fa00 Mon Sep 17 00:00:00 2001 From: hhandoko Date: Sun, 4 Mar 2018 18:43:54 +0800 Subject: [PATCH 2/7] Update to latest Play Framework patch version --- examples/play25-example/project/plugins.sbt | 2 +- examples/play26-example/project/plugins.sbt | 2 +- modules/play25/project/plugins.sbt | 2 +- modules/play26/project/plugins.sbt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/play25-example/project/plugins.sbt b/examples/play25-example/project/plugins.sbt index e5151a4..e6145ac 100644 --- a/examples/play25-example/project/plugins.sbt +++ b/examples/play25-example/project/plugins.sbt @@ -1,2 +1,2 @@ // Play Framework plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.15") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.18") diff --git a/examples/play26-example/project/plugins.sbt b/examples/play26-example/project/plugins.sbt index 89c2b22..5db553c 100644 --- a/examples/play26-example/project/plugins.sbt +++ b/examples/play26-example/project/plugins.sbt @@ -1,2 +1,2 @@ // Play Framework plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.1") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.12") diff --git a/modules/play25/project/plugins.sbt b/modules/play25/project/plugins.sbt index 5223366..ee1d28a 100644 --- a/modules/play25/project/plugins.sbt +++ b/modules/play25/project/plugins.sbt @@ -1,5 +1,5 @@ // Play Framework plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.15") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.18") // Maven publishing-specific // ~~~~~ diff --git a/modules/play26/project/plugins.sbt b/modules/play26/project/plugins.sbt index 73aaa6c..e2cb3f5 100644 --- a/modules/play26/project/plugins.sbt +++ b/modules/play26/project/plugins.sbt @@ -1,5 +1,5 @@ // Play Framework plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.1") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.12") // Maven publishing-specific // ~~~~~ From 16ed5d36e677ca95ba32a80a984acb4faa083b60 Mon Sep 17 00:00:00 2001 From: hhandoko Date: Sun, 4 Mar 2018 19:02:11 +0800 Subject: [PATCH 3/7] Update Scala minor version --- examples/play24-example/build.sbt | 4 ++-- examples/play25-example/build.sbt | 4 ++-- examples/play26-example/build.sbt | 4 ++-- modules/play24/build.sbt | 4 ++-- modules/play25/build.sbt | 4 ++-- modules/play26/build.sbt | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/play24-example/build.sbt b/examples/play24-example/build.sbt index f45b5da..3b29449 100644 --- a/examples/play24-example/build.sbt +++ b/examples/play24-example/build.sbt @@ -28,9 +28,9 @@ name := """play2-scala-pdf-example""" version := "1.0.0.P24" -scalaVersion := "2.11.8" +scalaVersion := "2.11.12" -crossScalaVersions := Seq("2.10.6", "2.11.8") +crossScalaVersions := Seq("2.10.7", "2.11.12") libraryDependencies ++= Seq( // Utilities diff --git a/examples/play25-example/build.sbt b/examples/play25-example/build.sbt index 851d97a..4d5e3a1 100644 --- a/examples/play25-example/build.sbt +++ b/examples/play25-example/build.sbt @@ -28,9 +28,9 @@ name := """play2-scala-pdf-example""" version := "1.0.0.P25" -scalaVersion := "2.11.8" +scalaVersion := "2.11.12" -crossScalaVersions := Seq("2.11.8") +crossScalaVersions := Seq("2.11.12") libraryDependencies ++= Seq( // Utilities diff --git a/examples/play26-example/build.sbt b/examples/play26-example/build.sbt index 9840270..bd9a494 100644 --- a/examples/play26-example/build.sbt +++ b/examples/play26-example/build.sbt @@ -28,9 +28,9 @@ name := """play2-scala-pdf-example""" version := "1.0.0.P26" -scalaVersion := "2.12.2" +scalaVersion := "2.12.4" -crossScalaVersions := Seq("2.11.8", "2.12.2") +crossScalaVersions := Seq("2.11.12", "2.12.4") libraryDependencies ++= Seq( guice, diff --git a/modules/play24/build.sbt b/modules/play24/build.sbt index c1d9ce8..9b826a5 100644 --- a/modules/play24/build.sbt +++ b/modules/play24/build.sbt @@ -30,9 +30,9 @@ organization := "com.hhandoko" version := "3.0.0.P24-SNAPSHOT" -scalaVersion := "2.11.8" +scalaVersion := "2.11.12" -crossScalaVersions := Seq("2.10.6", "2.11.8") +crossScalaVersions := Seq("2.10.7", "2.11.12") libraryDependencies ++= Seq( // Apache Commons IO diff --git a/modules/play25/build.sbt b/modules/play25/build.sbt index bb06656..2078bec 100644 --- a/modules/play25/build.sbt +++ b/modules/play25/build.sbt @@ -30,9 +30,9 @@ organization := "com.hhandoko" version := "3.0.0.P25-SNAPSHOT" -scalaVersion := "2.11.8" +scalaVersion := "2.11.12" -crossScalaVersions := Seq("2.11.8") +crossScalaVersions := Seq("2.11.12") libraryDependencies ++= Seq( // Apache Commons IO diff --git a/modules/play26/build.sbt b/modules/play26/build.sbt index 3dbf81a..424aca8 100644 --- a/modules/play26/build.sbt +++ b/modules/play26/build.sbt @@ -30,9 +30,9 @@ organization := "com.hhandoko" version := "3.0.0.P26-SNAPSHOT" -scalaVersion := "2.12.2" +scalaVersion := "2.12.4" -crossScalaVersions := Seq("2.11.8", "2.12.2") +crossScalaVersions := Seq("2.11.12", "2.12.4") libraryDependencies ++= Seq( guice, From a2882c07e6039ac0d2e1bbb8aea9c11e4ea7b244 Mon Sep 17 00:00:00 2001 From: hhandoko Date: Sun, 4 Mar 2018 19:06:41 +0800 Subject: [PATCH 4/7] Update Apache Commons IO version --- modules/play24/build.sbt | 2 +- modules/play25/build.sbt | 2 +- modules/play26/build.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/play24/build.sbt b/modules/play24/build.sbt index 9b826a5..4ce5dd5 100644 --- a/modules/play24/build.sbt +++ b/modules/play24/build.sbt @@ -37,7 +37,7 @@ crossScalaVersions := Seq("2.10.7", "2.11.12") libraryDependencies ++= Seq( // Apache Commons IO // - https://commons.apache.org/proper/commons-io/ - "commons-io" % "commons-io" % "2.5", + "commons-io" % "commons-io" % "2.6", // HTML parsing + PDF generation // - http://jtidy.sourceforge.net/ diff --git a/modules/play25/build.sbt b/modules/play25/build.sbt index 2078bec..744d0ff 100644 --- a/modules/play25/build.sbt +++ b/modules/play25/build.sbt @@ -37,7 +37,7 @@ crossScalaVersions := Seq("2.11.12") libraryDependencies ++= Seq( // Apache Commons IO // - https://commons.apache.org/proper/commons-io/ - "commons-io" % "commons-io" % "2.5", + "commons-io" % "commons-io" % "2.6", // HTML parsing + PDF generation // - http://jtidy.sourceforge.net/ diff --git a/modules/play26/build.sbt b/modules/play26/build.sbt index 424aca8..c091c74 100644 --- a/modules/play26/build.sbt +++ b/modules/play26/build.sbt @@ -39,7 +39,7 @@ libraryDependencies ++= Seq( // Apache Commons IO // - https://commons.apache.org/proper/commons-io/ - "commons-io" % "commons-io" % "2.5", + "commons-io" % "commons-io" % "2.6", // HTML parsing + PDF generation // - http://jtidy.sourceforge.net/ From 2bd05ec491c97f2bfa4ada899541a5bdf6b25d79 Mon Sep 17 00:00:00 2001 From: hhandoko Date: Sun, 4 Mar 2018 19:10:56 +0800 Subject: [PATCH 5/7] Update Flying Saucer library to latest --- modules/play24/build.sbt | 2 +- modules/play25/build.sbt | 2 +- modules/play26/build.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/play24/build.sbt b/modules/play24/build.sbt index 4ce5dd5..dc13db8 100644 --- a/modules/play24/build.sbt +++ b/modules/play24/build.sbt @@ -44,7 +44,7 @@ libraryDependencies ++= Seq( // - https://github.com/flyingsaucerproject/flyingsaucer // - https://about.validator.nu/htmlparser/ "net.sf.jtidy" % "jtidy" % "r938", - "org.xhtmlrenderer" % "flying-saucer-pdf-itext5" % "9.1.6", + "org.xhtmlrenderer" % "flying-saucer-pdf-itext5" % "9.1.12", "nu.validator.htmlparser" % "htmlparser" % "1.4", // ScalaTest + Play plugin diff --git a/modules/play25/build.sbt b/modules/play25/build.sbt index 744d0ff..073370e 100644 --- a/modules/play25/build.sbt +++ b/modules/play25/build.sbt @@ -44,7 +44,7 @@ libraryDependencies ++= Seq( // - https://github.com/flyingsaucerproject/flyingsaucer // - https://about.validator.nu/htmlparser/ "net.sf.jtidy" % "jtidy" % "r938", - "org.xhtmlrenderer" % "flying-saucer-pdf-itext5" % "9.1.6", + "org.xhtmlrenderer" % "flying-saucer-pdf-itext5" % "9.1.12", "nu.validator.htmlparser" % "htmlparser" % "1.4", // ScalaTest + Play plugin diff --git a/modules/play26/build.sbt b/modules/play26/build.sbt index c091c74..29890fb 100644 --- a/modules/play26/build.sbt +++ b/modules/play26/build.sbt @@ -46,7 +46,7 @@ libraryDependencies ++= Seq( // - https://github.com/flyingsaucerproject/flyingsaucer // - https://about.validator.nu/htmlparser/ "net.sf.jtidy" % "jtidy" % "r938", - "org.xhtmlrenderer" % "flying-saucer-pdf-itext5" % "9.1.6", + "org.xhtmlrenderer" % "flying-saucer-pdf-itext5" % "9.1.12", "nu.validator.htmlparser" % "htmlparser" % "1.4", // ScalaTest + Play plugin From da08dbfd2cbb0366b519f2a8ba17724e01264774 Mon Sep 17 00:00:00 2001 From: hhandoko Date: Sun, 4 Mar 2018 19:16:27 +0800 Subject: [PATCH 6/7] Update Scalatest + Play version --- examples/play25-example/build.sbt | 2 +- modules/play26/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/play25-example/build.sbt b/examples/play25-example/build.sbt index 4d5e3a1..85c8cc7 100644 --- a/examples/play25-example/build.sbt +++ b/examples/play25-example/build.sbt @@ -42,7 +42,7 @@ libraryDependencies ++= Seq( // ScalaTest + Play plugin // - http://www.scalatest.org/plus/play - "org.scalatestplus.play" %% "scalatestplus-play" % "1.5.1" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "2.0.1" % Test ) resolvers += "scalaz-bintray" at "http://dl.bintray.com/scalaz/releases" diff --git a/modules/play26/build.sbt b/modules/play26/build.sbt index 29890fb..1f7e358 100644 --- a/modules/play26/build.sbt +++ b/modules/play26/build.sbt @@ -51,7 +51,7 @@ libraryDependencies ++= Seq( // ScalaTest + Play plugin // - http://www.scalatest.org/plus/play - "org.scalatestplus.play" %% "scalatestplus-play" % "3.1.0" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "3.1.2" % Test ) resolvers += "scalaz-bintray" at "http://dl.bintray.com/scalaz/releases" From f29a99d029dfbfc219de34ffe14ceda9400d43d8 Mon Sep 17 00:00:00 2001 From: hhandoko Date: Sun, 4 Mar 2018 19:20:10 +0800 Subject: [PATCH 7/7] Update README to clarify compatible Play Framework version --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ad22186..87de060 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,13 @@ Dear play2-scala-pdf users, I will be making some significant changes to this pr - ~~The project repository will be moved under my own account (i.e. `hhandoko/play2-scala-pdf`)~~ - ~~The project organisation namespace will be updated to `com.hhandoko`~~ + - Publish updated binaries under the new namespace I have joined a new company, but unfortunately there were no other developers in my previous company able to pick up the responsibility of maintaining this project. Rather than abandoning it, I will continue to develop and maintain it but in my personal capacity. I apologise for the inconvenience and thank you for your understanding. -# Play 2.4+ PDF module +# Play [2.4 | 2.5 | 2.6] PDF module `play2-scala-pdf` is a Play! module to help generate PDF documents dynamically from Play! web application.