Skip to content

Commit

Permalink
Update shadow plugin to new version and coordinates (#11979)
Browse files Browse the repository at this point in the history
  • Loading branch information
breedx-splk committed Aug 9, 2024
1 parent d0e4a23 commit d15927a
Show file tree
Hide file tree
Showing 25 changed files with 25 additions and 39 deletions.
2 changes: 1 addition & 1 deletion conventions/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ dependencies {
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
implementation("com.google.guava:guava:33.2.1-jre")
implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
implementation("com.github.johnrengelman:shadow:8.1.1")
implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.0")
implementation("org.apache.httpcomponents:httpclient:4.5.14")
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:3.17.6")
implementation("org.owasp:dependency-check-gradle:10.0.3")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

plugins {
id("com.github.johnrengelman.shadow")
id("com.gradleup.shadow")
}

// NOTE: any modifications below should also be made in
Expand Down
2 changes: 1 addition & 1 deletion examples/distro/agent/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

plugins {
id("com.github.johnrengelman.shadow")
id("com.gradleup.shadow")
}

apply from: "$rootDir/gradle/shadow.gradle"
Expand Down
2 changes: 1 addition & 1 deletion examples/distro/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
}
dependencies {
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
classpath "com.github.johnrengelman:shadow:8.1.1"
classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.0"
classpath "io.opentelemetry.instrumentation:gradle-plugins:2.7.0-alpha-SNAPSHOT"
}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/distro/gradle/instrumentation.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apply plugin: 'java'
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.gradleup.shadow'
apply plugin: 'io.opentelemetry.instrumentation.muzzle-generation'
apply plugin: 'io.opentelemetry.instrumentation.muzzle-check'

Expand Down
2 changes: 1 addition & 1 deletion examples/distro/testing/agent-for-testing/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

plugins {
id("com.github.johnrengelman.shadow")
id("com.gradleup.shadow")
}

apply from: "$rootDir/gradle/shadow.gradle"
Expand Down
2 changes: 1 addition & 1 deletion examples/extension/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
into a single jar.
See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin.
*/
id "com.github.johnrengelman.shadow" version "8.1.1"
id "com.gradleup.shadow" version "8.3.0"
id "com.diffplug.spotless" version "6.25.0"

id "io.opentelemetry.instrumentation.muzzle-generation" version "2.7.0-alpha-SNAPSHOT"
Expand Down
2 changes: 1 addition & 1 deletion gradle-plugins/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies {
implementation("org.eclipse.aether:aether-transport-http:${aetherVersion}")
implementation("org.apache.maven:maven-aether-provider:3.3.9")

implementation("com.github.johnrengelman:shadow:8.1.1")
implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.0")

testImplementation("org.assertj:assertj-core:3.26.3")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ import java.util.stream.StreamSupport

plugins {
`java-library`

id("com.github.johnrengelman.shadow")
id("com.gradleup.shadow")
}

// Select a random set of versions to test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id("com.github.johnrengelman.shadow")

id("com.gradleup.shadow")
id("otel.java-conventions")
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id("com.github.johnrengelman.shadow")

id("com.gradleup.shadow")
id("otel.java-conventions")
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id("com.github.johnrengelman.shadow")

id("com.gradleup.shadow")
id("otel.java-conventions")
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id("com.github.johnrengelman.shadow")

id("com.gradleup.shadow")
id("otel.java-conventions")
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.github.johnrengelman.shadow")
id("com.gradleup.shadow")

id("otel.java-conventions")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id("com.github.johnrengelman.shadow")

id("com.gradleup.shadow")
id("otel.java-conventions")
}

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/jdbc/library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

plugins {
id("com.github.johnrengelman.shadow")
id("com.gradleup.shadow")
id("otel.library-instrumentation")
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id("com.github.johnrengelman.shadow")

id("com.gradleup.shadow")
id("otel.java-conventions")
}

Expand Down
3 changes: 1 addition & 2 deletions javaagent-internal-logging-simple/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
plugins {
id("otel.java-conventions")
id("otel.publish-conventions")

id("com.github.johnrengelman.shadow")
id("com.gradleup.shadow")
}

group = "io.opentelemetry.javaagent"
Expand Down
3 changes: 1 addition & 2 deletions opentelemetry-api-shaded-for-instrumenting/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

plugins {
id("com.github.johnrengelman.shadow")

id("com.gradleup.shadow")
id("otel.java-conventions")
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id("com.github.johnrengelman.shadow")

id("com.gradleup.shadow")
id("otel.java-conventions")
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id("com.github.johnrengelman.shadow")

id("com.gradleup.shadow")
id("otel.java-conventions")
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id("com.github.johnrengelman.shadow")

id("com.gradleup.shadow")
id("otel.java-conventions")
}

Expand Down
3 changes: 1 addition & 2 deletions smoke-tests/images/fake-backend/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ import java.time.format.DateTimeFormatter

plugins {
id("otel.java-conventions")

id("com.bmuschko.docker-remote-api")
id("com.github.johnrengelman.shadow")
id("com.gradleup.shadow")
id("com.google.cloud.tools.jib")
}

Expand Down
2 changes: 1 addition & 1 deletion testing/agent-exporter/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.github.johnrengelman.shadow")
id("com.gradleup.shadow")
id("otel.java-conventions")
}

Expand Down
3 changes: 1 addition & 2 deletions testing/armeria-shaded-for-testing/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id("com.github.johnrengelman.shadow")

id("com.gradleup.shadow")
id("otel.java-conventions")
}

Expand Down

0 comments on commit d15927a

Please sign in to comment.