From ca1409fa592fa1633b9c65fe5ea0c29641609a68 Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Thu, 29 Aug 2019 10:29:45 -0400 Subject: [PATCH] Updated all dependencies to latest versions --- buildSrc/src/main/kotlin/Libs.kt | 70 +++++++++++++----------- buildSrc/src/main/kotlin/Versions.kt | 51 +++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- gradlew.bat | 2 +- 5 files changed, 70 insertions(+), 57 deletions(-) diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index 36dbac5..1001201 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -4,45 +4,51 @@ import kotlin.String * Generated by https://github.com/jmfayard/buildSrcVersions * * Update this file with - * `$ ./gradlew buildSrcVersions` */ + * `$ ./gradlew buildSrcVersions` + */ object Libs { - /** - * http://github.com/FasterXML/jackson */ - const val jackson_databind: String = "com.fasterxml.jackson.core:jackson-databind:" + - Versions.jackson_databind + /** + * http://github.com/FasterXML/jackson + */ + const val jackson_databind: String = "com.fasterxml.jackson.core:jackson-databind:" + + Versions.jackson_databind - 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 + 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 - const val de_fayard_buildsrcversions_gradle_plugin: String = - "de.fayard.buildSrcVersions:de.fayard.buildSrcVersions.gradle.plugin:" + - Versions.de_fayard_buildsrcversions_gradle_plugin + const val de_fayard_buildsrcversions_gradle_plugin: String = + "de.fayard.buildSrcVersions:de.fayard.buildSrcVersions.gradle.plugin:" + + Versions.de_fayard_buildsrcversions_gradle_plugin - /** - * https://javalin.io */ - const val javalin: String = "io.javalin:javalin:" + Versions.javalin + /** + * https://javalin.io + */ + const val javalin: String = "io.javalin:javalin:" + Versions.javalin - const val org_jetbrains_kotlin_jvm_gradle_plugin: String = - "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:" + - Versions.org_jetbrains_kotlin_jvm_gradle_plugin + const val org_jetbrains_kotlin_jvm_gradle_plugin: String = + "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:" + + Versions.org_jetbrains_kotlin_jvm_gradle_plugin - /** - * 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_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://kotlinlang.org/ + */ + const val kotlin_stdlib_jdk8: String = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:" + + Versions.org_jetbrains_kotlin - /** - * https://junit.org/junit5/ */ - const val junit_jupiter: String = "org.junit.jupiter:junit-jupiter:" + Versions.junit_jupiter + /** + * https://junit.org/junit5/ + */ + const val junit_jupiter: String = "org.junit.jupiter:junit-jupiter:" + Versions.junit_jupiter - /** - * http://www.slf4j.org */ - const val slf4j_simple: String = "org.slf4j:slf4j-simple:" + Versions.slf4j_simple + /** + * http://www.slf4j.org + */ + const val slf4j_simple: String = "org.slf4j:slf4j-simple:" + Versions.slf4j_simple } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 587fbd4..4a5fa73 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,40 +1,47 @@ import kotlin.String +import org.gradle.plugin.use.PluginDependenciesSpec +import org.gradle.plugin.use.PluginDependencySpec /** + * Generated by https://github.com/jmfayard/buildSrcVersions + * * Find which updates are available by running * `$ ./gradlew buildSrcVersions` * This will only update the comments. * - * YOU are responsible for updating manually the dependency version. */ + * YOU are responsible for updating manually the dependency version. + */ object Versions { - const val jackson_databind: String = "2.9.9.1" + const val jackson_databind: String = "2.10.0.pr1" - const val com_github_johnrengelman_shadow_gradle_plugin: String = "5.1.0" + const val com_github_johnrengelman_shadow_gradle_plugin: String = "5.1.0" - const val de_fayard_buildsrcversions_gradle_plugin: String = "0.3.2" + const val de_fayard_buildsrcversions_gradle_plugin: String = "0.4.2" - const val javalin: String = "3.1.0" + const val javalin: String = "3.4.1" - const val org_jetbrains_kotlin_jvm_gradle_plugin: String = "1.3.41" + const val org_jetbrains_kotlin_jvm_gradle_plugin: String = "1.3.50" - const val org_jetbrains_kotlin: String = "1.3.41" + const val org_jetbrains_kotlin: String = "1.3.50" - const val junit_jupiter: String = "5.5.0" + const val junit_jupiter: String = "5.5.1" - const val slf4j_simple: String = "1.7.26" + const val slf4j_simple: String = "1.7.28" - /** - * - * To update Gradle, edit the wrapper file at path: - * ./gradle/wrapper/gradle-wrapper.properties - */ - object Gradle { - const val runningVersion: String = "5.4.1" + /** + * + * See issue 19: How to update Gradle itself? + * https://github.com/jmfayard/buildSrcVersions/issues/19 + */ + const val gradleLatestVersion: String = "5.6.1" - const val currentVersion: String = "5.5" - - const val nightlyVersion: String = "5.6-20190707000033+0000" - - const val releaseCandidate: String = "" - } + const val gradleCurrentVersion: String = "5.6.1" } + +/** + * See issue #47: how to update buildSrcVersions itself + * https://github.com/jmfayard/buildSrcVersions/issues/47 + */ +val PluginDependenciesSpec.buildSrcVersions: PluginDependencySpec + inline get() = + id("de.fayard.buildSrcVersions").version(Versions.de_fayard_buildsrcversions_gradle_plugin) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f4d7b2b..59b5f89 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.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index b0d6d0a..8e25e6c 100755 --- a/gradlew +++ b/gradlew @@ -7,7 +7,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/gradlew.bat b/gradlew.bat index 15e1ee3..24467a1 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -5,7 +5,7 @@ @rem you may not use this file except in compliance with the License. @rem You may obtain a copy of the License at @rem -@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem https://www.apache.org/licenses/LICENSE-2.0 @rem @rem Unless required by applicable law or agreed to in writing, software @rem distributed under the License is distributed on an "AS IS" BASIS,