From 6070e90e0a8cfc5e67b73fe3038ea8d9a429abf1 Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Wed, 5 Jun 2024 10:17:03 +0200 Subject: [PATCH] Switch to fork of Shadow plugin to get latest fixes see johnrengelman/shadow#908 --- gradle/libs.versions.toml | 2 +- .../src/main/kotlin/junitbuild.shadow-conventions.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3a31e90c9690..1eeafcf5d6a7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,7 +36,7 @@ gradle-commonCustomUserData = { module = "com.gradle:common-custom-user-data-gra gradle-foojayResolver = { module = "org.gradle.toolchains:foojay-resolver", version = "0.8.0" } gradle-develocity = { module = "com.gradle:develocity-gradle-plugin", version = "3.17.3" } gradle-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "bnd" } -gradle-shadow = { module = "com.github.johnrengelman:shadow", version = "8.1.1" } +gradle-shadow = { module = "io.github.goooler.shadow:shadow-gradle-plugin", version = "8.1.7" } gradle-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "7.0.0.BETA1" } gradle-versions = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "gradleVersionsPlugin" } groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.21" } diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts index 9c7998b8d367..5d7d95d6b1b4 100644 --- a/gradle/plugins/common/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts @@ -2,7 +2,7 @@ import junitbuild.java.ModuleCompileOptions plugins { id("junitbuild.java-library-conventions") - id("com.github.johnrengelman.shadow") + id("io.github.goooler.shadow") } val shadowed = configurations.dependencyScope("shadowed")