Skip to content

Commit 80fe2f2

Browse files
committed
remove blocks
1 parent 50ddcef commit 80fe2f2

File tree

2 files changed

+2
-31
lines changed

2 files changed

+2
-31
lines changed

gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,6 @@ val muzzleBootstrap: Configuration by configurations.creating {
4646
isCanBeResolved = true
4747
}
4848

49-
// Configure muzzle-specific configurations to inherit from project's main configurations.
50-
// This allows dependency versions to be resolved from BOMs applied to compileClasspath/compileOnly.
51-
afterEvaluate {
52-
val baseConfig = configurations.findByName("compileClasspath")
53-
?: configurations.findByName("compileOnly")
54-
55-
if (baseConfig != null) {
56-
configurations.named("muzzleBootstrap").configure {
57-
extendsFrom(baseConfig)
58-
}
59-
configurations.named("muzzleTooling").configure {
60-
extendsFrom(baseConfig)
61-
}
62-
}
63-
}
64-
6549
dependencies {
6650
// Bootstrap dependencies: Required classes for instrumentation that run in the bootstrap classloader
6751
add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
@@ -189,8 +173,8 @@ val hasRelevantTask = gradle.startParameter.taskNames.any {
189173
val taskName = it.removePrefix(":")
190174
val projectPath = project.path.substring(1)
191175
// Either the specific muzzle task in this project or a top level muzzle task.
192-
taskName == "muzzle" || taskName == "${projectPath}:muzzle" || taskName.startsWith("instrumentation:muzzle") ||
193-
taskName.contains(":muzzle-Assert") || taskName.endsWith(":muzzle")
176+
taskName == "${projectPath}:muzzle" || taskName.startsWith("instrumentation:muzzle") ||
177+
taskName.contains(":muzzle-Assert")
194178
}
195179

196180
if (hasRelevantTask) {

gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-generation.gradle.kts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,6 @@ val codegen by configurations.creating {
3535
isCanBeResolved = true
3636
}
3737

38-
// Configure codegen configuration to inherit from project's main configurations.
39-
// This allows dependency versions to be resolved from BOMs applied to compileClasspath/compileOnly.
40-
afterEvaluate {
41-
val baseConfig = configurations.findByName("compileClasspath")
42-
?: configurations.findByName("compileOnly")
43-
44-
if (baseConfig != null) {
45-
configurations.named("codegen").configure {
46-
extendsFrom(baseConfig)
47-
}
48-
}
49-
}
50-
5138
dependencies {
5239
/*
5340
* Code generation dependency: Used by the muzzle gradle plugin during code generation.

0 commit comments

Comments
 (0)