From 6584743d2f1c4f9a1ed92c10d0aeecb1d627cd7c Mon Sep 17 00:00:00 2001 From: acicchetti Date: Thu, 21 Mar 2019 13:23:29 -0400 Subject: [PATCH] Added shadow plugin for buildSrcVersions --- build.gradle.kts | 6 +++--- buildSrc/src/main/kotlin/Libs.kt | 4 ++++ buildSrc/src/main/kotlin/Versions.kt | 12 +++++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 01363a1..c7c1d0d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("com.github.johnrengelman.shadow") version "5.0.0" - id("de.fayard.buildSrcVersions") version "0.3.2" + id("com.github.johnrengelman.shadow") version Versions.com_github_johnrengelman_shadow_gradle_plugin + id("de.fayard.buildSrcVersions") version Versions.de_fayard_buildsrcversions_gradle_plugin kotlin("jvm") version "1.3.21" application } @@ -27,4 +27,4 @@ application { tasks.withType { kotlinOptions.jvmTarget = "1.8" -} \ No newline at end of file +} diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index 0480738..86102de 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -11,6 +11,10 @@ object Libs { 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 de_fayard_buildsrcversions_gradle_plugin: String = "de.fayard.buildSrcVersions:de.fayard.buildSrcVersions.gradle.plugin:" + Versions.de_fayard_buildsrcversions_gradle_plugin diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 775476e..c503903 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -9,6 +9,8 @@ import kotlin.String object Versions { const val jackson_databind: String = "2.9.8" + const val com_github_johnrengelman_shadow_gradle_plugin: String = "5.0.0" + const val de_fayard_buildsrcversions_gradle_plugin: String = "0.3.2" const val javalin: String = "2.7.0" @@ -17,7 +19,7 @@ object Versions { const val org_jetbrains_kotlin: String = "1.3.21" - const val slf4j_simple: String = "1.7.26" + const val slf4j_simple: String = "1.7.26" /** * @@ -25,12 +27,12 @@ object Versions { * ./gradle/wrapper/gradle-wrapper.properties */ object Gradle { - const val runningVersion: String = "5.2.1" + const val runningVersion: String = "5.3" - const val currentVersion: String = "5.2.1" + const val currentVersion: String = "5.3" - const val nightlyVersion: String = "5.4-20190319000102+0000" + const val nightlyVersion: String = "5.4-20190321000037+0000" - const val releaseCandidate: String = "5.3-rc-3" + const val releaseCandidate: String = "" } }