From 230eb11e34b97a45b4389e9d3ec4cc2a1625d39a Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Thu, 26 Sep 2024 20:16:57 +0300
Subject: [PATCH] Update shadow plugin (#2062)

* Update shadow plugin

* remove renovate rule for asm
---
 .github/renovate.json5                              |  4 ++--
 buildSrc/build.gradle.kts                           |  2 +-
 .../kotlin/splunk.shadow-conventions.gradle.kts     |  2 +-
 settings.gradle.kts                                 | 13 +------------
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index b994008f4..abeabcfe7 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -10,8 +10,8 @@
       "groupName": "spotless packages"
     },
     {
-      "matchPackagePrefixes": ["org.ow2.asm:"],
-      "groupName": "asm packages"
+      "matchPackagePrefixes": ["com.gradleup.shadow"],
+      "groupName": "gradle shadow packages"
     },
     {
       // pinned version for compatibility
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 237dee1f9..149732f92 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -44,5 +44,5 @@ dependencies {
   implementation("io.opentelemetry.instrumentation:gradle-plugins:2.6.0-alpha")
 
   // keep these versions in sync with settings.gradle.kts
-  implementation("gradle.plugin.com.github.johnrengelman:shadow:8.0.0")
+  implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.2")
 }
diff --git a/buildSrc/src/main/kotlin/splunk.shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/splunk.shadow-conventions.gradle.kts
index 217483b16..954700748 100644
--- a/buildSrc/src/main/kotlin/splunk.shadow-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/splunk.shadow-conventions.gradle.kts
@@ -1,7 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-  id("com.github.johnrengelman.shadow")
+  id("com.gradleup.shadow")
 }
 
 tasks.withType<ShadowJar>().configureEach {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2f455b924..7154d660a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,18 +3,7 @@ pluginManagement {
     id("com.bmuschko.docker-remote-api") version "9.4.0"
     id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
     id("com.github.jk1.dependency-license-report") version "2.9"
-  }
-}
-
-// We are using the following instead of having id("com.github.johnrengelman.shadow") version "8.1.1"
-// in pluginManagement to make shadow plugin use a newer version of asm so that it wouldn't fail on
-// classes compiled for jdk 21 (jackson-core 2.16.1 has such classes). This can be removed when
-// shadow plugin is updated.
-buildscript {
-  dependencies {
-    classpath("com.github.johnrengelman:shadow:8.1.1")
-    classpath("org.ow2.asm:asm:9.7")
-    classpath("org.ow2.asm:asm-commons:9.7")
+    id("com.gradleup.shadow") version "8.3.2"
   }
 }