From 713979f340b8bd6db3a2691732fd28e6eb0b7731 Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Sat, 21 Dec 2019 10:54:02 -0500 Subject: [PATCH] Dependency updates --- VERSION | 2 +- buildSrc/src/main/kotlin/Libs.kt | 26 ++++++++++++------------ buildSrc/src/main/kotlin/Versions.kt | 23 +++++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/VERSION b/VERSION index b1e80bb..845639e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.3 +0.1.4 diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index 21ecd87..74552ea 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -7,6 +7,19 @@ import kotlin.String * `$ ./gradlew buildSrcVersions` */ object Libs { + /** + * https://kotlinlang.org/ + */ + const val kotlin_scripting_compiler_embeddable: String = + "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:" + + Versions.org_jetbrains_kotlin + + /** + * https://kotlinlang.org/ + */ + const val kotlin_stdlib_jdk8: String = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:" + + Versions.org_jetbrains_kotlin + 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 @@ -25,19 +38,6 @@ object Libs { const val jackson_module_kotlin: String = "com.fasterxml.jackson.module:jackson-module-kotlin:" + Versions.jackson_module_kotlin - /** - * https://kotlinlang.org/ - */ - const val kotlin_scripting_compiler_embeddable: String = - "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:" + - Versions.org_jetbrains_kotlin - - /** - * https://kotlinlang.org/ - */ - const val kotlin_stdlib_jdk8: String = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:" + - Versions.org_jetbrains_kotlin - /** * https://github.com/derveloper/kotlin-openapi3-dsl */ diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 86aa968..552eb62 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 com_github_johnrengelman_shadow_gradle_plugin: String = "5.1.0" + const val org_jetbrains_kotlin: String = "1.3.61" // available: "1.3.61" + + const val com_github_johnrengelman_shadow_gradle_plugin: String = "5.2.0" + // available: "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.50" + const val org_jetbrains_kotlin_jvm_gradle_plugin: String = "1.3.61" // available: "1.3.61" - const val jackson_module_kotlin: String = "2.10.0" - - const val org_jetbrains_kotlin: String = "1.3.50" + const val jackson_module_kotlin: String = "2.10.1" // available: "2.10.1" const val kotlin_openapi3_dsl: String = "0.20.2" - const val jackson_databind: String = "2.10.0" + const val jackson_databind: String = "2.10.1" // available: "2.10.1" const val junit_jupiter: String = "5.5.2" - const val slf4j_simple: String = "1.7.28" + const val slf4j_simple: String = "1.7.30" // available: "1.7.30" - const val swagger_core: String = "2.0.10" + const val swagger_core: String = "2.1.0" // available: "2.1.0" - const val swagger_ui: String = "3.24.0" + const val swagger_ui: String = "3.24.3" // available: "3.24.3" - const val javalin: String = "3.5.0" + const val javalin: String = "3.6.0" // available: "3.6.0" /** * Current version: "5.6.2" * See issue 19: How to update Gradle itself? * https://github.com/jmfayard/buildSrcVersions/issues/19 */ - const val gradleLatestVersion: String = "5.6.2" + const val gradleLatestVersion: String = "6.0.1" } /** diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7c4388a..9492014 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-5.6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists