Merge pull request #3799 from graphql-java/update-shadow-in-agent

dondonz · web-flow · commit b65ac4194c63 · 2025-01-28T09:28:51.000+11:00
Shadow plugin ID update Round 2 - fix clash with ByteBuddy's multi-release JAR
diff --git a/agent-test/build.gradle b/agent-test/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     implementation(rootProject)
-    implementation("net.bytebuddy:byte-buddy-agent:1.16.1")
+    implementation("net.bytebuddy:byte-buddy-agent:1.15.11")
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
diff --git a/agent/build.gradle b/agent/build.gradle
@@ -2,11 +2,11 @@ plugins {
     id 'java'
     id 'java-library'
     id 'maven-publish'
-    id "com.github.johnrengelman.shadow" version "8.1.1"
+    id "com.gradleup.shadow" version "8.3.5"
 }
 
 dependencies {
-    implementation("net.bytebuddy:byte-buddy:1.16.1")
+    implementation("net.bytebuddy:byte-buddy:1.15.11")
     // graphql-java itself
     implementation(rootProject)
 }
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id 'maven-publish'
     id 'antlr'
     id 'signing'
-    id "com.github.johnrengelman.shadow" version "8.1.1"
+    id "com.gradleup.shadow" version "8.3.5"
     id "biz.aQute.bnd.builder" version "6.4.0"
     id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
     id "groovy"

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@ plugins {`
`2`	`2`	`id 'java'`
`3`	`3`	`id 'java-library'`
`4`	`4`	`id 'maven-publish'`
`5`		`- id "com.github.johnrengelman.shadow" version "8.1.1"`
	`5`	`+ id "com.gradleup.shadow" version "8.3.5"`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- implementation("net.bytebuddy:byte-buddy:1.16.1")`
	`9`	`+ implementation("net.bytebuddy:byte-buddy:1.15.11")`
`10`	`10`	`// graphql-java itself`
`11`	`11`	`implementation(rootProject)`
`12`	`12`	`}`