diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index fc459d8..844631e 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -20,6 +20,16 @@ object Libs { const val kotlin_stdlib_jdk8: String = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:" + Versions.org_jetbrains_kotlin + /** + * https://javalin.io + */ + const val javalin: String = "io.javalin:javalin:" + Versions.io_javalin + + /** + * https://javalin.io + */ + const val javalin_openapi: String = "io.javalin:javalin-openapi:" + Versions.io_javalin + const val com_github_johnrengelman_shadow_gradle_plugin: String = "com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:" + Versions.com_github_johnrengelman_shadow_gradle_plugin @@ -69,11 +79,4 @@ object Libs { * http://webjars.org */ const val swagger_ui: String = "org.webjars:swagger-ui:" + Versions.swagger_ui - - /** - * 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 255b8be..8975549 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -12,36 +12,37 @@ 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.72" // available: "1.3.72" + const val org_jetbrains_kotlin: String = "1.4.10" // available: "1.4.10" - const val com_github_johnrengelman_shadow_gradle_plugin: String = "5.2.0" + const val io_javalin: String = "3.11.2" // available: "3.11.2" + + const val com_github_johnrengelman_shadow_gradle_plugin: String = "6.1.0" + // available: "6.1.0" const val de_fayard_buildsrcversions_gradle_plugin: String = "0.7.0" - const val org_jetbrains_kotlin_jvm_gradle_plugin: String = "1.3.72" // available: "1.3.72" + const val org_jetbrains_kotlin_jvm_gradle_plugin: String = "1.4.10" // available: "1.4.10" - const val jackson_module_kotlin: String = "2.11.0" // available: "2.11.0" + const val jackson_module_kotlin: String = "2.11.3" // available: "2.11.3" - const val kotlin_openapi3_dsl: String = "0.21.1" // available: "0.21.1" + const val kotlin_openapi3_dsl: String = "1.0.0" // available: "1.0.0" - const val jackson_databind: String = "2.11.0" // available: "2.11.0" + const val jackson_databind: String = "2.11.3" // available: "2.11.3" - const val junit_jupiter: String = "5.6.2" // available: "5.6.2" + const val junit_jupiter: String = "5.7.0" // available: "5.7.0" const val slf4j_simple: String = "1.7.30" - const val swagger_core: String = "2.1.2" // available: "2.1.2" + const val swagger_core: String = "2.1.5" // available: "2.1.5" - const val swagger_ui: String = "3.26.0" // available: "3.26.0" - - const val javalin: String = "3.9.0" // available: "3.9.0" + const val swagger_ui: String = "3.35.2" // available: "3.35.2" /** - * Current version: "6.5" + * Current version: "6.7" * See issue 19: How to update Gradle itself? * https://github.com/jmfayard/buildSrcVersions/issues/19 */ - const val gradleLatestVersion: String = "6.5" + const val gradleLatestVersion: String = "6.7" } /** diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f3d88b1..62d4c05 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 622ab64..be52383 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.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7..fbd7c51 100755 --- a/gradlew +++ b/gradlew @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -129,6 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index 9109989..a9f778a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%* set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%