Merge pull request #188 from campudus/updateDependencies

Update dependencies

.gitignore

@@ -44,3 +44,6 @@ project/plugins/project/
 .project
 .classpath
 .settings
+
+# zsh
+.gradletasknamecache

build.gradle

@@ -11,16 +11,16 @@ plugins {
   id 'com.github.kt3k.coveralls' version '2.8.2'
 
   id 'com.github.johnrengelman.shadow' version '2.0.4'
-  id 'org.ajoberstar.grgit' version '2.2.1'
+  id 'org.ajoberstar.grgit' version '2.3.0'
 
-  id 'com.diffplug.gradle.spotless' version '3.13.0'
+  id 'com.diffplug.gradle.spotless' version '3.14.0'
 }
 
 project.group = 'com.campudus'
 project.version = '0.1.0'
 
-def vertxVersion = '3.5.0'
-def scalaVersion = '2.12.5'
+def vertxVersion = '3.5.3'
+def scalaVersion = '2.12.6'
 
 sourceCompatibility = '1.8'
 
@@ -47,16 +47,15 @@ dependencies {
   compile "io.vertx:vertx-web-scala_2.12:${vertxVersion}"
   compile "io.vertx:vertx-mysql-postgresql-client-scala_2.12:${vertxVersion}"
 
-  compile 'joda-time:joda-time:2.9.9'
-  compile 'com.typesafe.scala-logging:scala-logging_2.12:3.7.2'
+  compile 'joda-time:joda-time:2.10'
+  compile 'com.typesafe.scala-logging:scala-logging_2.12:3.9.0'
   compile 'org.slf4j:slf4j-jdk14:1.7.25'
 
   compile 'com.jcabi:jcabi-manifests:1.1'
 
   compile 'com.github.cb372:scalacache-guava_2.12:0.10.0'
 
-  //compile 'org.webjars:swagger-ui:3.0.3'
-  compile 'org.webjars:swagger-ui:2.2.10-1'
+  compile 'org.webjars:swagger-ui:3.17.6'
 
   compileOnly "io.vertx:vertx-codegen:${vertxVersion}"
 
@@ -225,13 +224,14 @@ assemble.dependsOn shadowJar
  */
 spotless {
   scala {
-    scalafmt('1.5.0').configFile('.scalafmt.conf')
+    scalafmt('1.5.1').configFile('.scalafmt.conf')
   }
 }
 
 /**
  * Gradle wrapper
  */
-task wrapper(type: Wrapper) {
-  gradleVersion = '4.7'
+wrapper {
+  gradleVersion = '4.9'
+  distributionType = Wrapper.DistributionType.BIN
 }

gradle.properties

@@ -0,0 +1,2 @@
+org.gradle.warning.mode=summary
+org.gradle.caching=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip

src/main/scala/com/campudus/tableaux/router/DocumentationRouter.scala

@@ -20,8 +20,7 @@ object DocumentationRouter {
 
 class DocumentationRouter(override val config: TableauxConfig) extends BaseRouter {
 
-  //val swaggerUiVersion = "3.0.3"
-  val swaggerUiVersion = "2.2.10-1"
+  val swaggerUiVersion = "3.17.6"
 
   val Index: Regex = "^/docs/index.html$".r
   val IndexRedirect: Regex = "^/docs$|^/docs/$".r
@@ -85,7 +84,7 @@ class DocumentationRouter(override val config: TableauxConfig) extends BaseRoute
         .fromInputStream(is, "UTF-8")
         .mkString
         .replace(
-          "http://petstore.swagger.io/v2/swagger.json",
+          "https://petstore.swagger.io/v2/swagger.json",
           swaggerURL.toString
         )