Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #188

Merged
merged 3 commits into from
Aug 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@ project/plugins/project/
.project
.classpath
.settings

# zsh
.gradletasknamecache
22 changes: 11 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -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}"

Expand Down Expand Up @@ -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
}
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
org.gradle.warning.mode=summary
org.gradle.caching=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)

Expand Down