From c701677e45827b1b415d81b8df2517c321dd2a3b Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Fri, 4 Aug 2023 11:39:42 +0200 Subject: [PATCH] [repo] Remove the shadow version from version.properties --- gradle/libs.versions.toml | 2 +- gradle/versions.properties | 2 -- plugins/pill/pill-importer/build.gradle.kts | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b4e4f342e1f..902723e77ea 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ gradle-plugin-publish = "1.0.0" # Version for foojay should be also synced with version in repo/gradle-settings-conventions/settings.gradle.kts gradle-toolchains-foojay-resolver = "0.4.0" kotlinx-serialization = "1.5.0" -shadow = "7.1.2" # should be in sync with versions.properties +shadow = "7.1.2" spdx = "0.1.0-dev-10" proguard = "6.2.2" ktor = "2.0.2" # should be in sync with versions.properties diff --git a/gradle/versions.properties b/gradle/versions.properties index e268757f9b1..8a5eefecfb2 100644 --- a/gradle/versions.properties +++ b/gradle/versions.properties @@ -22,8 +22,6 @@ versions.lz4-java=1.7.1 versions.org.junit.platform=1.7.0 versions.oro=2.0.8 versions.serviceMessages=2019.1.4 -# Should be in sync with libs.versions.toml -versions.shadow=7.1.2 versions.stax2-api=4.2.1 versions.streamex=0.7.2 versions.trove4j=1.0.20200330 diff --git a/plugins/pill/pill-importer/build.gradle.kts b/plugins/pill/pill-importer/build.gradle.kts index 245eb4d6a8f..a09a584f099 100644 --- a/plugins/pill/pill-importer/build.gradle.kts +++ b/plugins/pill/pill-importer/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { compileOnly(kotlin("stdlib", embeddedKotlinVersion)) compileOnly(gradleApi()) compileOnly(gradleKotlinDsl()) - compileOnly("gradle.plugin.com.github.johnrengelman:shadow:${rootProject.extra["versions.shadow"]}") + compileOnly(libs.shadow.gradlePlugin) } sourceSets {