Skip to content

Commit ffe5bb2

Browse files
authored
Small gradle simplification (#15515)
1 parent 01d9e60 commit ffe5bb2

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

benchmark-overhead-jmh/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
21
import me.champeau.jmh.JMHTask
32
import net.ltgt.gradle.errorprone.errorprone
43

@@ -44,7 +43,7 @@ tasks {
4443
val jmhStartFlightRecording = gradle.startParameter.projectProperties.get("jmh.startFlightRecording")
4544

4645
named<JMHTask>("jmh") {
47-
val shadowTask = project(":javaagent").tasks.named<ShadowJar>("shadowJar").get()
46+
val shadowTask = project(":javaagent").tasks.named<Jar>("shadowJar").get()
4847
inputs.files(layout.files(shadowTask))
4948

5049
// note: without an exporter, toSpanData() won't even be called

instrumentation/jmx-metrics/library/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
21

32
plugins {
43
id("otel.library-instrumentation")
@@ -19,7 +18,7 @@ dependencies {
1918

2019
tasks {
2120
test {
22-
val shadowTask = project(":javaagent").tasks.named<ShadowJar>("shadowJar")
21+
val shadowTask = project(":javaagent").tasks.named<Jar>("shadowJar")
2322
val testAppTask = project(":instrumentation:jmx-metrics:testing-webapp").tasks.named<War>("war")
2423

2524
dependsOn(shadowTask)

instrumentation/kafka/kafka-connect-2.6/testing/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
21

32
plugins {
43
id("otel.java-conventions")
@@ -8,7 +7,7 @@ otelJava {
87
minJavaVersionSupported.set(JavaVersion.VERSION_11)
98
}
109

11-
val agentShadowJar = project(":javaagent").tasks.named<ShadowJar>("shadowJar")
10+
val agentShadowJar = project(":javaagent").tasks.named<Jar>("shadowJar")
1211

1312
dependencies {
1413
testImplementation(project(":smoke-tests"))

smoke-tests/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
21
import java.time.Duration
32

43
plugins {
@@ -72,7 +71,7 @@ tasks {
7271
}
7372
}
7473

75-
val shadowTask = project(":javaagent").tasks.named<ShadowJar>("shadowJar")
74+
val shadowTask = project(":javaagent").tasks.named<Jar>("shadowJar")
7675
val agentJarPath = shadowTask.flatMap { it.archiveFile }
7776
inputs.files(agentJarPath)
7877
.withPropertyName("javaagent")

0 commit comments

Comments
 (0)