From 6508cf5113e83e0633cba0197e6cbd36496a8df7 Mon Sep 17 00:00:00 2001 From: Robert Stupp Date: Wed, 21 Aug 2024 17:26:36 +0200 Subject: [PATCH] Migrate to new `shadow` plugin ID See [Shadow release notes](https://github.com/GradleUp/shadow/releases/tag/8.3.0), the new plugin ID and Maven coordinates. Requires a bump of the `me.champeau.jmh` as well. --- build-logic/src/main/kotlin/nessie-shadow-jar.gradle.kts | 2 +- catalog/format/iceberg-bench/build.gradle.kts | 2 +- gc/gc-tool/build.gradle.kts | 2 +- gradle/baselibs.versions.toml | 2 +- servers/services-bench/build.gradle.kts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-logic/src/main/kotlin/nessie-shadow-jar.gradle.kts b/build-logic/src/main/kotlin/nessie-shadow-jar.gradle.kts index f8d257af038..7b3de575652 100644 --- a/build-logic/src/main/kotlin/nessie-shadow-jar.gradle.kts +++ b/build-logic/src/main/kotlin/nessie-shadow-jar.gradle.kts @@ -16,7 +16,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -plugins { id("com.github.johnrengelman.shadow") } +plugins { id("com.gradleup.shadow") } val shadowJar = tasks.named("shadowJar") diff --git a/catalog/format/iceberg-bench/build.gradle.kts b/catalog/format/iceberg-bench/build.gradle.kts index 5764d8b70e2..7ac193ff547 100644 --- a/catalog/format/iceberg-bench/build.gradle.kts +++ b/catalog/format/iceberg-bench/build.gradle.kts @@ -18,7 +18,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id("nessie-conventions-server") - id("com.github.johnrengelman.shadow") + id("com.gradleup.shadow") alias(libs.plugins.jmh) } diff --git a/gc/gc-tool/build.gradle.kts b/gc/gc-tool/build.gradle.kts index dd328a0854d..78262715b33 100644 --- a/gc/gc-tool/build.gradle.kts +++ b/gc/gc-tool/build.gradle.kts @@ -17,7 +17,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { - id("com.github.johnrengelman.shadow") + id("com.gradleup.shadow") id("nessie-conventions-client") id("nessie-jacoco") id("nessie-shadow-jar") diff --git a/gradle/baselibs.versions.toml b/gradle/baselibs.versions.toml index 09857c77d01..9b7d0bc7a20 100644 --- a/gradle/baselibs.versions.toml +++ b/gradle/baselibs.versions.toml @@ -7,5 +7,5 @@ idea-ext = { module = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle jandex = { module = "com.github.vlsi.gradle:jandex-plugin", version = "1.90" } junit-bom = { module = "org.junit:junit-bom", version = "5.11.0" } license-report = { module = "com.github.jk1:gradle-license-report", version = "2.9" } -shadow = { module = "com.github.johnrengelman:shadow", version = "8.1.1" } +shadow = { module = "com.gradleup.shadow:shadow-gradle-plugin", version = "8.3.0" } spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.25.0" } diff --git a/servers/services-bench/build.gradle.kts b/servers/services-bench/build.gradle.kts index 1e1fe4d83b1..5669625e7a2 100644 --- a/servers/services-bench/build.gradle.kts +++ b/servers/services-bench/build.gradle.kts @@ -18,7 +18,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id("nessie-conventions-unpublished-tool") - id("com.github.johnrengelman.shadow") + id("com.gradleup.shadow") alias(libs.plugins.jmh) }