diff --git a/build.gradle.kts b/build.gradle.kts index 7c412b9..5ec5f0c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,6 +17,7 @@ repositories { dependencies { implementation(kotlin("stdlib-jdk8")) implementation(Libs.javalin) + implementation(Libs.javalin_openapi) implementation(Libs.slf4j_simple) implementation(Libs.jackson_databind) implementation(Libs.jackson_module_kotlin) diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index 74552ea..fc459d8 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -74,4 +74,6 @@ object Libs { * https://javalin.io */ const val javalin: String = "io.javalin:javalin:" + Versions.javalin + + const val javalin_openapi: String = "io.javalin:javalin-openapi:" + Versions.javalin } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index c2b6f0c..255b8be 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -12,36 +12,36 @@ import org.gradle.plugin.use.PluginDependencySpec * YOU are responsible for updating manually the dependency version. */ object Versions { - const val org_jetbrains_kotlin: String = "1.3.70" + const val org_jetbrains_kotlin: String = "1.3.72" // available: "1.3.72" const val com_github_johnrengelman_shadow_gradle_plugin: String = "5.2.0" const val de_fayard_buildsrcversions_gradle_plugin: String = "0.7.0" - const val org_jetbrains_kotlin_jvm_gradle_plugin: String = "1.3.70" + const val org_jetbrains_kotlin_jvm_gradle_plugin: String = "1.3.72" // available: "1.3.72" - const val jackson_module_kotlin: String = "2.10.3" + const val jackson_module_kotlin: String = "2.11.0" // available: "2.11.0" - const val kotlin_openapi3_dsl: String = "0.20.2" + const val kotlin_openapi3_dsl: String = "0.21.1" // available: "0.21.1" - const val jackson_databind: String = "2.10.3" + const val jackson_databind: String = "2.11.0" // available: "2.11.0" - const val junit_jupiter: String = "5.6.0" + const val junit_jupiter: String = "5.6.2" // available: "5.6.2" const val slf4j_simple: String = "1.7.30" - const val swagger_core: String = "2.1.1" + const val swagger_core: String = "2.1.2" // available: "2.1.2" - const val swagger_ui: String = "3.25.0" + const val swagger_ui: String = "3.26.0" // available: "3.26.0" - const val javalin: String = "3.7.0" + const val javalin: String = "3.9.0" // available: "3.9.0" /** - * Current version: "6.2.2" + * Current version: "6.5" * See issue 19: How to update Gradle itself? * https://github.com/jmfayard/buildSrcVersions/issues/19 */ - const val gradleLatestVersion: String = "6.2.2" + const val gradleLatestVersion: String = "6.5" } /** diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index cc4fdc2..f3d88b1 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84a9066..622ab64 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew.bat b/gradlew.bat index 24467a1..9109989 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"